From d6bd7769ec0bf692d8cb8d87ac51050cc8dcf726 Mon Sep 17 00:00:00 2001 From: Sambhav Kothari Date: Tue, 27 Dec 2016 18:34:09 +0530 Subject: [PATCH] Refactor icontheme.py and fix formatting --- picard/util/icontheme.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/picard/util/icontheme.py b/picard/util/icontheme.py index 9d17c93b4..aacafb2fd 100644 --- a/picard/util/icontheme.py +++ b/picard/util/icontheme.py @@ -30,14 +30,19 @@ else: '/usr/share/pixmaps', ] -if 'XDG_CURRENT_DESKTOP' in os.environ and os.environ['XDG_CURRENT_DESKTOP'].lower() == 'gnome': - _current_theme = os.popen('gconftool-2 -g /desktop/gnome/interface/icon_theme').read().strip() or os.popen('gsettings get org.gnome.desktop.interface icon-theme').read().strip()[1:-1] or None -elif 'XDG_CURRENT_DESKTOP' in os.environ and os.environ['XDG_CURRENT_DESKTOP'].lower() == 'unity': - _current_theme = os.popen('dconf read /desktop/gnome/interface/icon_theme').read().strip()[1:-1] or None +_current_theme = None +if 'XDG_CURRENT_DESKTOP' in os.environ: + if os.environ['XDG_CURRENT_DESKTOP'].lower() == 'gnome': + _current_theme = (os.popen('gconftool-2 -g /desktop/gnome/interface/icon_theme').read().strip() + or os.popen('gsettings get org.gnome.desktop.interface icon-theme').read().strip()[1:-1] + or None) + elif os.environ['XDG_CURRENT_DESKTOP'].lower() == 'unity': + current_theme = (os.popen('dconf read /desktop/gnome/interface/icon_theme').read().strip()[1:-1] + or None) elif os.environ.get('KDE_FULL_SESSION'): - _current_theme = os.popen("kreadconfig --file kdeglobals --group Icons --key Theme --default crystalsvg").read().strip() or None -else: - _current_theme = None + _current_theme = (os.popen("kreadconfig --file kdeglobals --group Icons --key Theme --default crystalsvg").read().strip() + or None) + ICON_SIZE_MENU = ('16x16',) ICON_SIZE_TOOLBAR = ('22x22',)