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

Linux: Improve desktop detection for file dialog provider selection

Browse Source
This commit is contained in:
Kovid Goyal 2024-04-30 20:38:22 +05:30
parent d045698289
commit d84e154564
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,17 +25,30 @@ def get_winid(widget=None):
return widget.effectiveWinId() return widget.effectiveWinId()
def to_known_dialog_provider_name(q: str) -> str:
uq = q.upper()
if uq in ('KDE', 'LXQT', 'LXDE'):
return 'KDE'
if uq in ('GNOME', 'GNOME-FLASHBACK', 'GNOME-FLASHBACK:GNOME', 'MATE', 'XFCE'):
return 'GNOME'
return ''
def detect_desktop_environment(): def detect_desktop_environment():
de = os.getenv('XDG_CURRENT_DESKTOP') de = os.getenv('XDG_CURRENT_DESKTOP')
if de: if de:
return de.upper().split(':', 1)[0] for x in de.split(':'):
q = to_known_dialog_provider_name(x)
if q:
return q
if os.getenv('KDE_FULL_SESSION') == 'true': if os.getenv('KDE_FULL_SESSION') == 'true':
return 'KDE' return 'KDE'
if os.getenv('GNOME_DESKTOP_SESSION_ID'): if os.getenv('GNOME_DESKTOP_SESSION_ID'):
return 'GNOME' return 'GNOME'
ds = os.getenv('DESKTOP_SESSION') ds = os.getenv('DESKTOP_SESSION')
if ds and ds.upper() in {'GNOME', 'XFCE'}: if ds and ds.upper() in {'GNOME', 'XFCE'}:
return ds.upper() return 'GNOME'
return ''
def is_executable_present(name): def is_executable_present(name):
@ -343,9 +356,9 @@ def check_for_linux_native_dialogs():
if ans is None: if ans is None:
de = detect_desktop_environment() de = detect_desktop_environment()
order = ('zenity', 'kdialog') order = ('zenity', 'kdialog')
if de in {'GNOME', 'UNITY', 'MATE', 'XFCE'}: if de == 'GNOME':
order = ('zenity',) order = ('zenity',)
elif de in {'KDE', 'LXDE'}: elif de == 'KDE':
order = ('kdialog',) order = ('kdialog',)
for exe in order: for exe in order:
if is_executable_present(exe): if is_executable_present(exe):