mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #762 from MikeTheWatchGuy/Dev-latest 

Support for filetypes and initial folder for PopupGetFile, PopupGetFo…
This commit is contained in:
MikeTheWatchGuy 2018-11-21 15:15:45 -05:00 committed by GitHub
parent 130638ce10 0098c8873e
commit 564cb74d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
PySimpleGUIQt/PySimpleGUIQt.py
View File

@ -1280,14 +1280,15 @@ class Button(Element):
pass pass
filetypes = (("ALL Files", "*.*"),) if self.FileTypes is None else self.FileTypes filetypes = (("ALL Files", "*.*"),) if self.FileTypes is None else self.FileTypes
if self.BType == BUTTON_TYPE_BROWSE_FOLDER: if self.BType == BUTTON_TYPE_BROWSE_FOLDER:
folder_name = QFileDialog.getExistingDirectory() folder_name = QFileDialog.getExistingDirectory(dir=self.InitialFolder)
if folder_name != '': if folder_name != '':
if target_element.Type == ELEM_TYPE_BUTTON: if target_element.Type == ELEM_TYPE_BUTTON:
target_element.FileOrFolderName = folder_name target_element.FileOrFolderName = folder_name
else: else:
target_element.Update(folder_name) target_element.Update(folder_name)
elif self.BType == BUTTON_TYPE_BROWSE_FILE: elif self.BType == BUTTON_TYPE_BROWSE_FILE:
file_name = QFileDialog.getOpenFileName() qt_types = convert_tkinter_filetypes_to_qt(self.FileTypes)
file_name = QFileDialog.getOpenFileName(dir=self.InitialFolder, filter=qt_types)
if file_name != '': if file_name != '':
if target_element.Type == ELEM_TYPE_BUTTON: if target_element.Type == ELEM_TYPE_BUTTON:
target_element.FileOrFolderName = file_name target_element.FileOrFolderName = file_name
@ -1296,7 +1297,8 @@ class Button(Element):
elif self.BType == BUTTON_TYPE_COLOR_CHOOSER: elif self.BType == BUTTON_TYPE_COLOR_CHOOSER:
color = 'TODO' color = 'TODO'
elif self.BType == BUTTON_TYPE_BROWSE_FILES: elif self.BType == BUTTON_TYPE_BROWSE_FILES:
file_name = QFileDialog.getOpenFileNames() qt_types = convert_tkinter_filetypes_to_qt(self.FileTypes)
file_name = QFileDialog.getOpenFileNames(dir=self.InitialFolder, filter=qt_types)
if file_name != '': if file_name != '':
file_name = ';'.join(file_name[0]) file_name = ';'.join(file_name[0])
if target_element.Type == ELEM_TYPE_BUTTON: if target_element.Type == ELEM_TYPE_BUTTON:
@ -1304,7 +1306,8 @@ class Button(Element):
else: else:
target_element.Update(file_name[0]) target_element.Update(file_name[0])
elif self.BType == BUTTON_TYPE_SAVEAS_FILE: elif self.BType == BUTTON_TYPE_SAVEAS_FILE:
file_name = QFileDialog.getSaveFileName() qt_types = convert_tkinter_filetypes_to_qt(dir=self.InitialFolder, filter=self.FileTypes)
file_name = QFileDialog.getSaveFileName(filter=qt_types)
if file_name != '': if file_name != '':
if target_element.Type == ELEM_TYPE_BUTTON: if target_element.Type == ELEM_TYPE_BUTTON:
target_element.FileOrFolderName = file_name target_element.FileOrFolderName = file_name
@ -3194,6 +3197,18 @@ def convert_tkinter_size_to_Qt(size):
return qtsize return qtsize
# =========================================================================== #
# Stops the mainloop and sets the event information #
# =========================================================================== #
def convert_tkinter_filetypes_to_qt(filetypes):
qt_filetypes = ''
for item in filetypes:
filetype = item[0] + ' (' + item[1] + ');;'
qt_filetypes += filetype
return qt_filetypes
# ################################################################################ # ################################################################################
# ################################################################################ # ################################################################################
# END OF ELEMENT DEFINITIONS # END OF ELEMENT DEFINITIONS
@ -3988,8 +4003,9 @@ def PackFormIntoFrame(window, containing_frame, toplevel_win):
element.QT_ComboBox.setFixedHeight(element_size[1]) element.QT_ComboBox.setFixedHeight(element_size[1])
element.QT_ComboBox.addItems(element.Values) element.QT_ComboBox.addItems(element.Values)
element.QT_ComboBox.setMaxVisibleItems(element.VisibleItems)
element.QT_ComboBox.setVisible(element.VisibleItems) element.QT_ComboBox.setVisible(element.VisibleItems)
element.QT_ComboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents) # element.QT_ComboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
# element.QT_ComboBox.setContentsMargins(*full_element_pad) # element.QT_ComboBox.setContentsMargins(*full_element_pad)
if element.ChangeSubmits: if element.ChangeSubmits:
element.QT_ComboBox.currentIndexChanged.connect(element.QtCurrentItemChanged) element.QT_ComboBox.currentIndexChanged.connect(element.QtCurrentItemChanged)
@ -6078,11 +6094,14 @@ def PopupGetFolder(message, title=None, default_path='', no_window=False, size=(
global _my_windows global _my_windows
if no_window: if no_window:
if _my_windows.NumOpenWindows: if _my_windows.QTApplication is None:
pass _my_windows.QTApplication = QApplication(sys.argv)
folder_name = 'todo'
folder_name = QFileDialog.getExistingDirectory(dir=initial_folder)
return folder_name return folder_name
layout = [[Text(message, auto_size_text=True, text_color=text_color, background_color=background_color)], layout = [[Text(message, auto_size_text=True, text_color=text_color, background_color=background_color)],
[InputText(default_text=default_path, size=size), FolderBrowse(initial_folder=initial_folder)], [InputText(default_text=default_path, size=size), FolderBrowse(initial_folder=initial_folder)],
[CloseButton('Ok', size=(60, 20), bind_return_key=True), CloseButton('Cancel', size=(60, 20))]] [CloseButton('Ok', size=(60, 20), bind_return_key=True), CloseButton('Cancel', size=(60, 20))]]
@ -6132,12 +6151,15 @@ def PopupGetFile(message, title=None, default_path='', default_extension='', sav
global _my_windows global _my_windows
if no_window: if no_window:
if _my_windows.NumOpenWindows: if _my_windows.QTApplication is None:
pass _my_windows.QTApplication = QApplication(sys.argv)
if save_as: if save_as:
filename = 'TODO' qt_types = convert_tkinter_filetypes_to_qt(file_types)
filename = QFileDialog.getSaveFileName(dir=initial_folder, filter=qt_types)
else: else:
filename = 'TODO' qt_types = convert_tkinter_filetypes_to_qt(file_types)
filename = QFileDialog.getOpenFileName(dir=initial_folder, filter=qt_types)
return filename return filename
browse_button = SaveAs(file_types=file_types, initial_folder=initial_folder) if save_as else FileBrowse( browse_button = SaveAs(file_types=file_types, initial_folder=initial_folder) if save_as else FileBrowse(