From 9d8c757d0dff42884c92cae51007cf88014bf398 Mon Sep 17 00:00:00 2001 From: Simon Hanna Date: Sun, 10 Jan 2016 19:01:36 +0100 Subject: [PATCH 1/2] Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma --- openlp/core/lib/plugin.py | 2 +- openlp/core/ui/mainwindow.py | 3 +-- openlp/core/ui/mediadockmanager.py | 19 ++++--------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index adeacd81b..f01042002 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -275,7 +275,7 @@ class Plugin(QtCore.QObject, RegistryProperties): """ if self.media_item: self.media_item.initialise() - self.main_window.media_dock_manager.insert_dock(self.media_item, self.icon, self.weight) + self.main_window.media_dock_manager.add_item_to_dock(self.media_item) def finalise(self): """ diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 0b35cf890..aed44468e 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -153,8 +153,7 @@ class Ui_MainWindow(object): # Create the MediaManager self.media_manager_dock = OpenLPDockWidget(main_window, 'media_manager_dock', ':/system/system_mediamanager.png') - # TODO: Figure out how to fix the stylesheet and add it back in - # self.media_manager_dock.setStyleSheet(MEDIA_MANAGER_STYLE) + self.media_manager_dock.setStyleSheet(MEDIA_MANAGER_STYLE) # Create the media toolbox self.media_tool_box = QtWidgets.QToolBox(self.media_manager_dock) self.media_tool_box.setObjectName('media_tool_box') diff --git a/openlp/core/ui/mediadockmanager.py b/openlp/core/ui/mediadockmanager.py index 4b8dd71a8..ad786b3a0 100644 --- a/openlp/core/ui/mediadockmanager.py +++ b/openlp/core/ui/mediadockmanager.py @@ -39,23 +39,12 @@ class MediaDockManager(object): """ self.media_dock = media_dock - def add_dock(self, media_item, icon, weight): + def add_item_to_dock(self, media_item): """ Add a MediaManagerItem to the dock + If the item has been added before, it's silently skipped - :param media_item: The item to add to the dock - :param icon: An icon for this dock item - :param weight: - """ - visible_title = media_item.plugin.get_string(StringContent.VisibleName) - log.info('Adding %s dock' % visible_title) - self.media_dock.addItem(media_item, icon, visible_title['title']) - - def insert_dock(self, media_item, icon, weight): - """ - This should insert a dock item at a given location - This does not work as it gives a Segmentation error. - For now add at end of stack if not present + :param media_item: The item to add to the dock """ visible_title = media_item.plugin.get_string(StringContent.VisibleName) log.debug('Inserting %s dock' % visible_title['title']) @@ -65,7 +54,7 @@ class MediaDockManager(object): match = True break if not match: - self.media_dock.addItem(media_item, icon, visible_title['title']) + self.media_dock.addItem(media_item, visible_title['title']) def remove_dock(self, media_item): """ From 09faa0cb87a7d4433b9e11d83b72b205337f4a9c Mon Sep 17 00:00:00 2001 From: Simon Hanna Date: Sun, 10 Jan 2016 21:06:41 +0100 Subject: [PATCH 2/2] Add a test --- tests/functional/openlp_plugins/images/test_imagetab.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/functional/openlp_plugins/images/test_imagetab.py b/tests/functional/openlp_plugins/images/test_imagetab.py index 114c97bc2..3f1a798e3 100644 --- a/tests/functional/openlp_plugins/images/test_imagetab.py +++ b/tests/functional/openlp_plugins/images/test_imagetab.py @@ -80,12 +80,14 @@ class TestImageMediaItem(TestCase, TestMixin): def save_tab_change_test_test(self): """ - Test a change triggers post processing. + Test a color change is applied and triggers post processing. """ # GIVEN: Apply a change to the form. - self.form.background_color = '#999999' + self.form.on_background_color_changed('#999999') # WHEN: the save is invoked self.form.save() # THEN: the post process should be requested self.assertEqual(1, self.form.settings_form.register_post_process.call_count, 'Image Post processing should have been requested') + # THEN: The color should be set + self.assertEqual(self.form.background_color, '#999999', 'The updated color should have been saved')