raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

head

Browse Source
This commit is contained in:
Tim Bentley 2012-12-30 19:41:40 +00:00
commit bdef1b73f2
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/advancedtab.py
View File

@ -499,6 +499,9 @@ class AdvancedTab(SettingsTab):
# Default to False on Gnome. # Default to False on Gnome.
x11_bypass_default = bool(not x11_bypass_default = bool(not
os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) 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( self.x11BypassCheckBox.setChecked(settings.value(
u'x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool()) u'x11 bypass wm', QtCore.QVariant(x11_bypass_default)).toBool())
self.defaultColor = settings.value(u'default color', self.defaultColor = settings.value(u'default color',

3
openlp/core/ui/maindisplay.py
View File

@ -143,6 +143,9 @@ class MainDisplay(Display):
# Default to False on Gnome. # Default to False on Gnome.
x11_bypass_default = bool(not x11_bypass_default = bool(not
os.environ.get(u'GNOME_DESKTOP_SESSION_ID')) 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', if Settings().value(u'advanced/x11 bypass wm',
QtCore.QVariant(x11_bypass_default)).toBool(): QtCore.QVariant(x11_bypass_default)).toBool():
windowFlags |= QtCore.Qt.X11BypassWindowManagerHint windowFlags |= QtCore.Qt.X11BypassWindowManagerHint

4
openlp/plugins/custom/forms/editcustomdialog.py
View File

@ -74,9 +74,9 @@ class Ui_CustomEditDialog(object):
self.buttonLayout.addWidget(self.deleteButton) self.buttonLayout.addWidget(self.deleteButton)
self.buttonLayout.addStretch() self.buttonLayout.addStretch()
self.upButton = create_button(customEditDialog, u'upButton', role=u'up', self.upButton = create_button(customEditDialog, u'upButton', role=u'up',
enable=False, click=customEditDialog.onUpButtonClicked) enabled=False, click=customEditDialog.onUpButtonClicked)
self.downButton = create_button(customEditDialog, u'downButton', self.downButton = create_button(customEditDialog, u'downButton',
role=u'down', enable=False, role=u'down', enabled=False,
click=customEditDialog.onDownButtonClicked) click=customEditDialog.onDownButtonClicked)
self.buttonLayout.addWidget(self.upButton) self.buttonLayout.addWidget(self.upButton)
self.buttonLayout.addWidget(self.downButton) self.buttonLayout.addWidget(self.downButton)