Head r1260

This commit is contained in:
Jon Tibble 2011-02-02 15:59:00 +00:00
commit 3d81a8dc20
2 changed files with 4 additions and 2 deletions

View File

@ -245,7 +245,7 @@ class MediaManagerItem(QtGui.QWidget):
preview_string[u'title'], preview_string[u'title'],
preview_string[u'tooltip'], preview_string[u'tooltip'],
u':/general/general_preview.png', self.onPreviewClick) u':/general/general_preview.png', self.onPreviewClick)
## Live Button ## ## Live Button ##
live_string = self.plugin.getString(StringContent.Live) live_string = self.plugin.getString(StringContent.Live)
self.addToolbarButton( self.addToolbarButton(
live_string[u'title'], live_string[u'title'],
@ -507,7 +507,7 @@ class MediaManagerItem(QtGui.QWidget):
'No Service Item Selected'), 'No Service Item Selected'),
translate('OpenLP.MediaManagerItem', translate('OpenLP.MediaManagerItem',
'You must select an existing service item to add to.')) '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.generateSlideData(serviceItem)
self.parent.serviceManager.addServiceItem(serviceItem, self.parent.serviceManager.addServiceItem(serviceItem,
replace=True) replace=True)

View File

@ -42,6 +42,7 @@ class PluginStatus(object):
Inactive = 0 Inactive = 0
Disabled = -1 Disabled = -1
class StringContent(object): class StringContent(object):
Name = u'name' Name = u'name'
Import = u'import' Import = u'import'
@ -54,6 +55,7 @@ class StringContent(object):
Service = u'service' Service = u'service'
VisibleName = u'visible_name' VisibleName = u'visible_name'
class Plugin(QtCore.QObject): class Plugin(QtCore.QObject):
""" """
Base class for openlp plugins to inherit from. Base class for openlp plugins to inherit from.