forked from openlp/openlp
Just commit some of my recent changes
This commit is contained in:
parent
213dc6a25c
commit
20c1579a55
@ -186,6 +186,7 @@ class Settings(QtCore.QSettings):
|
|||||||
# circular dependency.
|
# circular dependency.
|
||||||
'core/display on monitor': True,
|
'core/display on monitor': True,
|
||||||
'core/override position': False,
|
'core/override position': False,
|
||||||
|
'core/monitor': {},
|
||||||
'core/application version': '0.0',
|
'core/application version': '0.0',
|
||||||
'images/background color': '#000000',
|
'images/background color': '#000000',
|
||||||
'media/players': 'system,webkit',
|
'media/players': 'system,webkit',
|
||||||
|
@ -843,7 +843,9 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
|
|||||||
if theme:
|
if theme:
|
||||||
find_and_set_in_combo_box(self.theme_combo_box, theme, set_missing=False)
|
find_and_set_in_combo_box(self.theme_combo_box, theme, set_missing=False)
|
||||||
if theme == self.theme_combo_box.currentText():
|
if theme == self.theme_combo_box.currentText():
|
||||||
self.renderer.set_service_theme(theme)
|
# TODO: Use a local display widget
|
||||||
|
# self.preview_display.set_theme(get_theme_from_name(theme))
|
||||||
|
pass
|
||||||
else:
|
else:
|
||||||
if self._save_lite:
|
if self._save_lite:
|
||||||
service_item.set_from_service(item)
|
service_item.set_from_service(item)
|
||||||
@ -1374,7 +1376,8 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
|
|||||||
:param current_index: The combo box index for the selected item
|
:param current_index: The combo box index for the selected item
|
||||||
"""
|
"""
|
||||||
self.service_theme = self.theme_combo_box.currentText()
|
self.service_theme = self.theme_combo_box.currentText()
|
||||||
self.renderer.set_service_theme(self.service_theme)
|
# TODO: Use a local display widget
|
||||||
|
# self.preview_display.set_theme(get_theme_from_name(theme))
|
||||||
Settings().setValue(self.main_window.service_manager_settings_section + '/service theme', self.service_theme)
|
Settings().setValue(self.main_window.service_manager_settings_section + '/service theme', self.service_theme)
|
||||||
self.regenerate_service_items(True)
|
self.regenerate_service_items(True)
|
||||||
|
|
||||||
@ -1723,7 +1726,8 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
|
|||||||
theme_group.addAction(create_widget_action(self.theme_menu, theme, text=theme, checked=False,
|
theme_group.addAction(create_widget_action(self.theme_menu, theme, text=theme, checked=False,
|
||||||
triggers=self.on_theme_change_action))
|
triggers=self.on_theme_change_action))
|
||||||
find_and_set_in_combo_box(self.theme_combo_box, self.service_theme)
|
find_and_set_in_combo_box(self.theme_combo_box, self.service_theme)
|
||||||
self.renderer.set_service_theme(self.service_theme)
|
# TODO: Sort this out
|
||||||
|
# self.renderer.set_service_theme(self.service_theme)
|
||||||
self.regenerate_service_items()
|
self.regenerate_service_items()
|
||||||
|
|
||||||
def on_theme_change_action(self, field=None):
|
def on_theme_change_action(self, field=None):
|
||||||
|
@ -34,6 +34,8 @@ from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
|
|||||||
from openlp.core.lib.ui import critical_error_message_box
|
from openlp.core.lib.ui import critical_error_message_box
|
||||||
from openlp.core.ui import ThemeLayoutForm
|
from openlp.core.ui import ThemeLayoutForm
|
||||||
from openlp.core.ui.themewizard import Ui_ThemeWizard
|
from openlp.core.ui.themewizard import Ui_ThemeWizard
|
||||||
|
# TODO: Fix this. Use a "get_video_extensions" method which uses the current media player
|
||||||
|
from openlp.core.ui.media.vlcplayer import VIDEO_EXT
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user