Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Mon Dec 21 13:36:24 2020 +0100
+++ b/eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Tue Dec 22 19:59:29 2020 +0100
@@ -44,8 +44,6 @@
         self.eStartWithCompleter = E5FileCompleter(self.eStartWith)
         self.eWorkDirCompleter = E5DirCompleter(self.eWorkDir)
         
-        self.__dialogVariant = dialogVariant
-        
         self.__typeButtonsGroup = QButtonGroup(self)
         self.__typeButtonsGroup.setExclusive(True)
         self.__typeButtonsGroup.addButton(self.rOpenFile, 1)
@@ -70,11 +68,11 @@
             self.pyqtComboBox.setCurrentIndex(0)
             self.pyqtComboBox.setEnabled(False)
         else:
-            self.pyqtComboBox.addItems(["PyQt5"])
+            self.pyqtComboBox.addItems(["PyQt5", "PyQt6"])
             self.setWindowTitle(self.tr("QFileDialog Wizard"))
             if self.__dialogVariant == 5:
                 self.pyqtComboBox.setCurrentIndex(0)
-            elif self.__dialogVariant == 4:
+            elif self.__dialogVariant == 6:
                 self.pyqtComboBox.setCurrentIndex(1)
             else:
                 self.pyqtComboBox.setCurrentIndex(0)
@@ -116,12 +114,12 @@
         self.rfOpenFiles.setEnabled(txt == "eric")
         self.rfSaveFile.setEnabled(txt == "eric")
         
-        self.rOpenFileUrl.setEnabled(txt == "PyQt5")
-        self.rOpenFileUrls.setEnabled(txt == "PyQt5")
-        self.rSaveFileUrl.setEnabled(txt == "PyQt5")
-        self.rDirectoryUrl.setEnabled(txt == "PyQt5")
+        self.rOpenFileUrl.setEnabled(txt in ["PyQt5", "PyQt6"])
+        self.rOpenFileUrls.setEnabled(txt in ["PyQt5", "PyQt6"])
+        self.rSaveFileUrl.setEnabled(txt in ["PyQt5", "PyQt6"])
+        self.rDirectoryUrl.setEnabled(txt in ["PyQt5", "PyQt6"])
         
-        if txt == "PyQt5":
+        if txt in ["PyQt5", "PyQt6"]:
             if self.rfOpenFile.isChecked():
                 self.rOpenFile.setChecked(True)
             elif self.rfOpenFiles.isChecked():
@@ -142,6 +140,8 @@
             self.__dialogVariant = -1
         elif txt == "PyQt5":
             self.__dialogVariant = 5
+        elif txt == "PyQt6":
+            self.__dialogVariant = 6
         else:
             # default is PyQt5
             self.__dialogVariant = 5
@@ -346,8 +346,9 @@
         @param checkedId id of the clicked button (integer)
         """
         enable = (
-            (self.__dialogVariant in (-1, 4) and checkedId in [11, 12, 13]) or
-            (self.__dialogVariant == 5 and checkedId in [1, 2, 3, 21, 22, 23])
+            (self.__dialogVariant in (-1, ) and checkedId in [11, 12, 13]) or
+            (self.__dialogVariant in (5, 6) and
+             checkedId in [1, 2, 3, 21, 22, 23])
         )
         
         self.lInitialFilter.setEnabled(enable)
@@ -399,10 +400,10 @@
         filterVariable = self.eFilterVariable.text()
         if not filterVariable:
             if (
-                (self.__dialogVariant in (-1, 4) and
+                (self.__dialogVariant in (-1, ) and
                  self.__typeButtonsGroup.checkedButton() in [
                     self.rfOpenFile, self.rfOpenFiles, self.rfSaveFile]) or
-                (self.__dialogVariant == 5 and
+                (self.__dialogVariant in (5, 6) and
                  self.__typeButtonsGroup.checkedButton() in [
                     self.rOpenFile, self.rOpenFiles, self.rSaveFile])
             ):
@@ -464,7 +465,7 @@
                 else:
                     fmt = 'self.tr("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfOpenFile.isChecked() or self.__dialogVariant == 5:
+            if self.rfOpenFile.isChecked() or self.__dialogVariant in (5, 6):
                 if self.eInitialFilter.text() == "":
                     initialFilter = "None"
                 else:
@@ -527,7 +528,7 @@
                 else:
                     fmt = 'self.tr("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfOpenFiles.isChecked() or self.__dialogVariant == 5:
+            if self.rfOpenFiles.isChecked() or self.__dialogVariant in (5, 6):
                 if self.eInitialFilter.text() == "":
                     initialFilter = "None"
                 else:
@@ -593,7 +594,7 @@
                 else:
                     fmt = 'self.tr("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfSaveFile.isChecked() or self.__dialogVariant == 5:
+            if self.rfSaveFile.isChecked() or self.__dialogVariant in (5, 6):
                 if self.eInitialFilter.text() == "":
                     initialFilter = "None"
                 else: