From a721250abd0b39f5e7aa9b66853750f450e6aa61 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 30 Aug 2019 12:28:10 +0100 Subject: [PATCH] finish fixing the theme regeneration --- openlp/core/display/render.py | 1 - openlp/core/lib/serviceitem.py | 8 +++++- openlp/core/ui/servicemanager.py | 27 ++++++++----------- .../presentations/lib/maclocontroller.py | 3 ++- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/openlp/core/display/render.py b/openlp/core/display/render.py index 625f8fd42..f53da91ed 100644 --- a/openlp/core/display/render.py +++ b/openlp/core/display/render.py @@ -521,7 +521,6 @@ class ThemePreviewRenderer(LogMixin, DisplayWindow): # If we have Item level and have an item theme then use it. if self.theme_level == ThemeLevel.Song and item.theme: theme_name = item.theme - print(theme_name) return theme_name def format_slide(self, text, item): diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 3366cd858..e986a50fd 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -321,6 +321,13 @@ class ServiceItem(RegistryProperties): 'display_title': slide['display_title'], 'notes': slide['notes']}) return {'header': service_header, 'data': service_data} + def render_text_items(self): + """ + This method forces the display to be regenerated + """ + self._display_slides = [] + self._rendered_slides = [] + def set_from_service(self, service_item, path=None): """ This method takes a service item from a saved service file (passed from the ServiceManager) and extracts the @@ -503,7 +510,6 @@ class ServiceItem(RegistryProperties): :param row: The service item slide to be returned """ if self.service_item_type == ServiceItemType.Text: - # return self.display_frames[row]['html'].split('\n')[0] return self.rendered_slides[row]['text'] elif self.service_item_type == ServiceItemType.Image: return self.slides[row]['path'] diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 43626ee83..4e0b3a74b 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -46,7 +46,7 @@ from openlp.core.common.settings import Settings from openlp.core.lib import build_icon from openlp.core.lib.exceptions import ValidationError from openlp.core.lib.plugin import PluginStatus -from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem +from openlp.core.lib.serviceitem import ItemCapabilities, ServiceItem, ServiceItemType from openlp.core.lib.ui import create_widget_action, critical_error_message_box, find_and_set_in_combo_box from openlp.core.ui.icons import UiIcons from openlp.core.ui.media import AUDIO_EXT, VIDEO_EXT @@ -749,9 +749,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi if theme: find_and_set_in_combo_box(self.theme_combo_box, theme, set_missing=False) if theme == self.theme_combo_box.currentText(): - # TODO: Use a local display widget - # self.preview_display.set_theme(get_theme_from_name(theme)) - pass + self.service_theme = theme else: if self._save_lite: service_item.set_from_service(item) @@ -1197,9 +1195,9 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi service_item_from_item = item['service_item'] tree_widget_item = QtWidgets.QTreeWidgetItem(self.service_manager_list) if service_item_from_item.is_valid: + icon = service_item_from_item.icon.pixmap(80, 80).toImage() + icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) if service_item_from_item.notes: - icon = service_item_from_item.icon.pixmap(80, 80).toImage() - icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) overlay = UiIcons().notes.pixmap(40, 40).toImage() overlay = overlay.scaled(40, 40, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) painter = QtGui.QPainter(icon) @@ -1207,8 +1205,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi painter.end() tree_widget_item.setIcon(0, build_icon(icon)) elif service_item_from_item.temporary_edit: - icon = service_item_from_item.icon.pixmap(80, 80).toImage() - icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) overlay = QtGui.QImage(UiIcons().upload) overlay = overlay.scaled(40, 40, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) painter = QtGui.QPainter(icon) @@ -1242,13 +1238,14 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi tree_widget_item.setData(0, QtCore.Qt.UserRole, item['order']) tree_widget_item.setSelected(item['selected']) # Add the children to their parent tree_widget_item. - for slide_index, slide in enumerate(service_item_from_item.slides): + for slide_index, slide in enumerate(service_item_from_item.get_frames()): child = QtWidgets.QTreeWidgetItem(tree_widget_item) # prefer to use a display_title - if service_item_from_item.is_capable(ItemCapabilities.HasDisplayTitle): - text = slide['display_title'].replace('\n', ' ') - else: + if service_item_from_item.is_capable(ItemCapabilities.HasDisplayTitle) or \ + service_item_from_item.service_item_type == ServiceItemType.Image: text = slide['title'].replace('\n', ' ') + else: + text = service_item_from_item.get_rendered_frame(slide_index) child.setText(0, text[:40]) child.setData(0, QtCore.Qt.UserRole, slide_index) if service_item == item_index: @@ -1275,8 +1272,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi :param current_index: The combo box index for the selected item """ self.service_theme = self.theme_combo_box.currentText() - # 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) self.regenerate_service_items(True) @@ -1335,7 +1330,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi """ for item_count, item in enumerate(self.service_items): if item['service_item'].edit_id == new_item.edit_id and item['service_item'].name == new_item.name: - new_item.render() + new_item.create_slides() new_item.merge(item['service_item']) item['service_item'] = new_item self.repaint_service_list(item_count + 1, 0) @@ -1368,7 +1363,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi self.repaint_service_list(s_item, child) self.live_controller.replace_service_manager_item(item) else: - # item.render() + item.render_text_items() # nothing selected for dnd if self.drop_position == -1: if isinstance(item, list): diff --git a/openlp/plugins/presentations/lib/maclocontroller.py b/openlp/plugins/presentations/lib/maclocontroller.py index 10ba08e5e..1b0cfea8c 100644 --- a/openlp/plugins/presentations/lib/maclocontroller.py +++ b/openlp/plugins/presentations/lib/maclocontroller.py @@ -27,6 +27,7 @@ from Pyro4 import Proxy from openlp.core.common import delete_file, is_macosx from openlp.core.common.applocation import AppLocation +from openlp.core.common.mixins import LogMixin from openlp.core.common.path import Path from openlp.core.common.registry import Registry from openlp.core.display.screens import ScreenList @@ -47,7 +48,7 @@ log = logging.getLogger(__name__) register_classes() -class MacLOController(PresentationController): +class MacLOController(PresentationController, LogMixin): """ Class to control interactions with MacLO presentations on Mac OS X via Pyro4. It starts the Pyro4 nameserver, starts the LibreOfficeServer, and then controls MacLO via Pyro4.