Mercurial Repositories > eric / file diff

--- a/Project/Project.py	Mon Jul 08 21:47:26 2013 +0200
+++ b/Project/Project.py	Mon Jul 08 22:36:10 2013 +0200
@@ -233,13 +233,15 @@
         
         self.__projectTypes["Qt4"] = self.trUtf8("Qt GUI")
         self.__projectTypes["Qt4C"] = self.trUtf8("Qt Console")
+        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 = {
-            "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"],
         }
         
@@ -476,13 +478,15 @@
         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"]:
+        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"]:
             self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES"
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+                                            "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
             self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
             self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS"
@@ -499,6 +503,7 @@
         Public method to update the filetype associations with new default values.
         """
         if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+                                            "PyQt5", "PyQt5C",
                                             "PySide", "PySideC"]:
             if "*.ts" not in self.pdata["FILETYPES"]:
                 self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
@@ -1140,7 +1145,7 @@
         if dlg.exec_() == QDialog.Accepted:
             lang = dlg.getSelectedLanguage()
             if self.pdata["PROJECTTYPE"][0] in \
-                    ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]:
+                    ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "PySide", "PySideC"]:
                 langFile = self.pdata["TRANSLATIONPATTERN"][0].replace("%language%", lang)
                 self.appendFile(langFile)
             self.projectLanguageAddedByCode.emit(lang)
@@ -2373,8 +2378,9 @@
                     QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
                     QApplication.processEvents()
                     
+                    oldState = self.isDirty()
                     self.vcs = self.initVCS()
-                    if self.vcs is None:
+                    if self.vcs is None and self.isDirty() == oldState:
                         # check, if project is version controlled
                         pluginManager = e5App().getObject("PluginManager")
                         for indicator, vcsData in \