diff -r 1b5dae8f0173 -r c473d6347610 Project/Project.py
--- a/Project/Project.py Sat Jul 05 18:38:10 2014 +0200
+++ b/Project/Project.py Sat Jul 05 19:27:57 2014 +0200
@@ -245,15 +245,16 @@
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("Eric Plugin")
+ 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",
- "Console", "Other"],
+ "E6Plugin", "Console", "Other"],
"Python3": ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
- "Console", "Other"],
+ "E6Plugin", "Console", "Other"],
"Ruby": ["Qt4", "Qt4C", "Console", "Other"],
}
@@ -504,14 +505,16 @@
self.pdata["FILETYPES"]["*{0}".format(ext)] = "SOURCES"
self.pdata["FILETYPES"]["*.idl"] = "INTERFACES"
if self.pdata["PROJECTTYPE"][0] in ["Qt4", "PyQt5", "E4Plugin",
- "PySide"]:
+ "E6Plugin", "PySide"]:
self.pdata["FILETYPES"]["*.ui"] = "FORMS"
self.pdata["FILETYPES"]["*.ui.h"] = "FORMS"
- if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+ if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C",
+ "E4Plugin", "E6Plugin",
"PyQt5", "PyQt5C",
"PySide", "PySideC"]:
self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES"
- if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+ if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C",
+ "E4Plugin", "E6Plugin",
"PyQt5", "PyQt5C",
"PySide", "PySideC"]:
self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
@@ -531,7 +534,8 @@
Public method to update the filetype associations with new default
values.
"""
- if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
+ if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C",
+ "E4Plugin", "E6Plugin",
"PyQt5", "PyQt5C",
"PySide", "PySideC"]:
if "*.ts" not in self.pdata["FILETYPES"]:
@@ -1234,8 +1238,8 @@
if dlg.exec_() == QDialog.Accepted:
lang = dlg.getSelectedLanguage()
if self.pdata["PROJECTTYPE"][0] in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "PySide",
- "PySideC"]:
+ ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "E6Plugin",
+ "PySide", "PySideC"]:
langFile = self.pdata["TRANSLATIONPATTERN"][0]\
.replace("%language%", lang)
self.appendFile(langFile)
@@ -2061,7 +2065,7 @@
self.menuApidocAct.setEnabled(True)
self.menuPackagersAct.setEnabled(True)
self.pluginGrp.setEnabled(
- self.pdata["PROJECTTYPE"][0] == "E4Plugin")
+ self.pdata["PROJECTTYPE"][0] in ["E4Plugin", "E6Plugin"])
self.addLanguageAct.setEnabled(
len(self.pdata["TRANSLATIONPATTERN"]) > 0 and
self.pdata["TRANSLATIONPATTERN"][0] != '')
@@ -2425,7 +2429,7 @@
self.subdirs.append(tp)
self.pluginGrp.setEnabled(
- self.pdata["PROJECTTYPE"][0] == "E4Plugin")
+ self.pdata["PROJECTTYPE"][0] in ["E4Plugin", "E6Plugin"])
self.__model.projectPropertiesChanged()
self.projectPropertiesChanged.emit()
@@ -2629,7 +2633,8 @@
self.menuApidocAct.setEnabled(True)
self.menuPackagersAct.setEnabled(True)
self.pluginGrp.setEnabled(
- self.pdata["PROJECTTYPE"][0] == "E4Plugin")
+ self.pdata["PROJECTTYPE"][0] in [
+ "E4Plugin", "E6Plugin"])
self.addLanguageAct.setEnabled(
len(self.pdata["TRANSLATIONPATTERN"]) > 0 and
self.pdata["TRANSLATIONPATTERN"][0] != '')
