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

- Changed comments related to "default image" to match "logo".

Browse Source 
- Removed one default_
This commit is contained in:
suutari-olli 2016-04-01 05:32:36 +03:00
parent 4f5bb4f5eb
commit 36d15615d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/ui/generaltab.py
View File

@ -192,7 +192,7 @@ class GeneralTab(SettingsTab):
self.logo_color_button.setObjectName('logo_color_button') self.logo_color_button.setObjectName('logo_color_button')
self.logo_layout.addRow(self.logo_color_label, self.logo_color_button) self.logo_layout.addRow(self.logo_color_label, self.logo_color_button)
self.logo_hide_on_startup_check_box = QtWidgets.QCheckBox(self.logo_group_box) self.logo_hide_on_startup_check_box = QtWidgets.QCheckBox(self.logo_group_box)
self.logo_hide_on_startup_check_box.setObjectName('default_logo_hide_on_startup_check_box') self.logo_hide_on_startup_check_box.setObjectName('logo_hide_on_startup_check_box')
self.logo_layout.addRow(self.logo_hide_on_startup_check_box) self.logo_layout.addRow(self.logo_hide_on_startup_check_box)
self.right_layout.addWidget(self.logo_group_box) self.right_layout.addWidget(self.logo_group_box)
self.logo_color_button.colorChanged.connect(self.on_logo_background_color_changed) self.logo_color_button.colorChanged.connect(self.on_logo_background_color_changed)
@ -398,7 +398,7 @@ class GeneralTab(SettingsTab):
def on_logo_browse_button_clicked(self): def on_logo_browse_button_clicked(self):
""" """
Select an image for the default display screen. Select the logo file
""" """
file_filters = '%s;;%s (*.*)' % (get_images_filter(), UiStrings().AllFiles) file_filters = '%s;;%s (*.*)' % (get_images_filter(), UiStrings().AllFiles)
filename, filter_used = QtWidgets.QFileDialog.getOpenFileName(self, filename, filter_used = QtWidgets.QFileDialog.getOpenFileName(self,
@ -410,13 +410,13 @@ class GeneralTab(SettingsTab):
def on_logo_revert_button_clicked(self): def on_logo_revert_button_clicked(self):
""" """
Revert the default screen back to the default settings. Revert the logo file back to the default setting.
""" """
self.logo_file_edit.setText(':/graphics/openlp-splash-screen.png') self.logo_file_edit.setText(':/graphics/openlp-splash-screen.png')
self.logo_file_edit.setFocus() self.logo_file_edit.setFocus()
def on_logo_background_color_changed(self, color): def on_logo_background_color_changed(self, color):
""" """
Select the background colour of the default display screen. Select the background color for logo.
""" """
self.logo_background_color = color self.logo_background_color = color

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

@ -523,8 +523,8 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
if not Settings().value('core/display on monitor'): if not Settings().value('core/display on monitor'):
return return
self.frame.evaluateJavaScript('show_blank("show");') self.frame.evaluateJavaScript('show_blank("show");')
# Check if setting for hiding default background image and color is enabled. # Check if setting for hiding logo on startup is enabled.
# If so, display should remain hidden, otherwise default logo is shown. (from def setup) # If it is, display should remain hidden, otherwise logo is shown. (from def setup)
if self.isHidden() and not Settings().value('core/logo hide on startup'): if self.isHidden() and not Settings().value('core/logo hide on startup'):
self.setVisible(True) self.setVisible(True)
self.hide_mode = None self.hide_mode = None