Mercurial Repositories > eric / changeset
changeset
Changed the E6Plugin project type to E7Plugin.
Thu, 20 May 2021 19:20:50 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 20 May 2021 19:20:50 +0200
- branch
- eric7
- changeset 8336
- d566c2970f39
- parent 8335
- 9fa339ca2a91
- child 8337
- 6e2ca14e0dba
Changed the E6Plugin project type to E7Plugin.
--- a/eric7/Debugger/DebugUI.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Debugger/DebugUI.py Thu May 20 19:20:50 2021 +0200 @@ -1779,7 +1779,7 @@ if not doNotStart: if runProject and self.project.getProjectType() in [ - "E6Plugin"]: + "E7Plugin"]: argv = '--plugin="{0}" {1}'.format(fn, argv) fn = os.path.join(getConfig('ericDir'), "eric7.py") @@ -1924,7 +1924,7 @@ if not doNotStart: if runProject and self.project.getProjectType() in [ - "E6Plugin"]: + "E7Plugin"]: argv = '--plugin="{0}" {1}'.format(fn, argv) fn = os.path.join(getConfig('ericDir'), "eric7.py") @@ -2066,7 +2066,7 @@ if not doNotStart: if runProject and self.project.getProjectType() in [ - "E6Plugin"]: + "E7Plugin"]: argv = '--plugin="{0}" {1}'.format(fn, argv) fn = os.path.join(getConfig('ericDir'), "eric7.py") @@ -2224,7 +2224,7 @@ if not doNotStart: if debugProject and self.project.getProjectType() in [ - "E6Plugin"]: + "E7Plugin"]: argv = '--plugin="{0}" {1}'.format(fn, argv) fn = os.path.join(getConfig('ericDir'), "eric7.py") tracePython = True # override flag because it must be true @@ -2311,7 +2311,7 @@ if not doNotStart: if forProject and self.project.getProjectType() in [ - "E6Plugin"]: + "E7Plugin"]: argv = '--plugin="{0}" {1}'.format(fn, argv) fn = os.path.join(getConfig('ericDir'), "eric7.py")
--- a/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py Thu May 20 19:20:50 2021 +0200 @@ -140,8 +140,8 @@ self.sourcesBrowserCheckBox.setChecked(flags & SourcesBrowserFlag) self.formsBrowserCheckBox.setChecked(flags & FormsBrowserFlag) self.resourcesBrowserCheckBox.setEnabled( - projectType not in ("PyQt6", "PyQt6C")) - if projectType in ("PyQt6", "PyQt6C"): + projectType not in ("PyQt6", "PyQt6C", "E7Plugin")) + if projectType in ("PyQt6", "PyQt6C", "E7Plugin"): self.resourcesBrowserCheckBox.setChecked(False) else: self.resourcesBrowserCheckBox.setChecked(
--- a/eric7/Preferences/__init__.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Preferences/__init__.py Thu May 20 19:20:50 2021 +0200 @@ -833,10 +833,9 @@ InterfacesBrowserFlag | OthersBrowserFlag | ProtocolsBrowserFlag), - "E6Plugin": ( + "E7Plugin": ( SourcesBrowserFlag | FormsBrowserFlag | - ResourcesBrowserFlag | TranslationsBrowserFlag | InterfacesBrowserFlag | OthersBrowserFlag | @@ -1771,9 +1770,6 @@ return "standard" else: return debugClientType - elif key in ("PythonExtensions", "Python2VirtualEnv"): - # we don't support Python2 anymore - return "" else: return prefClass.settings.value( "Debugger/" + key, prefClass.debuggerDefaults[key]) @@ -1798,10 +1794,6 @@ @param prefClass preferences class used as the storage area @return the requested debugger setting """ - if key == "PythonExtensions": - # we don't support Python2 anymore - return [] - if key == "Python3Extensions": exts = [] for ext in getDebugger(key, prefClass).split(): @@ -1930,7 +1922,7 @@ "UI/" + key, prefClass.uiDefaults[key])) elif key in ["ProxyType/Ftp", ]: return E5FtpProxyType(int(prefClass.settings.value( - "UI/" + key, prefClass.uiDefaults[key]))) + "UI/" + key, prefClass.uiDefaults[key].value))) elif key in ["ProxyPassword/Http", "ProxyPassword/Https", "ProxyPassword/Ftp", ]: from Utilities.crypto import pwConvert
--- a/eric7/Project/CreateDialogCodeDialog.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Project/CreateDialogCodeDialog.py Thu May 20 19:20:50 2021 +0200 @@ -164,9 +164,9 @@ venvName = self.project.getDebugProperty("VIRTUALENV") if not venvName: # no project specific environment, try a type specific one - if projectType in ("PyQt5", "E6Plugin", "PySide2"): + if projectType in ("PyQt5", "PySide2"): venvName = Preferences.getQt("PyQtVenvName") - elif projectType in ("PyQt6", "PySide6"): + elif projectType in ("PyQt6", "E7Plugin", "PySide6"): venvName = Preferences.getQt("PyQt6VenvName") interpreter = venvManager.getVirtualenvInterpreter(venvName) execPath = venvManager.getVirtualenvExecPath(venvName) @@ -183,9 +183,9 @@ else: env.insert("PATH", execPath) - if projectType in ("PyQt5", "E6Plugin", "PySide2"): + if projectType in ("PyQt5", "PySide2"): loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi5.py") - elif projectType in ("PyQt6", "PySide6"): + elif projectType in ("PyQt6", "E7Plugin", "PySide6"): loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi6.py") args = [ loadUi, @@ -413,12 +413,13 @@ tmplName = os.path.join( getConfig('ericCodeTemplatesDir'), "impl_pyside6.py.tmpl") - elif self.project.getProjectType() in [ - "PyQt5", "E6Plugin"]: + elif self.project.getProjectType() == "PyQt5": tmplName = os.path.join( getConfig('ericCodeTemplatesDir'), "impl_pyqt5.py.tmpl") - elif self.project.getProjectType() == "PyQt6": + elif self.project.getProjectType() in [ + "PyQt6", "E7Plugin" + ]: tmplName = os.path.join( getConfig('ericCodeTemplatesDir'), "impl_pyqt6.py.tmpl")
--- a/eric7/Project/Project.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Project/Project.py Thu May 20 19:20:50 2021 +0200 @@ -282,13 +282,13 @@ "PyQt5C": self.tr("PyQt5 Console"), "PyQt6": self.tr("PyQt6 GUI"), "PyQt6C": self.tr("PyQt6 Console"), - "E6Plugin": self.tr("Eric6 Plugin"), + "E7Plugin": self.tr("Eric7 Plugin"), "Console": self.tr("Console"), "Other": self.tr("Other"), } self.__projectProgLanguages = { - "Python3": ["PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "Python3": ["PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "Console", "Other"], "MicroPython": ["Console", "Other"], "Ruby": ["Console", "Other"], @@ -360,10 +360,6 @@ """ if progLanguages: for progLanguage in progLanguages: - if progLanguage in ["Python", "Python2"]: - # ignore that silently for Python2 - return - if progLanguage not in self.__projectProgLanguages: E5MessageBox.critical( self.ui, @@ -622,7 +618,7 @@ self.pdata["FILETYPES"]["*.proto"] = "PROTOCOLS" # Forms - if self.pdata["PROJECTTYPE"] in ["E6Plugin", + if self.pdata["PROJECTTYPE"] in ["E7Plugin", "PyQt5", "PyQt6", "PySide2", @@ -630,14 +626,13 @@ self.pdata["FILETYPES"]["*.ui"] = "FORMS" # Resources - if self.pdata["PROJECTTYPE"] in ["E6Plugin", - "PyQt5", "PyQt5C", + if self.pdata["PROJECTTYPE"] in ["PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C"]: self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES" # Translations - if self.pdata["PROJECTTYPE"] in ["E6Plugin", + if self.pdata["PROJECTTYPE"] in ["E7Plugin", "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "PySide2", "PySide2C", @@ -659,7 +654,7 @@ Public method to update the filetype associations with new default values. """ - if self.pdata["PROJECTTYPE"] in ["E6Plugin", + if self.pdata["PROJECTTYPE"] in ["E7Plugin", "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "PySide2", "PySide2C", @@ -1427,7 +1422,7 @@ if dlg.exec() == QDialog.DialogCode.Accepted: lang = dlg.getSelectedLanguage() if self.pdata["PROJECTTYPE"] in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: langFile = self.pdata["TRANSLATIONPATTERN"].replace( @@ -2347,7 +2342,7 @@ self.menuApidocAct.setEnabled(True) self.menuPackagersAct.setEnabled(True) self.pluginGrp.setEnabled( - self.pdata["PROJECTTYPE"] in ["E6Plugin"]) + self.pdata["PROJECTTYPE"] in ["E7Plugin"]) self.addLanguageAct.setEnabled( bool(self.pdata["TRANSLATIONPATTERN"])) self.makeGrp.setEnabled( @@ -2808,7 +2803,7 @@ self.subdirs.append(tp) self.pluginGrp.setEnabled( - self.pdata["PROJECTTYPE"] in ["E6Plugin"]) + self.pdata["PROJECTTYPE"] in ["E7Plugin"]) self.__model.projectPropertiesChanged() self.projectPropertiesChanged.emit() @@ -3039,7 +3034,7 @@ self.menuApidocAct.setEnabled(True) self.menuPackagersAct.setEnabled(True) self.pluginGrp.setEnabled( - self.pdata["PROJECTTYPE"] in ["E6Plugin"]) + self.pdata["PROJECTTYPE"] in ["E7Plugin"]) self.addLanguageAct.setEnabled( bool(self.pdata["TRANSLATIONPATTERN"])) self.makeGrp.setEnabled( @@ -3584,17 +3579,8 @@ @return path of the management directory (string) """ - if Utilities.isWindowsPlatform(): - # migrate the old project management directory ( < v18.06) - oldDir = os.path.join(self.ppath, "_eric6project") - if os.path.exists(oldDir): - os.rename( - oldDir, - os.path.join(self.ppath, ".eric6project") - ) - return os.path.join(self.ppath, ".eric7project") - + def createProjectManagementDir(self): """ Public method to create the project management directory.
--- a/eric7/Project/ProjectFormsBrowser.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Project/ProjectFormsBrowser.py Thu May 20 19:20:50 2021 +0200 @@ -130,7 +130,7 @@ projectType = self.project.getProjectType() self.menu = QMenu(self) - if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]: + if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]: self.menu.addAction( self.tr('Compile form'), self.__compileForm) self.menu.addAction( @@ -190,7 +190,7 @@ act = self.menu.addAction(self.tr('Delete'), self.__deleteFile) self.menuActions.append(act) self.menu.addSeparator() - if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]: + if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]: self.menu.addAction(self.tr('New form...'), self.__newForm) else: if self.hooks["newForm"] is not None: @@ -214,7 +214,7 @@ self.backMenu = QMenu(self) if ( projectType in [ - "PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6" + "PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6" ] or self.hooks["compileAllForms"] is not None ): self.backMenu.addAction( @@ -245,7 +245,7 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) - if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]: + if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]: self.multiMenu.addAction( self.tr('Compile forms'), self.__compileSelectedForms) self.multiMenu.addSeparator() @@ -290,7 +290,7 @@ self.multiMenu.addAction(self.tr('Configure...'), self._configure) self.dirMenu = QMenu(self) - if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]: + if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]: self.dirMenu.addAction( self.tr('Compile all forms'), self.__compileAllForms) self.dirMenu.addSeparator() @@ -313,7 +313,7 @@ self.tr('Delete'), self._deleteDirectory) self.dirMenuActions.append(act) self.dirMenu.addSeparator() - if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]: + if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]: self.dirMenu.addAction(self.tr('New form...'), self.__newForm) else: if self.hooks["newForm"] is not None: @@ -337,7 +337,7 @@ self.dirMenu.addAction(self.tr('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) - if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]: + if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]: self.dirMultiMenu.addAction( self.tr('Compile all forms'), self.__compileAllForms) self.dirMultiMenu.addSeparator() @@ -383,7 +383,7 @@ return enable = ( - self.project.getProjectType() in ("PyQt5", "PyQt6", "E6Plugin") + self.project.getProjectType() in ("PyQt5", "PyQt6", "E7Plugin") ) self.__pyuicConfigAct.setEnabled(enable) self.__pyuicMultiConfigAct.setEnabled(enable) @@ -568,7 +568,7 @@ self.hooks["newForm"](path) else: if self.project.getProjectType() in [ - "PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6" + "PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6" ]: self.__newUiForm(path) @@ -681,10 +681,10 @@ self.__resetUiCompiler() if self.project.getProjectLanguage() == "Python3": - if self.project.getProjectType() in ["PyQt5", "E6Plugin"]: + if self.project.getProjectType() in ["PyQt5"]: self.__uicompiler = Utilities.generatePyQtToolPath( 'pyuic5', ["py3uic5"]) - elif self.project.getProjectType() in ["PyQt6"]: + elif self.project.getProjectType() in ["PyQt6", "E7Plugin"]: self.__uicompiler = Utilities.generatePyQtToolPath( 'pyuic6') elif self.project.getProjectType() == "PySide2": @@ -983,7 +983,7 @@ self.hooks["compileChangedForms"](self.project.pdata["FORMS"]) else: if self.project.getProjectType() not in [ - "PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6" + "PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6" ]: # ignore the request for non Qt GUI projects return @@ -1053,7 +1053,7 @@ params = self.project.pdata["UICPARAMS"] - if self.project.getProjectType() in ["PyQt5", "PyQt6", "E6Plugin"]: + if self.project.getProjectType() in ["PyQt5", "PyQt6", "E7Plugin"]: dlg = UicCompilerOptionsDialog(params, self.getUiCompiler()) if dlg.exec() == QDialog.DialogCode.Accepted: package, suffix, root = dlg.getData()
--- a/eric7/Project/ProjectResourcesBrowser.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Project/ProjectResourcesBrowser.py Thu May 20 19:20:50 2021 +0200 @@ -80,7 +80,7 @@ self.menu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin", + "PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: self.menu.addAction( @@ -123,7 +123,7 @@ self.menuActions.append(act) self.menu.addSeparator() if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin", + "PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: self.menu.addAction( @@ -152,7 +152,7 @@ self.backMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin", + "PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: self.backMenu.addAction( @@ -195,7 +195,7 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin", + "PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: act = self.multiMenu.addAction( @@ -232,7 +232,7 @@ self.dirMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin", + "PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: self.dirMenu.addAction( @@ -278,7 +278,7 @@ self.dirMultiMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "E6Plugin", + "PyQt5", "PyQt5C", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: self.dirMultiMenu.addAction( @@ -643,8 +643,7 @@ self.buf = "" if self.project.getProjectLanguage() == "Python3": - if self.project.getProjectType() in ["PyQt5", "PyQt5C", - "E6Plugin"]: + if self.project.getProjectType() in ["PyQt5", "PyQt5C"]: self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5') elif self.project.getProjectType() in ["PySide2", "PySide2C"]: self.rccCompiler = Utilities.generatePySideToolPath(
--- a/eric7/Project/ProjectTranslationsBrowser.py Thu May 20 19:19:33 2021 +0200 +++ b/eric7/Project/ProjectTranslationsBrowser.py Thu May 20 19:20:50 2021 +0200 @@ -104,7 +104,7 @@ self.menu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: act = self.menu.addAction( @@ -232,7 +232,7 @@ self.backMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: act = self.backMenu.addAction( @@ -294,7 +294,7 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: act = self.multiMenu.addAction( @@ -379,7 +379,7 @@ self.dirMenu = QMenu(self) if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: act = self.dirMenu.addAction( @@ -496,7 +496,7 @@ Private slot called by the menu aboutToShow signal. """ if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: tsFiles = 0 @@ -541,7 +541,7 @@ Private slot called by the multiMenu aboutToShow signal. """ if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: tsFiles = 0 @@ -584,7 +584,7 @@ Private slot called by the dirMenu aboutToShow signal. """ if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: if self.pylupdateProcRunning: @@ -605,7 +605,7 @@ Private slot called by the backMenu aboutToShow signal. """ if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: if self.pylupdateProcRunning: @@ -1022,9 +1022,9 @@ else: return - if self.project.getProjectType() in ["PyQt5", "PyQt5C", "E6Plugin"]: + if self.project.getProjectType() in ["PyQt5", "PyQt5C"]: self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5') - elif self.project.getProjectType() in ["PyQt6", "PyQt6C"]: + elif self.project.getProjectType() in ["PyQt6", "PyQt6C", "E7Plugin"]: self.pylupdate = Utilities.generatePyQtToolPath('pylupdate6') elif self.project.getProjectType() in ["PySide2", "PySide2C"]: self.pylupdate = Utilities.generatePySideToolPath( @@ -1237,7 +1237,7 @@ return if self.project.getProjectType() in [ - "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin", + "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E7Plugin", "PySide2", "PySide2C", "PySide6", "PySide6C" ]: lrelease = os.path.join(
