Removed support for project type 'E4Plugin' because eric4 and eric5 are out of service.

Wed, 01 Jul 2015 19:34:51 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 01 Jul 2015 19:34:51 +0200
changeset 4303
57b5de82ce05
parent 4302
748f4945462b
child 4304
f85965649066

Removed support for project type 'E4Plugin' because eric4 and eric5 are out of service.

Debugger/DebugUI.py file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
Project/Project.py file | annotate | diff | comparison | revisions
Project/ProjectFormsBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectResourcesBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectTranslationsBrowser.py file | annotate | diff | comparison | revisions
--- a/Debugger/DebugUI.py	Sun Jun 28 13:37:45 2015 +0200
+++ b/Debugger/DebugUI.py	Wed Jul 01 19:34:51 2015 +0200
@@ -1568,7 +1568,7 @@
             
             if not doNotStart:
                 if runProject and self.project.getProjectType() in [
-                        "E4Plugin", "E6Plugin"]:
+                        "E6Plugin"]:
                     argv = '--plugin="{0}" {1}'.format(fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric6.py")
                 
@@ -1687,7 +1687,7 @@
             
             if not doNotStart:
                 if runProject and self.project.getProjectType() in [
-                        "E4Plugin", "E6Plugin"]:
+                        "E6Plugin"]:
                     argv = '--plugin="{0}" {1}'.format(fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric6.py")
                 
@@ -1809,7 +1809,7 @@
             
             if not doNotStart:
                 if runProject and self.project.getProjectType() in [
-                        "E4Plugin", "E6Plugin"]:
+                        "E6Plugin"]:
                     argv = '--plugin="{0}" {1}'.format(fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric6.py")
                 
@@ -1938,7 +1938,7 @@
             
             if not doNotStart:
                 if debugProject and self.project.getProjectType() in [
-                        "E4Plugin", "E6Plugin"]:
+                        "E6Plugin"]:
                     argv = '--plugin="{0}" {1}'.format(fn, argv)
                     fn = os.path.join(getConfig('ericDir'), "eric6.py")
                     tracePython = True  # override flag because it must be true
@@ -2001,7 +2001,7 @@
         
         if not doNotStart:
             if forProject and self.project.getProjectType() in [
-                    "E4Plugin", "E6Plugin"]:
+                    "E6Plugin"]:
                 argv = '--plugin="{0}" {1}'.format(fn, argv)
                 fn = os.path.join(getConfig('ericDir'), "eric6.py")
             
--- a/Preferences/__init__.py	Sun Jun 28 13:37:45 2015 +0200
+++ b/Preferences/__init__.py	Wed Jul 01 19:34:51 2015 +0200
@@ -756,13 +756,6 @@
             TranslationsBrowserFlag |
             InterfacesBrowserFlag |
             OthersBrowserFlag),
