Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial2 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/trivial2/+merge/46653
Hello!
- removed the doc for an attribute which is not passed
- removed white spaces
--
https://code.launchpad.net/~googol-hush/openlp/trivial2/+merge/46653
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/trivial2 into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2011-01-14 16:21:15 +0000
+++ openlp/core/lib/mediamanageritem.py 2011-01-18 18:56:12 +0000
@@ -168,9 +168,6 @@
``slot``
The method to call when the button is clicked.
-
- ``objectname``
- The name of the button.
"""
# NB different order (when I broke this out, I didn't want to
# break compatability), but it makes sense for the icon to
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2011-01-09 23:24:55 +0000
+++ openlp/core/ui/pluginform.py 2011-01-18 18:56:12 +0000
@@ -85,7 +85,7 @@
item.setIcon(plugin.icon)
self.pluginListWidget.addItem(item)
pluginListWidth = max(pluginListWidth, self.fontMetrics().width(
- unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) %
+ unicode(translate('OpenLP.PluginForm', '%s (Inactive)')) %
name_string[u'singular']))
self.pluginListWidget.setFixedWidth(pluginListWidth +
self.pluginListWidget.iconSize().width() + 48)
=== modified file 'openlp/core/ui/wizard.py'
--- openlp/core/ui/wizard.py 2011-01-13 17:55:29 +0000
+++ openlp/core/ui/wizard.py 2011-01-18 18:56:12 +0000
@@ -95,7 +95,7 @@
def addProgressPage(self):
"""
- Add the progress page for the wizard. This page informs the user how
+ Add the progress page for the wizard. This page informs the user how
the wizard is progressing with its task.
"""
self.progressPage = QtGui.QWizardPage()
@@ -125,7 +125,7 @@
log.debug(u'Wizard cancelled by user.')
if self.currentPage() == self.progressPage:
Receiver.send_message(u'openlp_stop_wizard')
- self.done(QtGui.QDialog.Rejected)
+ self.done(QtGui.QDialog.Rejected)
def onCurrentIdChanged(self, pageId):
"""
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2011-01-17 19:09:35 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2011-01-18 18:56:12 +0000
@@ -322,7 +322,7 @@
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
self.openLP1FormLabelSpacer.changeSize(width, 0,
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- self.easiSlidesFormLabelSpacer.changeSize(width, 0,
+ self.easiSlidesFormLabelSpacer.changeSize(width, 0,
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
self.ewFormLabelSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
@@ -654,7 +654,7 @@
'Select EasiSlides songfile'),
self.easiSlidesFilenameEdit
)
-
+
def onEWBrowseButtonClicked(self):
"""
Get EasyWorship song database files
=== modified file 'openlp/plugins/songs/lib/easislidesimport.py'
--- openlp/plugins/songs/lib/easislidesimport.py 2011-01-18 15:18:04 +0000
+++ openlp/plugins/songs/lib/easislidesimport.py 2011-01-18 18:56:12 +0000
@@ -39,7 +39,7 @@
"""
Import songs exported from EasiSlides
- The format example is here:
+ The format example is here:
http://wiki.openlp.org/Development:EasiSlides_-_Song_Data_Format
"""
def __init__(self, manager, **kwargs):
@@ -71,7 +71,7 @@
for song in song_xml.Item:
self.import_wizard.incrementProgressBar(
unicode(translate('SongsPlugin.ImportWizardForm',
- u'Importing %s, song %s...')) %
+ u'Importing %s, song %s...')) %
(os.path.split(self.filename)[-1], song.Title1))
success = self._parse_song(song)
if not success or self.stop_import_flag:
@@ -313,7 +313,7 @@
tag = SeqTypes[tag.lower()]
else:
continue
-
+
if tag in versetags:
self.verse_order_list.append(tag)
else:
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
