openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #598393 After adding a new image to a selected (image) item in the service manager it is not selected anymore
  https://bugs.launchpad.net/bugs/598393

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/48310

Hello!

You cannot append images to a service item, when you use a localised version of OpenLP. This fixes this.

Cheers
-- 
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/48310
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/fixes into lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2011-02-01 18:53:44 +0000
+++ openlp/core/lib/mediamanageritem.py	2011-02-02 13:26:16 +0000
@@ -245,7 +245,7 @@
             preview_string[u'title'],
             preview_string[u'tooltip'],
             u':/general/general_preview.png', self.onPreviewClick)
-        ## Live  Button ##
+        ## Live Button ##
         live_string = self.plugin.getString(StringContent.Live)
         self.addToolbarButton(
             live_string[u'title'],
@@ -507,7 +507,7 @@
                         'No Service Item Selected'),
                     translate('OpenLP.MediaManagerItem',
                         'You must select an existing service item to add to.'))
-            elif self.title.lower() == serviceItem.name.lower():
+            elif self.plugin.name.lower() == serviceItem.name.lower():
                 self.generateSlideData(serviceItem)
                 self.parent.serviceManager.addServiceItem(serviceItem,
                     replace=True)

=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2011-01-09 08:47:48 +0000
+++ openlp/core/lib/plugin.py	2011-02-02 13:26:16 +0000
@@ -42,6 +42,7 @@
     Inactive = 0
     Disabled = -1
 
+
 class StringContent(object):
     Name = u'name'
     Import = u'import'
@@ -54,6 +55,7 @@
     Service = u'service'
     VisibleName = u'visible_name'
 
+
 class Plugin(QtCore.QObject):
     """
     Base class for openlp plugins to inherit from.