Mercurial Repositories > eric / file diff

diff -r 6e260b424396 -r 2b104ad132a4 src/eric7/Project/ProjectFormsBrowser.py
--- a/src/eric7/Project/ProjectFormsBrowser.py	Wed Nov 16 10:10:06 2022 +0100
+++ b/src/eric7/Project/ProjectFormsBrowser.py	Wed Nov 16 10:53:40 2022 +0100
@@ -561,7 +561,7 @@
         fileNames = []
         for itm in self.getSelectedItems():
             fileNames.append(itm.fileName())
-        trfiles = sorted(self.project.pdata["TRANSLATIONS"][:])
+        trfiles = sorted(self.project.getProjectData(dataKey="TRANSLATIONS")[:])
         fileNames.extend(
             [
                 os.path.join(self.project.ppath, trfile)
@@ -786,7 +786,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("designer48"),
@@ -861,18 +863,21 @@
                 indentWidth = Preferences.getQt("PyuicIndent")
                 if indentWidth != self.Pyuic5IndentDefault:
                     args.append("--indent={0}".format(indentWidth))
-                if "uic5" in uicompiler and self.project.pdata["UICPARAMS"]["Package"]:
+                if (
+                    "uic5" in uicompiler
+                    and self.project.getProjectData(dataKey="UICPARAMS")["Package"]
+                ):
                     args.append(
                         "--import-from={0}".format(
-                            self.project.pdata["UICPARAMS"]["Package"]
+                            self.project.getProjectData(dataKey="UICPARAMS")["Package"]
                         )
                     )
                 elif Preferences.getQt("PyuicFromImports"):
                     args.append("--from-imports")
-                if self.project.pdata["UICPARAMS"]["RcSuffix"]:
+                if self.project.getProjectData(dataKey="UICPARAMS")["RcSuffix"]:
                     args.append(
                         "--resource-suffix={0}".format(
-                            self.project.pdata["UICPARAMS"]["RcSuffix"]
+                            self.project.getProjectData(dataKey="UICPARAMS")["RcSuffix"]
                         )
                     )
         elif self.project.getProjectLanguage() == "Ruby":
@@ -949,9 +954,9 @@
         Private method to compile all forms to source files.
         """
         if self.hooks["compileAllForms"] is not None:
-            self.hooks["compileAllForms"](self.project.pdata["FORMS"])
+            self.hooks["compileAllForms"](self.project.getProjectData(dataKey="FORMS"))
         else:
-            numForms = len(self.project.pdata["FORMS"])
+            numForms = len(self.project.getProjectData(dataKey="FORMS"))
             progress = EricProgressDialog(
                 self.tr("Compiling forms..."),
                 self.tr("Abort"),
@@ -964,7 +969,7 @@
             progress.setMinimumDuration(0)
             progress.setWindowTitle(self.tr("Forms"))
 
-            for prog, fn in enumerate(self.project.pdata["FORMS"]):
+            for prog, fn in enumerate(self.project.getProjectData(dataKey="FORMS")):
                 progress.setValue(prog)
                 if progress.wasCanceled():
                     break
@@ -1020,7 +1025,9 @@
         Public method to compile all changed forms to source files.
         """
         if self.hooks["compileChangedForms"] is not None:
-            self.hooks["compileChangedForms"](self.project.pdata["FORMS"])
+            self.hooks["compileChangedForms"](
+                self.project.getProjectData(dataKey="FORMS")
+            )
         else:
             if self.project.getProjectType() not in [
                 "PyQt5",
@@ -1032,7 +1039,7 @@
                 # ignore the request for non Qt GUI projects
                 return
 
-            if len(self.project.pdata["FORMS"]) == 0:
+            if len(self.project.getProjectData(dataKey="FORMS")) == 0:
                 # The project does not contain form files.
                 return
 
@@ -1049,8 +1056,8 @@
 
             # get list of changed forms
             changedForms = []
-            progress.setMaximum(len(self.project.pdata["FORMS"]))
-            for prog, fn in enumerate(self.project.pdata["FORMS"]):
+            progress.setMaximum(len(self.project.getProjectData(dataKey="FORMS")))
+            for prog, fn in enumerate(self.project.getProjectData(dataKey="FORMS")):
                 progress.setValue(prog)
                 QApplication.processEvents()
 
@@ -1065,7 +1072,7 @@
                     or os.stat(ifn).st_mtime > os.stat(ofn).st_mtime
                 ):
                     changedForms.append(fn)
-            progress.setValue(len(self.project.pdata["FORMS"]))
+            progress.setValue(len(self.project.getProjectData(dataKey="FORMS")))
             QApplication.processEvents()
 
             if changedForms:
@@ -1103,7 +1110,7 @@
         """
         from .UicCompilerOptionsDialog import UicCompilerOptionsDialog
 
-        params = self.project.pdata["UICPARAMS"]
+        params = self.project.getProjectData(dataKey="UICPARAMS")
 
         if self.project.getProjectType() in ["PyQt5", "PyQt6", "E7Plugin"]:
             dlg = UicCompilerOptionsDialog(params, self.getUiCompiler())