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

clean up

Browse Source
This commit is contained in:
Andreas Preikschat 2010-11-04 17:26:30 +01:00
parent 565c10b139
commit 0f76533470
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/lib/mediamanageritem.py
View File

@ -541,4 +541,3 @@ class MediaManagerItem(QtGui.QWidget):
individual service items need to be processed by the plugins individual service items need to be processed by the plugins
""" """
pass pass

28
openlp/core/lib/serviceitem.py
View File

@ -212,7 +212,7 @@ class ServiceItem(object):
self.service_item_type = ServiceItemType.Text self.service_item_type = ServiceItemType.Text
title = title.split(u'\n')[0] title = title.split(u'\n')[0]
self._raw_frames.append( self._raw_frames.append(
{u'title': title, u'raw_slide': raw_slide, u'verseTag':verse_tag}) {u'title': title, u'raw_slide': raw_slide, u'verseTag': verse_tag})
self._new_item() self._new_item()
def add_from_command(self, path, file_name, image): def add_from_command(self, path, file_name, image):
@ -230,7 +230,7 @@ class ServiceItem(object):
""" """
self.service_item_type = ServiceItemType.Command self.service_item_type = ServiceItemType.Command
self._raw_frames.append( self._raw_frames.append(
{u'title': file_name, u'image':image, u'path': path}) {u'title': file_name, u'image': image, u'path': path})
self._new_item() self._new_item()
def get_service_repr(self): def get_service_repr(self):
@ -241,17 +241,17 @@ class ServiceItem(object):
service_header = { service_header = {
u'name': self.name.lower(), u'name': self.name.lower(),
u'plugin': self.name, u'plugin': self.name,
u'theme':self.theme, u'theme': self.theme,
u'title':self.title, u'title': self.title,
u'icon':self.icon, u'icon': self.icon,
u'footer':self.raw_footer, u'footer': self.raw_footer,
u'type':self.service_item_type, u'type': self.service_item_type,
u'audit':self.audit, u'audit': self.audit,
u'notes':self.notes, u'notes': self.notes,
u'from_plugin':self.from_plugin, u'from_plugin': self.from_plugin,
u'capabilities':self.capabilities, u'capabilities': self.capabilities,
u'search':self.search_string, u'search': self.search_string,
u'data':self.data_string u'data': self.data_string
} }
service_data = [] service_data = []
if self.service_item_type == ServiceItemType.Text: if self.service_item_type == ServiceItemType.Text:
@ -263,7 +263,7 @@ class ServiceItem(object):
elif self.service_item_type == ServiceItemType.Command: elif self.service_item_type == ServiceItemType.Command:
for slide in self._raw_frames: for slide in self._raw_frames:
service_data.append( service_data.append(
{u'title':slide[u'title'], u'image':slide[u'image']}) {u'title': slide[u'title'], u'image': slide[u'image']})
return {u'header': service_header, u'data': service_data} return {u'header': service_header, u'data': service_data}
def set_from_service(self, serviceitem, path=None): def set_from_service(self, serviceitem, path=None):

2
openlp/plugins/media/lib/mediatab.py
View File

@ -80,5 +80,3 @@ class MediaTab(SettingsTab):
QtCore.QSettings().setValue(self.settingsSection + u'/use phonon', QtCore.QSettings().setValue(self.settingsSection + u'/use phonon',
QtCore.QVariant(self.usePhonon)) QtCore.QVariant(self.usePhonon))
Receiver.send_message(u'config_screen_changed') Receiver.send_message(u'config_screen_changed')