openlp-core team mailing list archive

[Arjan Schrijver <arjan@xxxxxxxxxx>]

Arjan Schrijver has proposed merging lp:~arjan-i/openlp/xfce-fix into lp:openlp.

Requested reviews:
  Jonathan Corwin (j-corwin)
Related bugs:
  Bug #1092121 in OpenLP: "Interface unusable when run on XFce"
  https://bugs.launchpad.net/openlp/+bug/1092121

For more details, see:
https://code.launchpad.net/~arjan-i/openlp/xfce-fix/+merge/140833

This is a very small fix to make OpenLP work with the XFce window manager on Linux.
Now with Unicode strings.
-- 
https://code.launchpad.net/~arjan-i/openlp/xfce-fix/+merge/140833
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2012-12-05 06:13:34 +0000
+++ openlp/core/ui/advancedtab.py	2012-12-20 08:37:20 +0000
@@ -490,6 +490,9 @@
             # 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') == u'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',

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2012-12-07 19:00:33 +0000
+++ openlp/core/ui/maindisplay.py	2012-12-20 08:37:20 +0000
@@ -143,6 +143,9 @@
             # 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') == u'xfce':
+                x11_bypass_default = False
         if Settings().value(u'advanced/x11 bypass wm',
             QtCore.QVariant(x11_bypass_default)).toBool():
             windowFlags |= QtCore.Qt.X11BypassWindowManagerHint