-        "E4Plugin": (
-            SourcesBrowserFlag |
-            FormsBrowserFlag |
-            ResourcesBrowserFlag |
-            TranslationsBrowserFlag |
-            InterfacesBrowserFlag |
-            OthersBrowserFlag),
         "E6Plugin": (
             SourcesBrowserFlag |
             FormsBrowserFlag |
--- a/Project/Project.py	Sun Jun 28 13:37:45 2015 +0200
+++ b/Project/Project.py	Wed Jul 01 19:34:51 2015 +0200
@@ -268,15 +268,14 @@
         self.__projectTypes["Qt4C"] = self.tr("PyQt4 Console")
         self.__projectTypes["PyQt5"] = self.tr("PyQt5 GUI")
         self.__projectTypes["PyQt5C"] = self.tr("PyQt5 Console")
-        self.__projectTypes["E4Plugin"] = self.tr("Eric4/5 Plugin")
         self.__projectTypes["E6Plugin"] = self.tr("Eric6 Plugin")
         self.__projectTypes["Console"] = self.tr("Console")
         self.__projectTypes["Other"] = self.tr("Other")
         
         self.__projectProgLanguages = {
-            "Python2": ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+            "Python2": ["Qt4", "Qt4C", "PyQt5", "PyQt5C",
                         "E6Plugin", "Console", "Other"],
-            "Python3": ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+            "Python3": ["Qt4", "Qt4C", "PyQt5", "PyQt5C",
                         "E6Plugin", "Console", "Other"],
             "Ruby": ["Qt4", "Qt4C", "Console", "Other"],
             "JavaScript": ["Other"],
@@ -528,16 +527,16 @@
         for ext in self.__sourceExtensions(sourceKey):
             self.pdata["FILETYPES"]["*{0}".format(ext)] = "SOURCES"
         self.pdata["FILETYPES"]["*.idl"] = "INTERFACES"
-        if self.pdata["PROJECTTYPE"][0] in ["Qt4", "PyQt5", "E4Plugin",
+        if self.pdata["PROJECTTYPE"][0] in ["Qt4", "PyQt5",
                                             "E6Plugin", "PySide"]:
             self.pdata["FILETYPES"]["*.ui"] = "FORMS"
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C",
-                                            "E4Plugin", "E6Plugin",
+                                            "E6Plugin",
                                             "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
             self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES"
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C",
-                                            "E4Plugin", "E6Plugin",
+                                            "E6Plugin",
                                             "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
             self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
@@ -558,7 +557,7 @@
         values.
         """
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C",
-                                            "E4Plugin", "E6Plugin",
+                                            "E6Plugin",
                                             "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
             if "*.ts" not in self.pdata["FILETYPES"]:
@@ -1266,7 +1265,7 @@
         if dlg.exec_() == QDialog.Accepted:
             lang = dlg.getSelectedLanguage()
             if self.pdata["PROJECTTYPE"][0] in \
-                    ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                    ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                      "PySide", "PySideC"]:
                 langFile = self.pdata["TRANSLATIONPATTERN"][0]\
                     .replace("%language%", lang)
@@ -2132,7 +2131,7 @@
             self.menuApidocAct.setEnabled(True)
             self.menuPackagersAct.setEnabled(True)
             self.pluginGrp.setEnabled(
-                self.pdata["PROJECTTYPE"][0] in ["E4Plugin", "E6Plugin"])
+                self.pdata["PROJECTTYPE"][0] in ["E6Plugin"])
             self.addLanguageAct.setEnabled(
                 len(self.pdata["TRANSLATIONPATTERN"]) > 0 and
                 self.pdata["TRANSLATIONPATTERN"][0] != '')
@@ -2506,7 +2505,7 @@
                     self.subdirs.append(tp)
             
             self.pluginGrp.setEnabled(
-                self.pdata["PROJECTTYPE"][0] in ["E4Plugin", "E6Plugin"])
+                self.pdata["PROJECTTYPE"][0] in ["E6Plugin"])
             
             self.__model.projectPropertiesChanged()
             self.projectPropertiesChanged.emit()
@@ -2725,7 +2724,7 @@
                     self.menuPackagersAct.setEnabled(True)
                     self.pluginGrp.setEnabled(
                         self.pdata["PROJECTTYPE"][0] in [
-                            "E4Plugin", "E6Plugin"])
+                            "E6Plugin"])
                     self.addLanguageAct.setEnabled(
                         len(self.pdata["TRANSLATIONPATTERN"]) > 0 and
                         self.pdata["TRANSLATIONPATTERN"][0] != '')
--- a/Project/ProjectFormsBrowser.py	Sun Jun 28 13:37:45 2015 +0200
+++ b/Project/ProjectFormsBrowser.py	Wed Jul 01 19:34:51 2015 +0200
@@ -131,7 +131,7 @@
         
         self.menu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
             self.menu.addAction(
                 self.tr('Compile form'), self.__compileForm)
             self.menu.addAction(
@@ -186,7 +186,7 @@
         self.menuActions.append(act)
         self.menu.addSeparator()
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
             self.menu.addAction(self.tr('New form...'), self.__newForm)
         else:
             if self.hooks["newForm"] is not None:
@@ -209,7 +209,7 @@
 
         self.backMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"] or \
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"] or \
                 self.hooks["compileAllForms"] is not None:
             self.backMenu.addAction(
                 self.tr('Compile all forms'), self.__compileAllForms)
@@ -236,7 +236,7 @@
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
             act = self.multiMenu.addAction(
                 self.tr('Compile forms'), self.__compileSelectedForms)
             self.multiMenu.addSeparator()
@@ -278,7 +278,7 @@
 
         self.dirMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
             self.dirMenu.addAction(
                 self.tr('Compile all forms'), self.__compileAllForms)
             self.dirMenu.addSeparator()
@@ -298,7 +298,7 @@
         self.dirMenuActions.append(act)
         self.dirMenu.addSeparator()
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
             self.dirMenu.addAction(self.tr('New form...'), self.__newForm)
         else:
             if self.hooks["newForm"] is not None:
@@ -323,7 +323,7 @@
         
         self.dirMultiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
             self.dirMultiMenu.addAction(
                 self.tr('Compile all forms'), self.__compileAllForms)
             self.dirMultiMenu.addSeparator()
@@ -541,7 +541,7 @@
             self.hooks["newForm"](path)
         else:
             if self.project.getProjectType() in \
-                    ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+                    ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
                 self.__newUiForm(path)
         
     def __newUiForm(self, path):
@@ -749,7 +749,7 @@
         
         if self.project.pdata["PROGLANGUAGE"][0] in \
                 ["Python", "Python2", "Python3"]:
-            if self.project.getProjectType() in ["Qt4", "E4Plugin"]:
+            if self.project.getProjectType() in ["Qt4", ]:
                 self.uicompiler = 'pyuic4'
                 if Utilities.isWindowsPlatform():
                     uic = self.uicompiler + '.bat'
@@ -946,7 +946,7 @@
             self.hooks["compileChangedForms"](self.project.pdata["FORMS"])
         else:
             if self.project.getProjectType() not in \
-               ["Qt4", "PyQt5", "E4Plugin", "E6Plugin", "PySide"]:
+               ["Qt4", "PyQt5", "E6Plugin", "PySide"]:
                 # ignore the request for non Qt GUI projects
                 return
             
--- a/Project/ProjectResourcesBrowser.py	Sun Jun 28 13:37:45 2015 +0200
+++ b/Project/ProjectResourcesBrowser.py	Wed Jul 01 19:34:51 2015 +0200
@@ -86,7 +86,7 @@
         
         self.menu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             self.menu.addAction(
                 self.tr('Compile resource'),
@@ -122,7 +122,7 @@
         self.menuActions.append(act)
         self.menu.addSeparator()
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             self.menu.addAction(
                 self.tr('New resource...'), self.__newResource)
@@ -150,7 +150,7 @@
 
         self.backMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             self.backMenu.addAction(
                 self.tr('Compile all resources'),
@@ -188,7 +188,7 @@
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             act = self.multiMenu.addAction(
                 self.tr('Compile resources'),
@@ -220,7 +220,7 @@
 
         self.dirMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             self.dirMenu.addAction(
                 self.tr('Compile all resources'),
@@ -261,7 +261,7 @@
         
         self.dirMultiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             self.dirMultiMenu.addAction(
                 self.tr('Compile all resources'),
@@ -632,7 +632,7 @@
         
         if self.project.pdata["PROGLANGUAGE"][0] in \
                 ["Python", "Python2", "Python3"]:
-            if self.project.getProjectType() in ["Qt4", "Qt4C", "E4Plugin"]:
+            if self.project.getProjectType() in ["Qt4", "Qt4C"]:
                 self.rccCompiler = 'pyrcc4'
                 if Utilities.isWindowsPlatform():
                     self.rccCompiler += '.exe'
--- a/Project/ProjectTranslationsBrowser.py	Sun Jun 28 13:37:45 2015 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Wed Jul 01 19:34:51 2015 +0200
@@ -113,7 +113,7 @@
         
         self.menu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             act = self.menu.addAction(
                 self.tr('Generate translation'), self.__generateSelected)
@@ -240,7 +240,7 @@
         
         self.backMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             act = self.backMenu.addAction(
                 self.tr('Generate all translations'),
@@ -301,7 +301,7 @@
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             act = self.multiMenu.addAction(
                 self.tr('Generate translations'),
@@ -385,7 +385,7 @@
 
         self.dirMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             act = self.dirMenu.addAction(
                 self.tr('Generate all translations'),
@@ -503,7 +503,7 @@
         Private slot called by the menu aboutToShow signal.
         """
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             tsFiles = 0
             qmFiles = 0
@@ -545,7 +545,7 @@
         Private slot called by the multiMenu aboutToShow signal.
         """
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             tsFiles = 0
             qmFiles = 0
@@ -585,7 +585,7 @@
         Private slot called by the dirMenu aboutToShow signal.
         """
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocDirMenuActions:
@@ -605,7 +605,7 @@
         Private slot called by the backMenu aboutToShow signal.
         """
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocBackMenuActions:
@@ -1034,7 +1034,7 @@
         if not ok:
             return
         
-        if self.project.getProjectType() in ["Qt4", "Qt4C", "E4Plugin"]:
+        if self.project.getProjectType() in ["Qt4", "Qt4C"]:
             self.pylupdate = 'pylupdate4'
             if Utilities.isWindowsPlatform():
                 self.pylupdate = self.pylupdate + '.exe'
@@ -1218,7 +1218,7 @@
             return
         
         if self.project.getProjectType() in \
-                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
                  "PySide", "PySideC"]:
             lrelease = os.path.join(
                 Utilities.getQtBinariesPath(),

eric ide

mercurial