diff -r 647426d44f04 -r d0d7836d0c01 Project/ProjectResourcesBrowser.py
--- a/Project/ProjectResourcesBrowser.py Mon Jun 24 19:42:54 2013 +0200
+++ b/Project/ProjectResourcesBrowser.py Tue Jun 25 18:50:45 2013 +0200
@@ -76,8 +76,7 @@
self.dirMultiMenuActions = []
self.menu = QMenu(self)
- if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]:
- # TODO: add PyQt5
+ if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
self.menu.addAction(self.trUtf8('Compile resource'),
self.__compileResource)
self.menu.addAction(self.trUtf8('Compile all resources'),
@@ -106,8 +105,7 @@
act = self.menu.addAction(self.trUtf8('Delete'), self.__deleteFile)
self.menuActions.append(act)
self.menu.addSeparator()
- if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]:
- # TODO: add PyQt5
+ if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
self.menu.addAction(self.trUtf8('New resource...'), self.__newResource)
else:
if self.hooks["newResource"] is not None:
@@ -129,8 +127,7 @@
self.menu.addAction(self.trUtf8('Configure...'), self._configure)
self.backMenu = QMenu(self)
- if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]:
- # TODO: add PyQt5
+ if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
self.backMenu.addAction(self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.backMenu.addSeparator()
@@ -161,8 +158,7 @@
# create the menu for multiple selected files
self.multiMenu = QMenu(self)
- if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]:
- # TODO: add PyQt5
+ if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
act = self.multiMenu.addAction(self.trUtf8('Compile resources'),
self.__compileSelectedResources)
self.multiMenu.addSeparator()
@@ -189,8 +185,7 @@
self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure)
self.dirMenu = QMenu(self)
- if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]:
- # TODO: add PyQt5
+ if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
self.dirMenu.addAction(self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.dirMenu.addSeparator()
@@ -222,8 +217,7 @@
self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure)
self.dirMultiMenu = QMenu(self)
- if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]:
- # TODO: add PyQt5
+ if self.project.getProjectType() in ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
self.dirMultiMenu.addAction(self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.dirMultiMenu.addSeparator()
@@ -581,7 +575,10 @@
args.append("-py2")
else:
args.append("-py3")
- # TODO: add PyQt5
+ elif self.project.getProjectType() == "PyQt5":
+ self.rccCompiler = 'pyrcc5'
+ if Utilities.isWindowsPlatform():
+ self.rccCompiler += '.exe'
elif self.project.getProjectType() == "PySide":
self.rccCompiler = Utilities.generatePySideToolPath('pyside-rcc')
if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]:
