← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~smpettit/openlp/preview-edit-custom into lp:openlp

 

Stevan Pettit has proposed merging lp:~smpettit/openlp/preview-edit-custom into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~smpettit/openlp/preview-edit-custom/+merge/64929

Fixed problem with preview edit button not working for custom slides.

This problem first occurred when the "custom" plugin was renamed to "custom slide"

Changed name of custom plugin to 'Custom_Slide'
Replaced the ' ' in the signal reciever to a '_',  it's now 'custom_slide_edit'
-- 
https://code.launchpad.net/~smpettit/openlp/preview-edit-custom/+merge/64929
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/custom/customplugin.py	2011-06-17 01:50:57 +0000
@@ -46,7 +46,7 @@
     log.info(u'Custom Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Custom Slide', plugin_helpers,
+        Plugin.__init__(self, u'Custom_Slide', plugin_helpers,
             CustomMediaItem, CustomTab)
         self.weight = -5
         self.manager = Manager(u'custom', init_schema)

=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/custom/lib/mediaitem.py	2011-06-17 01:50:57 +0000
@@ -105,7 +105,7 @@
             QtCore.SIGNAL(u'searchTypeChanged(int)'),
             self.onSearchTextButtonClick)
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'custom_edit'), self.onRemoteEdit)
+            QtCore.SIGNAL(u'custom_slide_edit'), self.onRemoteEdit)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'custom_edit_clear'), self.onRemoteEditClear)
         QtCore.QObject.connect(Receiver.get_receiver(),


Follow ups