diff -r 8c3d033e5044 -r 0cdead130a81 eric6/Project/ProjectResourcesBrowser.py
--- a/eric6/Project/ProjectResourcesBrowser.py Sat Jun 20 17:36:20 2020 +0200
+++ b/eric6/Project/ProjectResourcesBrowser.py Sun Jun 21 18:26:12 2020 +0200
@@ -79,8 +79,7 @@
self.menu = QMenu(self)
if self.project.getProjectType() in [
- "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"
+ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
]:
self.menu.addAction(
self.tr('Compile resource'),
@@ -122,8 +121,7 @@
self.menuActions.append(act)
self.menu.addSeparator()
if self.project.getProjectType() in [
- "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"
+ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
]:
self.menu.addAction(
self.tr('New resource...'), self.__newResource)
@@ -151,8 +149,7 @@
self.backMenu = QMenu(self)
if self.project.getProjectType() in [
- "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"
+ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
]:
self.backMenu.addAction(
self.tr('Compile all resources'),
@@ -194,8 +191,7 @@
# create the menu for multiple selected files
self.multiMenu = QMenu(self)
if self.project.getProjectType() in [
- "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"
+ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
]:
act = self.multiMenu.addAction(
self.tr('Compile resources'),
@@ -231,8 +227,7 @@
self.dirMenu = QMenu(self)
if self.project.getProjectType() in [
- "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"
+ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
]:
self.dirMenu.addAction(
self.tr('Compile all resources'),
@@ -277,8 +272,7 @@
self.dirMultiMenu = QMenu(self)
if self.project.getProjectType() in [
- "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"
+ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
]:
self.dirMultiMenu.addAction(
self.tr('Compile all resources'),
@@ -556,7 +550,7 @@
def __readStdout(self):
"""
Private slot to handle the readyReadStandardOutput signal of the
- pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process.
+ pyrcc5/pyside2-rcc process.
"""
if self.compileProc is None:
return
@@ -570,7 +564,7 @@
def __readStderr(self):
"""
Private slot to handle the readyReadStandardError signal of the
- pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process.
+ pyrcc5/pyside2-rcc/ process.
"""
if self.compileProc is None:
return
@@ -656,33 +650,14 @@
args = []
self.buf = ""
- if self.project.getProjectLanguage() in [
- "Python", "Python2", "Python3"
- ]:
- if self.project.getProjectType() in ["Qt4", "Qt4C"]:
- self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4')
- if self.project.getProjectLanguage() in [
- "Python", "Python2"
- ]:
- args.append("-py2")
- else:
- args.append("-py3")
- elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
+ if self.project.getProjectLanguage() == "Python3":
+ if self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
elif self.project.getProjectType() in ["E6Plugin"]:
self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
- elif self.project.getProjectType() in ["PySide", "PySideC"]:
- self.rccCompiler = Utilities.generatePySideToolPath(
- 'pyside-rcc', "1")
- if self.project.getProjectLanguage() in [
- "Python", "Python2"
- ]:
- args.append("-py2")
- else:
- args.append("-py3")
elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
self.rccCompiler = Utilities.generatePySideToolPath(
- 'pyside2-rcc', "2")
+ 'pyside2-rcc')
else:
return None
defaultParameters = self.project.getDefaultRccCompilerParameters()
@@ -707,13 +682,6 @@
if rccParameters["PathPrefix"] != defaultParameters["PathPrefix"]:
args.append("-root")
args.append(rccParameters["PathPrefix"])
- elif self.project.getProjectLanguage() == "Ruby":
- if self.project.getProjectType() == "Qt4":
- self.rccCompiler = 'rbrcc'
- if Utilities.isWindowsPlatform():
- self.rccCompiler += '.exe'
- else:
- return None
else:
return None
@@ -723,9 +691,7 @@
fn = os.path.join(self.project.ppath, fn)
dirname, filename = os.path.split(ofn)
- if self.project.getProjectLanguage() in [
- "Python", "Python2", "Python3"
- ]:
+ if self.project.getProjectLanguage() == "Python3":
self.compiledFile = os.path.join(
dirname, self.RCFilenameFormatPython.format(filename))
elif self.project.getProjectLanguage() == "Ruby":
@@ -903,9 +869,7 @@
progress.setValue(i)
QApplication.processEvents()
ifn = os.path.join(self.project.ppath, fn)
- if self.project.getProjectLanguage() in [
- "Python", "Python2", "Python3"
- ]:
+ if self.project.getProjectLanguage() == "Python3":
dirname, filename = os.path.split(os.path.splitext(ifn)[0])
ofn = os.path.join(
dirname, self.RCFilenameFormatPython.format(filename))
