forked from openlp/openlp
Added: "Do not show anything on startup" as an option for disabling default image and background.
(By default OpenLP logo and white bg color are shown on primary Live monitor (At the moment it's only possible to change the color/image but not disable them.)
This commit is contained in:
parent
3f7cb577b4
commit
a73c42ac34
@ -121,6 +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/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,
|
||||||
|
@ -196,6 +196,9 @@ class AdvancedTab(SettingsTab):
|
|||||||
self.default_file_layout.addWidget(self.default_browse_button)
|
self.default_file_layout.addWidget(self.default_browse_button)
|
||||||
self.default_file_layout.addWidget(self.default_revert_button)
|
self.default_file_layout.addWidget(self.default_revert_button)
|
||||||
self.default_image_layout.addRow(self.default_file_label, self.default_file_layout)
|
self.default_image_layout.addRow(self.default_file_label, self.default_file_layout)
|
||||||
|
self.default_show_nothing_check_box = QtWidgets.QCheckBox(self.ui_group_box)
|
||||||
|
self.default_show_nothing_check_box.setObjectName('default_default_show_nothing_check_box')
|
||||||
|
self.default_image_layout.addRow(self.default_show_nothing_check_box)
|
||||||
self.right_layout.addWidget(self.default_image_group_box)
|
self.right_layout.addWidget(self.default_image_group_box)
|
||||||
# Hide mouse
|
# Hide mouse
|
||||||
self.hide_mouse_group_box = QtWidgets.QGroupBox(self.right_column)
|
self.hide_mouse_group_box = QtWidgets.QGroupBox(self.right_column)
|
||||||
@ -299,6 +302,8 @@ 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.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',
|
||||||
@ -353,6 +358,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.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)
|
||||||
@ -426,6 +432,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('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())
|
||||||
|
@ -252,29 +252,34 @@ class MainDisplay(OpenLPMixin, Display, RegistryProperties):
|
|||||||
self.setVisible(False)
|
self.setVisible(False)
|
||||||
Display.setup(self)
|
Display.setup(self)
|
||||||
if self.is_live:
|
if self.is_live:
|
||||||
# Build the initial frame.
|
# If "Show no Logo or Image on startup" is enabled, display transparent background instead.
|
||||||
background_color = QtGui.QColor()
|
if Settings().value('advanced/show nothing default'):
|
||||||
background_color.setNamedColor(Settings().value('advanced/default color'))
|
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
|
||||||
if not background_color.isValid():
|
self.setStyleSheet(TRANSPARENT_STYLESHEET)
|
||||||
background_color = QtCore.Qt.white
|
else:
|
||||||
image_file = Settings().value('advanced/default image')
|
# Build the initial frame.
|
||||||
splash_image = QtGui.QImage(image_file)
|
background_color = QtGui.QColor()
|
||||||
self.initial_fame = QtGui.QImage(
|
background_color.setNamedColor(Settings().value('advanced/default color'))
|
||||||
self.screen['size'].width(),
|
if not background_color.isValid():
|
||||||
self.screen['size'].height(),
|
background_color = QtCore.Qt.white
|
||||||
QtGui.QImage.Format_ARGB32_Premultiplied)
|
image_file = Settings().value('advanced/default image')
|
||||||
painter_image = QtGui.QPainter()
|
splash_image = QtGui.QImage(image_file)
|
||||||
painter_image.begin(self.initial_fame)
|
self.initial_fame = QtGui.QImage(
|
||||||
painter_image.fillRect(self.initial_fame.rect(), background_color)
|
self.screen['size'].width(),
|
||||||
painter_image.drawImage(
|
self.screen['size'].height(),
|
||||||
(self.screen['size'].width() - splash_image.width()) // 2,
|
QtGui.QImage.Format_ARGB32_Premultiplied)
|
||||||
(self.screen['size'].height() - splash_image.height()) // 2,
|
painter_image = QtGui.QPainter()
|
||||||
splash_image)
|
painter_image.begin(self.initial_fame)
|
||||||
service_item = ServiceItem()
|
painter_image.fillRect(self.initial_fame.rect(), background_color)
|
||||||
service_item.bg_image_bytes = image_to_byte(self.initial_fame)
|
painter_image.drawImage(
|
||||||
self.web_view.setHtml(build_html(service_item, self.screen, self.is_live, None,
|
(self.screen['size'].width() - splash_image.width()) // 2,
|
||||||
plugins=self.plugin_manager.plugins))
|
(self.screen['size'].height() - splash_image.height()) // 2,
|
||||||
self._hide_mouse()
|
splash_image)
|
||||||
|
service_item = ServiceItem()
|
||||||
|
service_item.bg_image_bytes = image_to_byte(self.initial_fame)
|
||||||
|
self.web_view.setHtml(build_html(service_item, self.screen, self.is_live, None,
|
||||||
|
plugins=self.plugin_manager.plugins))
|
||||||
|
self._hide_mouse()
|
||||||
|
|
||||||
def text(self, slide, animate=True):
|
def text(self, slide, animate=True):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user