diff -r 0e5421d679e7 -r ea526b78ee6c E5Gui/E5FileDialog.py
--- a/E5Gui/E5FileDialog.py Tue Mar 07 18:46:09 2017 +0100
+++ b/E5Gui/E5FileDialog.py Tue Mar 07 18:53:18 2017 +0100
@@ -27,34 +27,34 @@
DontUseSheet = QFileDialog.DontUseSheet
-def __reorderFilter(filter, initialFilter=""):
+def __reorderFilter(filterStr, initialFilter=""):
"""
Private function to reorder the file filter to cope with a KDE issue
introduced by distributor's usage of KDE file dialogs.
- @param filter Qt file filter (string)
+ @param filterStr Qt file filter (string)
@param initialFilter initial filter (string)
@return the rearranged Qt file filter (string)
"""
if initialFilter and not Globals.isMacPlatform():
- fileFilters = filter.split(';;')
+ fileFilters = filterStr.split(';;')
if len(fileFilters) < 10 and initialFilter in fileFilters:
fileFilters.remove(initialFilter)
fileFilters.insert(0, initialFilter)
return ";;".join(fileFilters)
else:
- return filter
+ return filterStr
def getOpenFileName(parent=None, caption="", directory="",
- filter="", options=QFileDialog.Options()):
+ filterStr="", options=QFileDialog.Options()):
"""
Module function to get the name of a file for opening it.
@param parent parent widget of the dialog (QWidget)
@param caption window title of the dialog (string)
@param directory working directory of the dialog (string)
- @param filter filter string for the dialog (string)
+ @param filterStr filter string for the dialog (string)
@param options various options for the dialog (QFileDialog.Options)
@return name of file to be opened (string)
"""
@@ -62,14 +62,14 @@
options |= QFileDialog.DontUseNativeDialog
if PYQT_VERSION_STR >= "5.0.0":
return QFileDialog.getOpenFileName(
- parent, caption, directory, filter, "", options)[0]
+ parent, caption, directory, filterStr, "", options)[0]
else:
return QFileDialog.getOpenFileName(
- parent, caption, directory, filter, options)
+ parent, caption, directory, filterStr, options)
def getOpenFileNameAndFilter(parent=None, caption="", directory="",
- filter="", initialFilter="",
+ filterStr="", initialFilter="",
options=QFileDialog.Options()):
"""
Module function to get the name of a file for opening it and the selected
@@ -78,14 +78,14 @@
@param parent parent widget of the dialog (QWidget)
@param caption window title of the dialog (string)
@param directory working directory of the dialog (string)
- @param filter filter string for the dialog (string)
+ @param filterStr filter string for the dialog (string)
@param initialFilter initial filter for the dialog (string)
@param options various options for the dialog (QFileDialog.Options)
@return name of file to be opened and selected filter (string, string)
"""
if Globals.isLinuxPlatform():
options |= QFileDialog.DontUseNativeDialog
- newfilter = __reorderFilter(filter, initialFilter)
+ newfilter = __reorderFilter(filterStr, initialFilter)
if PYQT_VERSION_STR >= "5.0.0":
return QFileDialog.getOpenFileName(
parent, caption, directory, newfilter, initialFilter, options)
@@ -95,14 +95,14 @@
def getOpenFileNames(parent=None, caption="", directory="",
- filter="", options=QFileDialog.Options()):
+ filterStr="", options=QFileDialog.Options()):
"""
Module function to get a list of names of files for opening.
@param parent parent widget of the dialog (QWidget)
@param caption window title of the dialog (string)
@param directory working directory of the dialog (string)
- @param filter filter string for the dialog (string)
+ @param filterStr filter string for the dialog (string)
@param options various options for the dialog (QFileDialog.Options)
@return list of file names to be opened (list of string)
"""
@@ -110,14 +110,14 @@
options |= QFileDialog.DontUseNativeDialog
if PYQT_VERSION_STR >= "5.0.0":
return QFileDialog.getOpenFileNames(
- parent, caption, directory, filter, "", options)[0]
+ parent, caption, directory, filterStr, "", options)[0]
else:
return QFileDialog.getOpenFileNames(
- parent, caption, directory, filter, options)
+ parent, caption, directory, filterStr, options)
def getOpenFileNamesAndFilter(parent=None, caption="", directory="",
- filter="", initialFilter="",
+ filterStr="", initialFilter="",
options=QFileDialog.Options()):
"""
Module function to get a list of names of files for opening and the
@@ -126,7 +126,7 @@
@param parent parent widget of the dialog (QWidget)
@param caption window title of the dialog (string)
@param directory working directory of the dialog (string)
- @param filter filter string for the dialog (string)
+ @param filterStr filter string for the dialog (string)
@param initialFilter initial filter for the dialog (string)
@param options various options for the dialog (QFileDialog.Options)
@return list of file names to be opened and selected filter
@@ -134,7 +134,7 @@
"""
if Globals.isLinuxPlatform():
options |= QFileDialog.DontUseNativeDialog
- newfilter = __reorderFilter(filter, initialFilter)
+ newfilter = __reorderFilter(filterStr, initialFilter)
if PYQT_VERSION_STR >= "5.0.0":
return QFileDialog.getOpenFileNames(
parent, caption, directory, newfilter, initialFilter, options)
@@ -144,14 +144,14 @@
def getSaveFileName(parent=None, caption="", directory="",
- filter="", options=QFileDialog.Options()):
+ filterStr="", options=QFileDialog.Options()):
"""
Module function to get the name of a file for saving it.
@param parent parent widget of the dialog (QWidget)
@param caption window title of the dialog (string)
@param directory working directory of the dialog (string)
- @param filter filter string for the dialog (string)
+ @param filterStr filter string for the dialog (string)
@param options various options for the dialog (QFileDialog.Options)
@return name of file to be saved (string)
"""
@@ -159,14 +159,14 @@
options |= QFileDialog.DontUseNativeDialog
if PYQT_VERSION_STR >= "5.0.0":
return QFileDialog.getSaveFileName(
- parent, caption, directory, filter, "", options)[0]
+ parent, caption, directory, filterStr, "", options)[0]
else:
return QFileDialog.getSaveFileName(
- parent, caption, directory, filter, options)
+ parent, caption, directory, filterStr, options)
def getSaveFileNameAndFilter(parent=None, caption="", directory="",
- filter="", initialFilter="",
+ filterStr="", initialFilter="",
options=QFileDialog.Options()):
"""
Module function to get the name of a file for saving it and the selected
@@ -175,14 +175,14 @@
@param parent parent widget of the dialog (QWidget)
@param caption window title of the dialog (string)
@param directory working directory of the dialog (string)
- @param filter filter string for the dialog (string)
+ @param filterStr filter string for the dialog (string)
@param initialFilter initial filter for the dialog (string)
@param options various options for the dialog (QFileDialog.Options)
@return name of file to be saved and selected filter (string, string)
"""
if Globals.isLinuxPlatform():
options |= QFileDialog.DontUseNativeDialog
- newfilter = __reorderFilter(filter, initialFilter)
+ newfilter = __reorderFilter(filterStr, initialFilter)
if PYQT_VERSION_STR >= "5.0.0":
return QFileDialog.getSaveFileName(
parent, caption, directory, newfilter, initialFilter, options)
