Mercurial Repositories > eric / file diff

--- a/Project/Project.py	Mon Jun 24 19:28:47 2013 +0200
+++ b/Project/Project.py	Mon Jun 24 19:35:33 2013 +0200
@@ -227,15 +227,15 @@
         
         self.__projectTypes["Qt4"] = self.trUtf8("Qt GUI")
         self.__projectTypes["Qt4C"] = self.trUtf8("Qt Console")
-        # TODO: add PyQt5
+        self.__projectTypes["PyQt5"] = self.trUtf8("PyQt5 GUI")
+        self.__projectTypes["PyQt5C"] = self.trUtf8("PyQt5 Console")
         self.__projectTypes["E4Plugin"] = self.trUtf8("Eric Plugin")
         self.__projectTypes["Console"] = self.trUtf8("Console")
         self.__projectTypes["Other"] = self.trUtf8("Other")
         
         self.__projectProgLanguages = {
-            # TODO: add PyQt5
-            "Python2": ["Qt4", "Qt4C", "E4Plugin", "Console", "Other"],
-            "Python3": ["Qt4", "Qt4C", "E4Plugin", "Console", "Other"],
+            "Python2": ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "Console", "Other"],
+            "Python3": ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "Console", "Other"],
             "Ruby": ["Qt4", "Qt4C", "Console", "Other"],
         }
         
@@ -472,17 +472,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", "E4Plugin", "PySide"]:
-            # TODO: add PyQt5
+        if self.pdata["PROJECTTYPE"][0] in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
             self.pdata["FILETYPES"]["*.ui"] = "FORMS"
             self.pdata["FILETYPES"]["*.ui.h"] = "FORMS"
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+                                            "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
-            # TODO: add PyQt5
             self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES"
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+                                            "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
-            # TODO: add PyQt5
             self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
             self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS"
         try:
@@ -498,8 +497,8 @@
         Public method to update the filetype associations with new default values.
         """
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+                                            "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
-            # TODO: add PyQt5
             if "*.ts" not in self.pdata["FILETYPES"]:
                 self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
             if "*.qm" not in self.pdata["FILETYPES"]:
@@ -1140,8 +1139,7 @@
         if dlg.exec_() == QDialog.Accepted:
             lang = dlg.getSelectedLanguage()
             if self.pdata["PROJECTTYPE"][0] in \
-                    ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]:
-                # TODO: add PyQt5
+                    ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "PySide", "PySideC"]:
                 langFile = self.pdata["TRANSLATIONPATTERN"][0].replace("%language%", lang)
                 self.appendFile(langFile)
             self.projectLanguageAddedByCode.emit(lang)