From 2d21d795f2272b04c3f736c41659e94bef110bde Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jan 2011 19:42:57 +0100 Subject: [PATCH 1/5] r1226 From 628a5bd755a627ff4436ec2cb7d543b228fd76f0 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jan 2011 19:49:47 +0100 Subject: [PATCH 2/5] removed obsolete attribute doc --- openlp/core/lib/mediamanageritem.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 6fb834e05..de2b2327c 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -168,9 +168,6 @@ class MediaManagerItem(QtGui.QWidget): ``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 From 608dbd2537c76af1782ddc8f42d4438884da268a Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jan 2011 19:53:09 +0100 Subject: [PATCH 3/5] removed white spaces --- openlp/core/ui/pluginform.py | 2 +- openlp/core/ui/wizard.py | 4 ++-- openlp/plugins/songs/forms/songimportform.py | 4 ++-- openlp/plugins/songs/lib/easislidesimport.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index 8e82f0003..d6ffc69f0 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -85,7 +85,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): 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) diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index 3b221455b..d3a0255b4 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -95,7 +95,7 @@ class OpenLPWizard(QtGui.QWizard): 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 @@ class OpenLPWizard(QtGui.QWizard): 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): """ diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 433c9abfc..d14ab9c36 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -322,7 +322,7 @@ class SongImportForm(OpenLPWizard): 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 @@ class SongImportForm(OpenLPWizard): 'Select EasiSlides songfile'), self.easiSlidesFilenameEdit ) - + def onEWBrowseButtonClicked(self): """ Get EasyWorship song database files diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py index fac376134..8685b6934 100644 --- a/openlp/plugins/songs/lib/easislidesimport.py +++ b/openlp/plugins/songs/lib/easislidesimport.py @@ -39,7 +39,7 @@ class EasiSlidesImport(SongImport): """ 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 @@ class EasiSlidesImport(SongImport): 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 @@ class EasiSlidesImport(SongImport): tag = SeqTypes[tag.lower()] else: continue - + if tag in versetags: self.verse_order_list.append(tag) else: From d567bb12ad13fc7fe43bd3abfe827dd63e5fd772 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 18 Jan 2011 21:14:44 +0100 Subject: [PATCH 4/5] more doc fixes --- openlp/core/lib/mediamanageritem.py | 4 ++++ openlp/core/lib/toolbar.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index de2b2327c..bb98c9db8 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -168,6 +168,10 @@ class MediaManagerItem(QtGui.QWidget): ``slot`` The method to call when the button is clicked. + + ``checkable`` + If *True* the button has two, *off* and *on*, states. Default is + *False*, which means the buttons has only one state. """ # NB different order (when I broke this out, I didn't want to # break compatability), but it makes sense for the icon to diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py index 93aed62e5..763e6bf67 100644 --- a/openlp/core/lib/toolbar.py +++ b/openlp/core/lib/toolbar.py @@ -69,8 +69,9 @@ class OpenLPToolbar(QtGui.QToolBar): ``slot`` The method to run when this button is clicked. - ``objectname`` - The name of the object, as used in `