Mercurial Repositories > eric / file diff

--- a/Project/ProjectResourcesBrowser.py	Wed Aug 17 17:52:52 2016 +0200
+++ b/Project/ProjectResourcesBrowser.py	Thu Aug 18 17:02:21 2016 +0200
@@ -630,14 +630,14 @@
         args = []
         self.buf = ""
         
-        if self.project.pdata["PROGLANGUAGE"][0] in \
+        if self.project.getProjectLanguage() in \
                 ["Python", "Python2", "Python3"]:
             if self.project.getProjectType() in ["Qt4", "Qt4C"]:
                 self.rccCompiler = 'pyrcc4'
                 if Utilities.isWindowsPlatform():
                     self.rccCompiler += '.exe'
                 if PYQT_VERSION >= 0x040500:
-                    if self.project.pdata["PROGLANGUAGE"][0] in \
+                    if self.project.getProjectLanguage() in \
                             ["Python", "Python2"]:
                         args.append("-py2")
                     else:
@@ -649,7 +649,7 @@
             elif self.project.getProjectType() in ["E6Plugin"]:
                 if PYQT_VERSION < 0x050000:
                     self.rccCompiler = 'pyrcc4'
-                    if self.project.pdata["PROGLANGUAGE"][0] in \
+                    if self.project.getProjectLanguage() in \
                             ["Python", "Python2"]:
                         args.append("-py2")
                     else:
@@ -661,14 +661,14 @@
             elif self.project.getProjectType() in ["PySide", "PySideC"]:
                 self.rccCompiler = Utilities.generatePySideToolPath(
                     'pyside-rcc')
-                if self.project.pdata["PROGLANGUAGE"][0] in \
+                if self.project.getProjectLanguage() in \
                         ["Python", "Python2"]:
                     args.append("-py2")
                 else:
                     args.append("-py3")
             else:
                 return None
-        elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby":
+        elif self.project.getProjectLanguage() == "Ruby":
             if self.project.getProjectType() == "Qt4":
                 self.rccCompiler = 'rbrcc'
                 if Utilities.isWindowsPlatform():
@@ -684,11 +684,11 @@
         fn = os.path.join(self.project.ppath, fn)
         
         dirname, filename = os.path.split(ofn)
-        if self.project.pdata["PROGLANGUAGE"][0] in \
+        if self.project.getProjectLanguage() in \
                 ["Python", "Python2", "Python3"]:
             self.compiledFile = os.path.join(
                 dirname, self.RCFilenameFormatPython.format(filename))
-        elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby":
+        elif self.project.getProjectLanguage() == "Ruby":
             self.compiledFile = os.path.join(
                 dirname, self.RCFilenameFormatRuby.format(filename))
         
@@ -859,12 +859,12 @@
                 progress.setValue(i)
                 QApplication.processEvents()
                 ifn = os.path.join(self.project.ppath, fn)
-                if self.project.pdata["PROGLANGUAGE"][0] in \
+                if self.project.getProjectLanguage() in \
                    ["Python", "Python2", "Python3"]:
                     dirname, filename = os.path.split(os.path.splitext(ifn)[0])
                     ofn = os.path.join(
                         dirname, self.RCFilenameFormatPython.format(filename))
-                elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby":
+                elif self.project.getProjectLanguage() == "Ruby":
                     dirname, filename = os.path.split(os.path.splitext(ifn)[0])
                     ofn = os.path.join(
                         dirname, self.RCFilenameFormatRuby.format(filename))