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

Automatically fallback to Qt dialog if native dialog fails

Browse Source
This commit is contained in:
Kovid Goyal 2017-08-02 20:40:58 +05:30
parent 3aeaf65f3b
commit 674c3e98f8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import functools
import os
import subprocess
import sys
import time
from threading import Thread
from PyQt5.Qt import QEventLoop
@ -270,21 +271,31 @@ def zenity_choose_images(window, name, title, select_only_single_file=True, form
# }}}
def show_dialog(func):
def linux_native_dialog(name):
prefix = check_for_linux_native_dialogs()
func = globals()['{}_choose_{}'.format(prefix, name)]
@functools.wraps(func)
def looped(window, *args, **kwargs):
if hasattr(linux_native_dialog, 'native_failed'):
import importlib
m = importlib.import_module('calibre.gui2.qt_file_dialogs')
qfunc = getattr(m, 'choose_' + name)
return qfunc(window, *args, **kwargs)
try:
if window is None:
return func(window, *args, **kwargs)
ret = [None, None]
loop = QEventLoop(window)
def r():
while not loop.isRunning():
time.sleep(0.001) # yield so that loop starts
try:
ret[0] = func(window, *args, **kwargs)
except:
ret[1] = sys.exc_info()
finally:
sys.exc_clear()
loop.quit()
t = Thread(name='FileDialogHelper', target=r)
t.daemon = True
@ -293,6 +304,12 @@ def show_dialog(func):
if ret[1] is not None:
raise ret[1][0], ret[1][1], ret[1][2]
return ret[0]
except Exception:
linux_native_dialog.native_failed = True
import traceback
traceback.print_exc()
return looped(window, *args, **kwargs)
return looped
@ -315,11 +332,6 @@ def check_for_linux_native_dialogs():
return ans
def linux_native_dialog(name):
prefix = check_for_linux_native_dialogs()
return show_dialog(globals()['{}_choose_{}'.format(prefix, name)])
if __name__ == '__main__':
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=[