openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #04409
[Merge] lp:~googol-hush/openlp/trivial into lp:openlp
Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Some small clean ups:
- removed lines at the end of the file (if there were more than one)
- some missing spaces
--
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/40135
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2010-10-07 17:52:40 +0000
+++ openlp/core/lib/mediamanageritem.py 2010-11-04 18:36:07 +0000
@@ -541,4 +541,3 @@
individual service items need to be processed by the plugins
"""
pass
-
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2010-11-03 17:40:45 +0000
+++ openlp/core/lib/serviceitem.py 2010-11-04 18:36:07 +0000
@@ -212,7 +212,7 @@
self.service_item_type = ServiceItemType.Text
title = title.split(u'\n')[0]
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()
def add_from_command(self, path, file_name, image):
@@ -230,7 +230,7 @@
"""
self.service_item_type = ServiceItemType.Command
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()
def get_service_repr(self):
@@ -241,17 +241,17 @@
service_header = {
u'name': self.name.lower(),
u'plugin': self.name,
- u'theme':self.theme,
- u'title':self.title,
- u'icon':self.icon,
- u'footer':self.raw_footer,
- u'type':self.service_item_type,
- u'audit':self.audit,
- u'notes':self.notes,
- u'from_plugin':self.from_plugin,
- u'capabilities':self.capabilities,
- u'search':self.search_string,
- u'data':self.data_string
+ u'theme': self.theme,
+ u'title': self.title,
+ u'icon': self.icon,
+ u'footer': self.raw_footer,
+ u'type': self.service_item_type,
+ u'audit': self.audit,
+ u'notes': self.notes,
+ u'from_plugin': self.from_plugin,
+ u'capabilities': self.capabilities,
+ u'search': self.search_string,
+ u'data': self.data_string
}
service_data = []
if self.service_item_type == ServiceItemType.Text:
@@ -263,7 +263,7 @@
elif self.service_item_type == ServiceItemType.Command:
for slide in self._raw_frames:
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}
def set_from_service(self, serviceitem, path=None):
=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2010-10-07 21:47:17 +0000
+++ openlp/plugins/media/lib/mediatab.py 2010-11-04 18:36:07 +0000
@@ -80,5 +80,3 @@
QtCore.QSettings().setValue(self.settingsSection + u'/use phonon',
QtCore.QVariant(self.usePhonon))
Receiver.send_message(u'config_screen_changed')
-
-
Follow ups