Mercurial Repositories > eric / file diff

--- a/Project/ProjectResourcesBrowser.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Project/ProjectResourcesBrowser.py	Sun Nov 03 15:58:22 2013 +0100
@@ -85,7 +85,8 @@
         
         self.menu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+                 "PySide", "PySideC"]:
             self.menu.addAction(
                 self.trUtf8('Compile resource'),
                 self.__compileResource)
@@ -120,7 +121,8 @@
         self.menuActions.append(act)
         self.menu.addSeparator()
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+                 "PySide", "PySideC"]:
             self.menu.addAction(
                 self.trUtf8('New resource...'), self.__newResource)
         else:
@@ -147,7 +149,8 @@
 
         self.backMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+                 "PySide", "PySideC"]:
             self.backMenu.addAction(
                 self.trUtf8('Compile all resources'),
                 self.__compileAllResources)
@@ -184,7 +187,8 @@
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+                 "PySide", "PySideC"]:
             act = self.multiMenu.addAction(
                 self.trUtf8('Compile resources'),
                 self.__compileSelectedResources)
@@ -215,7 +219,8 @@
 
         self.dirMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+                 "PySide", "PySideC"]:
             self.dirMenu.addAction(
                 self.trUtf8('Compile all resources'),
                 self.__compileAllResources)
@@ -255,7 +260,8 @@
         
         self.dirMultiMenu = QMenu(self)
         if self.project.getProjectType() in \
-                ["Qt4", "PyQt5", "E4Plugin", "PySide"]:
+                ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin",
+                 "PySide", "PySideC"]:
             self.dirMultiMenu.addAction(
                 self.trUtf8('Compile all resources'),
                 self.__compileAllResources)
@@ -380,7 +386,7 @@
         if isinstance(itm, ProjectBrowserFileItem):
             dn = os.path.dirname(itm.fileName())
         elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
-             isinstance(itm, ProjectBrowserDirectoryItem):
+                isinstance(itm, ProjectBrowserDirectoryItem):
             dn = itm.dirName()
         else:
             dn = None
@@ -394,7 +400,7 @@
         if isinstance(itm, ProjectBrowserFileItem):
             dn = os.path.dirname(itm.fileName())
         elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
-             isinstance(itm, ProjectBrowserDirectoryItem):
+                isinstance(itm, ProjectBrowserDirectoryItem):
             dn = itm.dirName()
         else:
             dn = None
@@ -480,8 +486,8 @@
                     self.trUtf8("New Resource"),
                     self.trUtf8(
                         "<p>The new resource file <b>{0}</b> could not"
-                        " be created.<br>Problem: {1}</p>")\
-                        .format(fname, str(e)))
+                        " be created.<br>Problem: {1}</p>")
+                    .format(fname, str(e)))
                 return
             
             self.project.appendFile(fname)
@@ -548,7 +554,7 @@
         while self.compileProc and self.compileProc.canReadLine():
             s = self.rccCompiler + ': '
             error = str(self.compileProc.readLine(),
-                            ioEncoding, 'replace')
+                        ioEncoding, 'replace')
             s += error
             self.appendStderr.emit(s)
         
@@ -625,7 +631,7 @@
         
         if self.project.pdata["PROGLANGUAGE"][0] in \
                 ["Python", "Python2", "Python3"]:
-            if self.project.getProjectType() in ["Qt4", "E4Plugin"]:
+            if self.project.getProjectType() in ["Qt4", "Qt4C","E4Plugin"]:
                 self.rccCompiler = 'pyrcc4'
                 if Utilities.isWindowsPlatform():
                     self.rccCompiler += '.exe'
@@ -635,11 +641,11 @@
                         args.append("-py2")
                     else:
                         args.append("-py3")
-            elif self.project.getProjectType() == "PyQt5":
+            elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
                 self.rccCompiler = 'pyrcc5'
                 if Utilities.isWindowsPlatform():
                     self.rccCompiler += '.exe'
-            elif self.project.getProjectType() == "PySide":
+            elif self.project.getProjectType() in ["PySide", "PySideC"]:
                 self.rccCompiler = Utilities.generatePySideToolPath(
                     'pyside-rcc')
                 if self.project.pdata["PROGLANGUAGE"][0] in \
@@ -746,7 +752,7 @@
         Private method to compile selected resources to source files.
         """
         items = self.getSelectedItems()
-        files = [self.project.getRelativePath(itm.fileName()) \
+        files = [self.project.getRelativePath(itm.fileName())
                  for itm in items]
         
         if self.hooks["compileSelectedResources"] is not None: