From e7787ddd2dc24b6423e3e2ad3beb8096a77b2b28 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Wed, 19 Dec 2012 17:26:53 +0100 Subject: [PATCH 1/2] fixed bug #1092121 'Interface unusable when run on XFce' Fixes: https://launchpad.net/bugs/1092121 --- openlp/core/ui/advancedtab.py | 3 +++ openlp/core/ui/maindisplay.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 93c8f4999..361baa5cb 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -490,6 +490,9 @@ class AdvancedTab(SettingsTab): # Default to False on Gnome. x11_bypass_default = bool(not os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) + # Default to False on XFce + if os.environ.get(u'DESKTOP_SESSION') == 'xfce': + x11_bypass_default = False self.x11BypassCheckBox.setChecked(settings.value( u'x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool()) self.defaultColor = settings.value(u'default color', diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 16ee19161..69b210e84 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -143,6 +143,9 @@ class MainDisplay(Display): # Default to False on Gnome. x11_bypass_default = bool(not os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) + # Default to False on XFce + if os.environ.get(u'DESKTOP_SESSION') == 'xfce': + x11_bypass_default = False if Settings().value(u'advanced/x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool(): windowFlags |= QtCore.Qt.X11BypassWindowManagerHint From e574466ebb0298c2117f9f80d2220dc927ec5f87 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Thu, 20 Dec 2012 09:05:25 +0100 Subject: [PATCH 2/2] use unicode strings --- openlp/core/ui/advancedtab.py | 2 +- openlp/core/ui/maindisplay.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 361baa5cb..54bb69496 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -491,7 +491,7 @@ class AdvancedTab(SettingsTab): x11_bypass_default = bool(not os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) # Default to False on XFce - if os.environ.get(u'DESKTOP_SESSION') == 'xfce': + if os.environ.get(u'DESKTOP_SESSION') == u'xfce': x11_bypass_default = False self.x11BypassCheckBox.setChecked(settings.value( u'x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool()) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 69b210e84..eb0c3911b 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -144,7 +144,7 @@ class MainDisplay(Display): x11_bypass_default = bool(not os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) # Default to False on XFce - if os.environ.get(u'DESKTOP_SESSION') == 'xfce': + if os.environ.get(u'DESKTOP_SESSION') == u'xfce': x11_bypass_default = False if Settings().value(u'advanced/x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool():