Mercurial Repositories > eric / file diff

--- a/src/eric7/Project/ProjectResourcesBrowser.py	Wed Nov 16 10:10:06 2022 +0100
+++ b/src/eric7/Project/ProjectResourcesBrowser.py	Wed Nov 16 10:53:40 2022 +0100
@@ -642,7 +642,9 @@
                 with open(ofn, "w", encoding="utf-8", newline=newline) as f:
                     for line in self.buf.splitlines():
                         f.write(line + "\n")
-                if self.compiledFile not in self.project.pdata["SOURCES"]:
+                if self.compiledFile not in self.project.getProjectData(
+                    dataKey="SOURCES"
+                ):
                     self.project.appendFile(ofn)
                 ui.showNotification(
                     EricPixmapCache.getPixmap("resourcesCompiler48"),
@@ -696,7 +698,7 @@
             else:
                 return None
             defaultParameters = self.project.getDefaultRccCompilerParameters()
-            rccParameters = self.project.pdata["RCCPARAMS"]
+            rccParameters = self.project.getProjectData(dataKey="RCCPARAMS")
             if (
                 rccParameters["CompressionThreshold"]
                 != defaultParameters["CompressionThreshold"]
@@ -774,9 +776,11 @@
         Private method to compile all resources to source files.
         """
         if self.hooks["compileAllResources"] is not None:
-            self.hooks["compileAllResources"](self.project.pdata["RESOURCES"])
+            self.hooks["compileAllResources"](
+                self.project.getProjectData(dataKey="RESOURCES")
+            )
         else:
-            numResources = len(self.project.pdata["RESOURCES"])
+            numResources = len(self.project.getProjectData(dataKey="RESOURCES"))
             progress = EricProgressDialog(
                 self.tr("Compiling resources..."),
                 self.tr("Abort"),
@@ -789,7 +793,7 @@
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Resources"))
 
-            for prog, fn in enumerate(self.project.pdata["RESOURCES"]):
+            for prog, fn in enumerate(self.project.getProjectData(dataKey="RESOURCES")):
                 progress.setValue(prog)
                 if progress.wasCanceled():
                     break
@@ -878,9 +882,11 @@
         Public method to compile all changed resources to source files.
         """
         if self.hooks["compileChangedResources"] is not None:
-            self.hooks["compileChangedResources"](self.project.pdata["RESOURCES"])
+            self.hooks["compileChangedResources"](
+                self.project.getProjectData(dataKey="RESOURCES")
+            )
         else:
-            if len(self.project.pdata["RESOURCES"]) == 0:
+            if len(self.project.getProjectData(dataKey="RESOURCES")) == 0:
                 # The project does not contain resource files
                 return
 
@@ -897,8 +903,8 @@
 
             # get list of changed resources
             changedResources = []
-            progress.setMaximum(len(self.project.pdata["RESOURCES"]))
-            for prog, fn in enumerate(self.project.pdata["RESOURCES"]):
+            progress.setMaximum(len(self.project.getProjectData(dataKey="RESOURCES")))
+            for prog, fn in enumerate(self.project.getProjectData(dataKey="RESOURCES")):
                 progress.setValue(prog)
                 QApplication.processEvents()
                 ifn = os.path.join(self.project.ppath, fn)
@@ -920,7 +926,7 @@
                     or self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime)
                 ):
                     changedResources.append(fn)
-            progress.setValue(len(self.project.pdata["RESOURCES"]))
+            progress.setValue(len(self.project.getProjectData(dataKey="RESOURCES")))
             QApplication.processEvents()
 
             if changedResources:
@@ -954,7 +960,7 @@
         """
         from .RccCompilerOptionsDialog import RccCompilerOptionsDialog
 
-        params = self.project.pdata["RCCPARAMS"]
+        params = self.project.getProjectData(dataKey="RCCPARAMS")
 
         dlg = RccCompilerOptionsDialog(params)
         if dlg.exec() == QDialog.DialogCode.Accepted: