diff -r c4d0cac9b5c9 -r aff39db4dacc eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py
--- a/eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sat Sep 21 22:03:03 2019 +0200
+++ b/eric6/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Mon Sep 23 19:10:42 2019 +0200
@@ -11,8 +11,9 @@
import os
from PyQt5.QtCore import pyqtSlot, QUrl
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFileDialog, \
- QButtonGroup
+from PyQt5.QtWidgets import (
+ QDialog, QDialogButtonBox, QFileDialog, QButtonGroup
+)
from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
@@ -400,12 +401,14 @@
nameVariable = "res"
filterVariable = self.eFilterVariable.text()
if not filterVariable:
- if (self.__dialogVariant in (-1, 4) and
- self.__typeButtonsGroup.checkedButton() in [
- self.rfOpenFile, self.rfOpenFiles, self.rfSaveFile]) or \
- (self.__dialogVariant == 5 and
- self.__typeButtonsGroup.checkedButton() in [
- self.rOpenFile, self.rOpenFiles, self.rSaveFile]):
+ if (
+ (self.__dialogVariant in (-1, 4) and
+ self.__typeButtonsGroup.checkedButton() in [
+ self.rfOpenFile, self.rfOpenFiles, self.rfSaveFile]) or
+ (self.__dialogVariant == 5 and
+ self.__typeButtonsGroup.checkedButton() in [
+ self.rOpenFile, self.rOpenFiles, self.rSaveFile])
+ ):
filterVariable = ", selectedFilter"
else:
filterVariable = ""
@@ -418,8 +421,11 @@
dialogType = "QFileDialog"
code = '{0}{1} = {2}.'.format(nameVariable, filterVariable, dialogType)
- if self.rOpenFile.isChecked() or self.rfOpenFile.isChecked() or \
- self.rOpenFileUrl.isChecked():
+ if (
+ self.rOpenFile.isChecked() or
+ self.rfOpenFile.isChecked() or
+ self.rOpenFileUrl.isChecked()
+ ):
if self.rOpenFile.isChecked():
code += 'getOpenFileName({0}{1}'.format(os.linesep, istring)
elif self.rOpenFileUrl.isChecked():
@@ -472,17 +478,17 @@
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}.DontResolveSymlinks)'.format(
+ os.linesep, istring, dialogType)
if self.rOpenFileUrl.isChecked() and bool(self.schemesEdit.text()):
- code += \
- ',{0}{1}{2}'.format(os.linesep, istring,
- self.__prepareSchemesList())
+ code += ',{0}{1}{2}'.format(
+ os.linesep, istring, self.__prepareSchemesList())
code += '){0}'.format(estring)
- elif self.rOpenFiles.isChecked() or self.rfOpenFiles.isChecked() or \
- self.rOpenFileUrls.isChecked():
+ elif (
+ self.rOpenFiles.isChecked() or
+ self.rfOpenFiles.isChecked() or
+ self.rOpenFileUrls.isChecked()
+ ):
if self.rOpenFiles.isChecked():
code += 'getOpenFileNames({0}{1}'.format(os.linesep, istring)
elif self.rOpenFileUrls.isChecked():
@@ -535,18 +541,20 @@
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)
- if self.rOpenFileUrls.isChecked() and \
- bool(self.schemesEdit.text()):
- code += \
- ',{0}{1}{2}'.format(os.linesep, istring,
- self.__prepareSchemesList())
+ code += ',{0}{1}{2}.Options({2}.DontResolveSymlinks)'.format(
+ os.linesep, istring, dialogType)
+ if (
+ self.rOpenFileUrls.isChecked() and
+ bool(self.schemesEdit.text())
+ ):
+ code += ',{0}{1}{2}'.format(
+ os.linesep, istring, self.__prepareSchemesList())
code += '){0}'.format(estring)
- elif self.rSaveFile.isChecked() or self.rfSaveFile.isChecked() or \
- self.rSaveFileUrl.isChecked():
+ elif (
+ self.rSaveFile.isChecked() or
+ self.rfSaveFile.isChecked() or
+ self.rSaveFileUrl.isChecked()
+ ):
if self.rSaveFile.isChecked():
code += 'getSaveFileName({0}{1}'.format(os.linesep, istring)
elif self.rSaveFileUrl.isChecked():
@@ -598,23 +606,29 @@
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()):
+ if (
+ (not self.cSymlinks.isChecked()) or
+ (not self.cConfirmOverwrite.isChecked())
+ ):
code += ',{0}{1}{2}.Options('.format(
os.linesep, istring, dialogType)
if not self.cSymlinks.isChecked():
code += '{0}.DontResolveSymlinks'.format(dialogType)
- if (not self.cSymlinks.isChecked()) and \
- (not self.cConfirmOverwrite.isChecked()):
+ if (
+ (not self.cSymlinks.isChecked()) and
+ (not self.cConfirmOverwrite.isChecked())
+ ):
code += ' | '
if not self.cConfirmOverwrite.isChecked():
code += '{0}.DontConfirmOverwrite'.format(dialogType)
code += ')'
- if self.rSaveFileUrl.isChecked() and \
- bool(self.schemesEdit.text()):
- code += \
- ',{0}{1}{2}'.format(os.linesep, istring,
- self.__prepareSchemesList())
+ if (
+ self.rSaveFileUrl.isChecked() and
+ bool(self.schemesEdit.text())
+ ):
+ code += ',{0}{1}{2}'.format(
+ os.linesep, istring, self.__prepareSchemesList())
+
code += '){0}'.format(estring)
elif self.rDirectory.isChecked() or self.rDirectoryUrl.isChecked():
if self.rDirectory.isChecked():
@@ -657,9 +671,8 @@
code += '{0}.Option(0)'.format(dialogType)
code += ')'
if self.rDirectoryUrl.isChecked():
- code += \
- ',{0}{1}{2}'.format(os.linesep, istring,
- self.__prepareSchemesList())
+ code += ',{0}{1}{2}'.format(
+ os.linesep, istring, self.__prepareSchemesList())
code += '){0}'.format(estring)
return code
