Wed, 20 Jul 2022 16:18:24 +0200
File Dialog Wizard: removed the no longer needed '__adjustOptions()' method.
--- a/src/eric7/Documentation/Help/source.qhp Wed Jul 20 16:16:26 2022 +0200 +++ b/src/eric7/Documentation/Help/source.qhp Wed Jul 20 16:18:24 2022 +0200 @@ -6110,7 +6110,6 @@ <keyword name="FileDialogWizardDialog" id="FileDialogWizardDialog" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog" /> <keyword name="FileDialogWizardDialog (Constructor)" id="FileDialogWizardDialog (Constructor)" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__init__" /> <keyword name="FileDialogWizardDialog (Module)" id="FileDialogWizardDialog (Module)" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html" /> - <keyword name="FileDialogWizardDialog.__adjustOptions" id="FileDialogWizardDialog.__adjustOptions" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__adjustOptions" /> <keyword name="FileDialogWizardDialog.__prepareSchemesList" id="FileDialogWizardDialog.__prepareSchemesList" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__prepareSchemesList" /> <keyword name="FileDialogWizardDialog.__toggleConfirmCheckBox" id="FileDialogWizardDialog.__toggleConfirmCheckBox" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__toggleConfirmCheckBox" /> <keyword name="FileDialogWizardDialog.__toggleGroupsAndTest" id="FileDialogWizardDialog.__toggleGroupsAndTest" ref="eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__toggleGroupsAndTest" />
--- a/src/eric7/Documentation/Source/eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html Wed Jul 20 16:16:26 2022 +0200 +++ b/src/eric7/Documentation/Source/eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html Wed Jul 20 16:18:24 2022 +0200 @@ -63,10 +63,6 @@ <td>Constructor</td> </tr> <tr> -<td><a href="#FileDialogWizardDialog.__adjustOptions">__adjustOptions</a></td> -<td>Private method to adjust the file dialog options.</td> -</tr> -<tr> <td><a href="#FileDialogWizardDialog.__prepareSchemesList">__prepareSchemesList</a></td> <td>Private method to prepare the list of supported schemes.</td> </tr> @@ -125,26 +121,6 @@ parent widget </dd> </dl> -<a NAME="FileDialogWizardDialog.__adjustOptions" ID="FileDialogWizardDialog.__adjustOptions"></a> -<h4>FileDialogWizardDialog.__adjustOptions</h4> -<b>__adjustOptions</b>(<i>options</i>) - -<p> - Private method to adjust the file dialog options. -</p> -<dl> - -<dt><i>options</i></dt> -<dd> -file dialog options (QFileDialog.Option) -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -modified options (QFileDialog.Option) -</dd> -</dl> <a NAME="FileDialogWizardDialog.__prepareSchemesList" ID="FileDialogWizardDialog.__prepareSchemesList"></a> <h4>FileDialogWizardDialog.__prepareSchemesList</h4> <b>__prepareSchemesList</b>(<i></i>)
--- a/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Wed Jul 20 16:16:26 2022 +0200 +++ b/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Wed Jul 20 16:18:24 2022 +0200 @@ -16,8 +16,6 @@ from .Ui_FileDialogWizardDialog import Ui_FileDialogWizardDialog -import Globals - class FileDialogWizardDialog(QDialog, Ui_FileDialogWizardDialog): """ @@ -114,17 +112,6 @@ msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - def __adjustOptions(self, options): - """ - Private method to adjust the file dialog options. - - @param options file dialog options (QFileDialog.Option) - @return modified options (QFileDialog.Option) - """ - if Globals.isLinuxPlatform(): - options |= QFileDialog.Option.DontUseNativeDialog - return options - @pyqtSlot(int) def on_pyqtComboBox_currentIndexChanged(self, index): """ @@ -193,7 +180,6 @@ options = QFileDialog.Option.DontResolveSymlinks else: options = QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getOpenFileName( None, self.eCaption.text(), @@ -207,7 +193,6 @@ options = QFileDialog.Option.DontResolveSymlinks else: options = QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getOpenFileUrl( None, self.eCaption.text(), @@ -222,7 +207,6 @@ options = QFileDialog.Option.DontResolveSymlinks else: options = QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getOpenFileNames( None, self.eCaption.text(), @@ -236,7 +220,6 @@ options = QFileDialog.Option.DontResolveSymlinks else: options = QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getOpenFileUrls( None, self.eCaption.text(), @@ -251,7 +234,6 @@ options = QFileDialog.Option.DontResolveSymlinks else: options = QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getSaveFileName( None, self.eCaption.text(), @@ -265,7 +247,6 @@ options = QFileDialog.Option.DontResolveSymlinks else: options = QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getSaveFileUrl( None, self.eCaption.text(), @@ -283,7 +264,6 @@ options |= QFileDialog.Option.ShowDirsOnly else: options |= QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getExistingDirectory( None, self.eCaption.text(), self.eWorkDir.text(), options ) @@ -295,7 +275,6 @@ options |= QFileDialog.Option.ShowDirsOnly else: options |= QFileDialog.Option(0) - options = self.__adjustOptions(options) QFileDialog.getExistingDirectoryUrl( None, self.eCaption.text(),