raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

head

Browse Source
This commit is contained in:
Tim Bentley 2016-01-11 21:58:21 +00:00
commit 31d6f931e5
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/plugin.py
View File

@ -276,7 +276,7 @@ class Plugin(QtCore.QObject, RegistryProperties):
""" """
if self.media_item: if self.media_item:
self.media_item.initialise() 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): def finalise(self):
""" """

3
openlp/core/ui/mainwindow.py
View File

@ -154,8 +154,7 @@ class Ui_MainWindow(object):
# Create the MediaManager # Create the MediaManager
self.media_manager_dock = OpenLPDockWidget(main_window, 'media_manager_dock', self.media_manager_dock = OpenLPDockWidget(main_window, 'media_manager_dock',
':/system/system_mediamanager.png') ':/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 # Create the media toolbox
self.media_tool_box = QtWidgets.QToolBox(self.media_manager_dock) self.media_tool_box = QtWidgets.QToolBox(self.media_manager_dock)
self.media_tool_box.setObjectName('media_tool_box') self.media_tool_box.setObjectName('media_tool_box')

17
openlp/core/ui/mediadockmanager.py
View File

@ -39,23 +39,12 @@ class MediaDockManager(object):
""" """
self.media_dock = media_dock 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 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 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
""" """
visible_title = media_item.plugin.get_string(StringContent.VisibleName) visible_title = media_item.plugin.get_string(StringContent.VisibleName)
log.debug('Inserting %s dock' % visible_title['title']) log.debug('Inserting %s dock' % visible_title['title'])
@ -65,7 +54,7 @@ class MediaDockManager(object):
match = True match = True
break break
if not match: 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): def remove_dock(self, media_item):
""" """

6
tests/functional/openlp_plugins/images/test_imagetab.py
View File

@ -80,12 +80,14 @@ class TestImageMediaItem(TestCase, TestMixin):
def save_tab_change_test_test(self): 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. # GIVEN: Apply a change to the form.
self.form.background_color = '#999999' self.form.on_background_color_changed('#999999')
# WHEN: the save is invoked # WHEN: the save is invoked
self.form.save() self.form.save()
# THEN: the post process should be requested # THEN: the post process should be requested
self.assertEqual(1, self.form.settings_form.register_post_process.call_count, self.assertEqual(1, self.form.settings_form.register_post_process.call_count,
'Image Post processing should have been requested') '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')