forked from openlp/openlp
Now using self.setVisible(False) instead of transparency for hiding the logo.
Renamed the visual text for the setting to: "Don't show Logo"
This commit is contained in:
parent
dd70dbe515
commit
a95f72c93a
|
@ -302,7 +302,7 @@ class AdvancedTab(SettingsTab):
|
||||||
self.default_file_label.setText(translate('OpenLP.AdvancedTab', 'Image file:'))
|
self.default_file_label.setText(translate('OpenLP.AdvancedTab', 'Image file:'))
|
||||||
self.default_browse_button.setToolTip(translate('OpenLP.AdvancedTab', 'Browse for an image file to display.'))
|
self.default_browse_button.setToolTip(translate('OpenLP.AdvancedTab', 'Browse for an image file to display.'))
|
||||||
self.default_revert_button.setToolTip(translate('OpenLP.AdvancedTab', 'Revert to the default OpenLP logo.'))
|
self.default_revert_button.setToolTip(translate('OpenLP.AdvancedTab', 'Revert to the default OpenLP logo.'))
|
||||||
self.default_show_nothing_check_box.setText(translate('OpenLP.AdvancedTab', 'Do not show anything on startup'))
|
self.default_show_nothing_check_box.setText(translate('OpenLP.AdvancedTab', 'Don\'t show Logo '))
|
||||||
self.data_directory_current_label.setText(translate('OpenLP.AdvancedTab', 'Current path:'))
|
self.data_directory_current_label.setText(translate('OpenLP.AdvancedTab', 'Current path:'))
|
||||||
self.data_directory_new_label.setText(translate('OpenLP.AdvancedTab', 'Custom path:'))
|
self.data_directory_new_label.setText(translate('OpenLP.AdvancedTab', 'Custom path:'))
|
||||||
self.data_directory_browse_button.setToolTip(translate('OpenLP.AdvancedTab',
|
self.data_directory_browse_button.setToolTip(translate('OpenLP.AdvancedTab',
|
||||||
|
|
|
@ -251,12 +251,10 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
|
||||||
self.screen = self.screens.current
|
self.screen = self.screens.current
|
||||||
self.setVisible(False)
|
self.setVisible(False)
|
||||||
Display.setup(self)
|
Display.setup(self)
|
||||||
|
# If "Show no Logo or Image on startup" is enabled, keep display hidden instead.
|
||||||
if self.is_live:
|
if self.is_live:
|
||||||
# If "Show no Logo or Image on startup" is enabled, display transparent background instead.
|
|
||||||
if Settings().value('advanced/default show nothing'):
|
if Settings().value('advanced/default show nothing'):
|
||||||
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
|
self.setVisible(False)
|
||||||
self.setStyleSheet(TRANSPARENT_STYLESHEET)
|
|
||||||
else:
|
|
||||||
# Build the initial frame.
|
# Build the initial frame.
|
||||||
background_color = QtGui.QColor()
|
background_color = QtGui.QColor()
|
||||||
background_color.setNamedColor(Settings().value('advanced/default color'))
|
background_color.setNamedColor(Settings().value('advanced/default color'))
|
||||||
|
@ -528,12 +526,14 @@ 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");')
|
||||||
if self.isHidden():
|
# Check if setting for hiding default background image and color is enabled.
|
||||||
|
# If so, display should remain hidden, otherwise default logo is shown. (from def setup)
|
||||||
|
if self.isHidden() and not Settings().value('advanced/default show nothing'):
|
||||||
self.setVisible(True)
|
self.setVisible(True)
|
||||||
self.hide_mode = None
|
self.hide_mode = None
|
||||||
# Trigger actions when display is active again.
|
# Trigger actions when display is active again.
|
||||||
if self.is_live:
|
if self.is_live:
|
||||||
Registry().execute('live_display_active')
|
#Registry().execute('live_display_active')
|
||||||
# Workaround for bug #1531319, should not be needed with PyQt 5.6.
|
# Workaround for bug #1531319, should not be needed with PyQt 5.6.
|
||||||
if is_win():
|
if is_win():
|
||||||
self.shake_web_view()
|
self.shake_web_view()
|
||||||
|
|
Loading…
Reference in New Issue