Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Sun Mar 28 15:00:11 2021 +0200
@@ -87,7 +87,7 @@
         self.cFilters.toggled[bool].connect(self.__toggleGroupsAndTest)
         
         self.bTest = self.buttonBox.addButton(
-            self.tr("Test"), QDialogButtonBox.ActionRole)
+            self.tr("Test"), QDialogButtonBox.ButtonRole.ActionRole)
         
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())
@@ -100,16 +100,18 @@
         @return modified options (QFileDialog.Options)
         """
         if Globals.isLinuxPlatform():
-            options |= QFileDialog.DontUseNativeDialog
+            options |= QFileDialog.Option.DontUseNativeDialog
         return options
     
-    @pyqtSlot(str)
-    def on_pyqtComboBox_currentIndexChanged(self, txt):
+    @pyqtSlot(int)
+    def on_pyqtComboBox_currentIndexChanged(self, index):
         """
         Private slot to setup the dialog for the selected PyQt variant.
         
-        @param txt text of the selected combo box entry (string)
+        @param index index of the current item
+        @type int
         """
+        txt = self.pyqtComboBox.itemText(index)
         self.rfOpenFile.setEnabled(txt == "eric")
         self.rfOpenFiles.setEnabled(txt == "eric")
         self.rfSaveFile.setEnabled(txt == "eric")
@@ -165,7 +167,8 @@
         """
         if self.rOpenFile.isChecked() or self.rfOpenFile.isChecked():
             if not self.cSymlinks.isChecked():
-                options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options = QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
@@ -178,7 +181,8 @@
                 options)
         elif self.rOpenFileUrl.isChecked():
             if not self.cSymlinks.isChecked():
-                options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options = QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
@@ -203,7 +207,8 @@
                     self.schemesEdit.text().split())
         elif self.rOpenFiles.isChecked() or self.rfOpenFiles.isChecked():
             if not self.cSymlinks.isChecked():
-                options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options = QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
@@ -216,7 +221,8 @@
                 options)
         elif self.rOpenFileUrls.isChecked():
             if not self.cSymlinks.isChecked():
-                options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options = QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
@@ -241,7 +247,8 @@
                     self.schemesEdit.text().split())
         elif self.rSaveFile.isChecked() or self.rfSaveFile.isChecked():
             if not self.cSymlinks.isChecked():
-                options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options = QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
@@ -254,7 +261,8 @@
                 options)
         elif self.rSaveFileUrl.isChecked():
             if not self.cSymlinks.isChecked():
-                options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options = QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
@@ -280,9 +288,10 @@
         elif self.rDirectory.isChecked():
             options = QFileDialog.Options()
             if not self.cSymlinks.isChecked():
-                options |= QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options |= QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             if self.cDirOnly.isChecked():
-                options |= QFileDialog.Options(QFileDialog.ShowDirsOnly)
+                options |= QFileDialog.Options(QFileDialog.Option.ShowDirsOnly)
             else:
                 options |= QFileDialog.Options(QFileDialog.Option(0))
             options = self.__adjustOptions(options)
@@ -294,9 +303,10 @@
         elif self.rDirectoryUrl.isChecked():
             options = QFileDialog.Options()
             if not self.cSymlinks.isChecked():
-                options |= QFileDialog.Options(QFileDialog.DontResolveSymlinks)
+                options |= QFileDialog.Options(
+                    QFileDialog.Option.DontResolveSymlinks)
             if self.cDirOnly.isChecked():
-                options |= QFileDialog.Options(QFileDialog.ShowDirsOnly)
+                options |= QFileDialog.Options(QFileDialog.Option.ShowDirsOnly)
             else:
                 options |= QFileDialog.Options(QFileDialog.Option(0))
             options = self.__adjustOptions(options)
@@ -415,8 +425,10 @@
         
         if self.__dialogVariant == -1:
             dialogType = "E5FileDialog"
+            optionStr = ""
         else:
             dialogType = "QFileDialog"
+            optionStr = ".Option"
         
         code = '{0}{1} = {2}.'.format(nameVariable, filterVariable, dialogType)
         if (
@@ -476,8 +488,10 @@
                     initialFilter = fmt.format(self.eInitialFilter.text())
                 code += ',{0}{1}{2}'.format(os.linesep, istring, initialFilter)
             if not self.cSymlinks.isChecked():
-                code += ',{0}{1}{2}.Options({2}.DontResolveSymlinks)'.format(
-                    os.linesep, istring, dialogType)
+                code += (
+                    ',{0}{1}{2}.Options({2}{3}.DontResolveSymlinks)'
+                    .format(os.linesep, istring, dialogType, optionStr)
+                )
             if self.rOpenFileUrl.isChecked() and bool(self.schemesEdit.text()):
                 code += ',{0}{1}{2}'.format(
                     os.linesep, istring, self.__prepareSchemesList())
@@ -539,8 +553,10 @@
                     initialFilter = fmt.format(self.eInitialFilter.text())
                 code += ',{0}{1}{2}'.format(os.linesep, istring, initialFilter)
             if not self.cSymlinks.isChecked():
-                code += ',{0}{1}{2}.Options({2}.DontResolveSymlinks)'.format(
-                    os.linesep, istring, dialogType)
+                code += (
+                    ',{0}{1}{2}.Options({2}{3}.DontResolveSymlinks)'
+                    .format(os.linesep, istring, dialogType, optionStr)
+                )
             if (
                 self.rOpenFileUrls.isChecked() and
                 bool(self.schemesEdit.text())
@@ -611,14 +627,16 @@
                 code += ',{0}{1}{2}.Options('.format(
                     os.linesep, istring, dialogType)
                 if not self.cSymlinks.isChecked():
-                    code += '{0}.DontResolveSymlinks'.format(dialogType)
+                    code += '{0}{1}.DontResolveSymlinks'.format(
+                        dialogType, optionStr)
                 if (
                     (not self.cSymlinks.isChecked()) and
                     (not self.cConfirmOverwrite.isChecked())
                 ):
                     code += ' | '
                 if not self.cConfirmOverwrite.isChecked():
-                    code += '{0}.DontConfirmOverwrite'.format(dialogType)
+                    code += '{0}{1}.DontConfirmOverwrite'.format(
+                        dialogType, optionStr)
                 code += ')'
             if (
                 self.rSaveFileUrl.isChecked() and
@@ -662,9 +680,11 @@
             code += ',{0}{1}{2}.Options('.format(os.linesep, istring,
                                                  dialogType)
             if not self.cSymlinks.isChecked():
-                code += '{0}.DontResolveSymlinks | '.format(dialogType)
+                code += '{0}{1}.DontResolveSymlinks | '.format(
+                    dialogType, optionStr)
             if self.cDirOnly.isChecked():
-                code += '{0}.ShowDirsOnly'.format(dialogType)
+                code += '{0}{1}.ShowDirsOnly'.format(
+                    dialogType, optionStr)
             else:
                 code += '{0}.Option(0)'.format(dialogType)
             code += ')'