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

Changed word order from "show nothing default" to "default show nothing" to better match other settings in the set.

Browse Source
This commit is contained in:
suutari-olli 2016-03-16 19:37:54 +02:00
parent 432c7a6380
commit dd70dbe515
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/settings.py
View File

@ -121,7 +121,7 @@ class Settings(QtCore.QSettings):
'advanced/double click live': False, 'advanced/double click live': False,
'advanced/enable exit confirmation': True, 'advanced/enable exit confirmation': True,
'advanced/expand service item': False, 'advanced/expand service item': False,
'advanced/show nothing default': False, 'advanced/default show nothing': False,
'advanced/hide mouse': True, 'advanced/hide mouse': True,
'advanced/is portable': False, 'advanced/is portable': False,
'advanced/max recent files': 20, 'advanced/max recent files': 20,

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

@ -357,7 +357,7 @@ class AdvancedTab(SettingsTab):
self.x11_bypass_check_box.setChecked(settings.value('x11 bypass wm')) self.x11_bypass_check_box.setChecked(settings.value('x11 bypass wm'))
self.default_color = settings.value('default color') self.default_color = settings.value('default color')
self.default_file_edit.setText(settings.value('default image')) self.default_file_edit.setText(settings.value('default image'))
self.default_show_nothing_check_box.setChecked(settings.value('show nothing default')) self.default_show_nothing_check_box.setChecked(settings.value('default show nothing'))
self.slide_limits = settings.value('slide limits') self.slide_limits = settings.value('slide limits')
self.is_search_as_you_type_enabled = settings.value('search as type') self.is_search_as_you_type_enabled = settings.value('search as type')
self.search_as_type_check_box.setChecked(self.is_search_as_you_type_enabled) self.search_as_type_check_box.setChecked(self.is_search_as_you_type_enabled)
@ -431,7 +431,7 @@ class AdvancedTab(SettingsTab):
settings.setValue('alternate rows', self.alternate_rows_check_box.isChecked()) settings.setValue('alternate rows', self.alternate_rows_check_box.isChecked())
settings.setValue('default color', self.default_color) settings.setValue('default color', self.default_color)
settings.setValue('default image', self.default_file_edit.text()) settings.setValue('default image', self.default_file_edit.text())
settings.setValue('show nothing default', self.default_show_nothing_check_box.isChecked()) settings.setValue('default show nothing', self.default_show_nothing_check_box.isChecked())
settings.setValue('slide limits', self.slide_limits) settings.setValue('slide limits', self.slide_limits)
if self.x11_bypass_check_box.isChecked() != settings.value('x11 bypass wm'): if self.x11_bypass_check_box.isChecked() != settings.value('x11 bypass wm'):
settings.setValue('x11 bypass wm', self.x11_bypass_check_box.isChecked()) settings.setValue('x11 bypass wm', self.x11_bypass_check_box.isChecked())

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

@ -253,7 +253,7 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
Display.setup(self) Display.setup(self)
if self.is_live: if self.is_live:
# If "Show no Logo or Image on startup" is enabled, display transparent background instead. # If "Show no Logo or Image on startup" is enabled, display transparent background instead.
if Settings().value('advanced/show nothing default'): if Settings().value('advanced/default show nothing'):
self.setAttribute(QtCore.Qt.WA_TranslucentBackground) self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
self.setStyleSheet(TRANSPARENT_STYLESHEET) self.setStyleSheet(TRANSPARENT_STYLESHEET)
else: else: