Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Thu Feb 01 13:30:35 2024 +0100
+++ b/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Thu Feb 01 15:44:36 2024 +0100
@@ -31,7 +31,7 @@
             "eric_string",
         ),
         (
-            QCoreApplication.translate("FileDialogWizardDialog", "eric (Path)"),
+            QCoreApplication.translate("FileDialogWizardDialog", "eric (pathlib.Path)"),
             "eric_pathlib",
         ),
     )
@@ -317,9 +317,9 @@
         @param checkedId id of the clicked button
         @type int
         """
-        enable = (self.__dialogVariant in (-1, -2) and checkedId in [11, 12, 13]) or (
-            self.__dialogVariant in (5, 6) and checkedId in [1, 2, 3, 21, 22, 23]
-        )
+        enable = (
+            self.__dialogVariant in (-1, -2) and checkedId in [1, 2, 3, 11, 12, 13]
+        ) or (self.__dialogVariant in (5, 6) and checkedId in [1, 2, 3, 21, 22, 23])
 
         self.lInitialFilter.setEnabled(enable)
         self.eInitialFilter.setEnabled(enable)
@@ -459,16 +459,15 @@
                 else:
                     fmt = 'self.tr("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfOpenFile.isChecked() or self.__dialogVariant in (5, 6):
-                if self.eInitialFilter.text() == "":
-                    initialFilter = "None"
+            if self.eInitialFilter.text() == "":
+                initialFilter = "None"
+            else:
+                if self.cInitialFilter.isChecked():
+                    fmt = "{0}"
                 else:
-                    if self.cInitialFilter.isChecked():
-                        fmt = "{0}"
-                    else:
-                        fmt = 'self.tr("{0}")'
-                    initialFilter = fmt.format(self.eInitialFilter.text())
-                code += ",{0}{1}{2}".format(os.linesep, istring, initialFilter)
+                    fmt = 'self.tr("{0}")'
+                initialFilter = fmt.format(self.eInitialFilter.text())
+            code += ",{0}{1}{2}".format(os.linesep, istring, initialFilter)
             if not self.cSymlinks.isChecked():
                 code += ",{0}{1}{2}{3}.DontResolveSymlinks".format(
                     os.linesep, istring, dialogType, optionStr
@@ -535,16 +534,15 @@
                 else:
                     fmt = 'self.tr("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfOpenFiles.isChecked() or self.__dialogVariant in (5, 6):
-                if self.eInitialFilter.text() == "":
-                    initialFilter = "None"
+            if self.eInitialFilter.text() == "":
+                initialFilter = "None"
+            else:
+                if self.cInitialFilter.isChecked():
+                    fmt = "{0}"
                 else:
-                    if self.cInitialFilter.isChecked():
-                        fmt = "{0}"
-                    else:
-                        fmt = 'self.tr("{0}")'
-                    initialFilter = fmt.format(self.eInitialFilter.text())
-                code += ",{0}{1}{2}".format(os.linesep, istring, initialFilter)
+                    fmt = 'self.tr("{0}")'
+                initialFilter = fmt.format(self.eInitialFilter.text())
+            code += ",{0}{1}{2}".format(os.linesep, istring, initialFilter)
             if not self.cSymlinks.isChecked():
                 code += ",{0}{1}{2}{3}.DontResolveSymlinks".format(
                     os.linesep, istring, dialogType, optionStr
@@ -611,16 +609,15 @@
                 else:
                     fmt = 'self.tr("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfSaveFile.isChecked() or self.__dialogVariant in (5, 6):
-                if self.eInitialFilter.text() == "":
-                    initialFilter = "None"
+            if self.eInitialFilter.text() == "":
+                initialFilter = "None"
+            else:
+                if self.cInitialFilter.isChecked():
+                    fmt = "{0}"
                 else:
-                    if self.cInitialFilter.isChecked():
-                        fmt = "{0}"
-                    else:
-                        fmt = 'self.tr("{0}")'
-                    initialFilter = fmt.format(self.eInitialFilter.text())
-                code += ",{0}{1}{2}".format(os.linesep, istring, initialFilter)
+                    fmt = 'self.tr("{0}")'
+                initialFilter = fmt.format(self.eInitialFilter.text())
+            code += ",{0}{1}{2}".format(os.linesep, istring, initialFilter)
             if (not self.cSymlinks.isChecked()) or (
                 not self.cConfirmOverwrite.isChecked()
             ):