forked from openlp/openlp
Default stylesheet logic to true on Windows even without existing configuration.
This commit is contained in:
parent
e87fe82572
commit
c9624ab378
|
@ -125,7 +125,7 @@ class OpenLP(QtGui.QApplication):
|
||||||
Settings().setValue(u'general/has run wizard', QtCore.QVariant(True))
|
Settings().setValue(u'general/has run wizard', QtCore.QVariant(True))
|
||||||
# Correct stylesheet bugs
|
# Correct stylesheet bugs
|
||||||
application_stylesheet = u''
|
application_stylesheet = u''
|
||||||
if Settings().value(u'advanced/stylesheet fix', QtCore.QVariant(False)).toBool():
|
if Settings().value(u'advanced/stylesheet fix', QtCore.QVariant(sys.platform.startswith(u'win'))).toBool():
|
||||||
base_color = self.palette().color(QtGui.QPalette.Active, QtGui.QPalette.Base)
|
base_color = self.palette().color(QtGui.QPalette.Active, QtGui.QPalette.Base)
|
||||||
alternate_background_repair_stylesheet = \
|
alternate_background_repair_stylesheet = \
|
||||||
u'QTableWidget, QListWidget, QTreeWidget {alternate-background-color: ' + base_color.name() + ';}\n'
|
u'QTableWidget, QListWidget, QTreeWidget {alternate-background-color: ' + base_color.name() + ';}\n'
|
||||||
|
|
|
@ -501,15 +501,11 @@ class AdvancedTab(SettingsTab):
|
||||||
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())
|
||||||
# Fix for bug #936281.
|
# Fix for bug #936281.
|
||||||
if sys.platform.startswith(u'win'):
|
|
||||||
stylesheet_fix_default = True
|
|
||||||
else:
|
|
||||||
stylesheet_fix_default = False
|
|
||||||
# Prevent the dialog displayed by the stylesheetFixCheckBox to display.
|
# Prevent the dialog displayed by the stylesheetFixCheckBox to display.
|
||||||
signalsBlocked = self.stylesheetFixCheckBox.blockSignals(True)
|
signalsBlocked = self.stylesheetFixCheckBox.blockSignals(True)
|
||||||
self.stylesheetFixCheckBox.setChecked(settings.value(
|
self.stylesheetFixCheckBox.setChecked(settings.value(
|
||||||
u'stylesheet fix', QtCore.QVariant(
|
u'stylesheet fix', QtCore.QVariant(
|
||||||
stylesheet_fix_default)).toBool())
|
sys.platform.startswith(u'win'))).toBool())
|
||||||
self.stylesheetFixCheckBox.blockSignals(signalsBlocked)
|
self.stylesheetFixCheckBox.blockSignals(signalsBlocked)
|
||||||
self.defaultColor = settings.value(u'default color',
|
self.defaultColor = settings.value(u'default color',
|
||||||
QtCore.QVariant(u'#ffffff')).toString()
|
QtCore.QVariant(u'#ffffff')).toString()
|
||||||
|
@ -828,4 +824,3 @@ class AdvancedTab(SettingsTab):
|
||||||
|
|
||||||
def onnextItemButtonClicked(self):
|
def onnextItemButtonClicked(self):
|
||||||
self.slide_limits = SlideLimits.Next
|
self.slide_limits = SlideLimits.Next
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue