Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix file open dialog on older KDE desktops not working correctly. Fixes #1715648 [Native file dialog used incorrectly](https://bugs.launchpad.net/calibre/+bug/1715648)

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-07 21:25:57 +05:30
parent 099f99a386
commit d661af061e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/linux_file_dialogs.py
View File

@ -175,11 +175,10 @@ def kdialog_choose_files(
select_only_single_file=False, select_only_single_file=False,
default_dir=u'~'): default_dir=u'~'):
initial_dir = get_initial_dir(name, title, default_dir, False) initial_dir = get_initial_dir(name, title, default_dir, False)
args = ['--getopenfilename'] args = []
if not select_only_single_file: if not select_only_single_file:
args += '--multiple --separate-output'.split() args += '--multiple --separate-output'.split()
args.append(initial_dir) args += ['--getopenfilename', initial_dir, kdialog_filters(filters, all_files)]
args.append(kdialog_filters(filters, all_files))
ans = run_kde(kde_cmd(window, title, *args)) ans = run_kde(kde_cmd(window, title, *args))
save_initial_dir(name, title, ans[0] if ans else None, False, is_file=True) save_initial_dir(name, title, ans[0] if ans else None, False, is_file=True)
return ans return ans
@ -347,7 +346,7 @@ def check_for_linux_native_dialogs():
if __name__ == '__main__': if __name__ == '__main__':
# print(repr(kdialog_choose_dir(None, 'testkddcd', 'Testing choose dir...'))) # print(repr(kdialog_choose_dir(None, 'testkddcd', 'Testing choose dir...')))
print(repr(kdialog_choose_files(None, 'testkddcf', 'Testing choose files...', select_only_single_file=True, filters=[ print(repr(kdialog_choose_files(None, 'testkddcf', 'Testing choose files...', select_only_single_file=False, filters=[
('moo', 'epub png'.split()), ('boo', 'docx'.split())], all_files=True))) ('moo', 'epub png'.split()), ('boo', 'docx'.split())], all_files=True)))
# print(repr(kdialog_choose_images(None, 'testkddci', 'Testing choose images...'))) # print(repr(kdialog_choose_images(None, 'testkddci', 'Testing choose images...')))
# print(repr(kdialog_choose_save_file(None, 'testkddcs', 'Testing choose save file...', initial_filename='moo.x'))) # print(repr(kdialog_choose_save_file(None, 'testkddcs', 'Testing choose save file...', initial_filename='moo.x')))