diff -r 9fa339ca2a91 -r d566c2970f39 eric7/Project/Project.py
--- 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.
