openlp-core team mailing list archive

[googol <googol@xxxxxxxx>]

googol has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)


- coding standard fixes
- name fixes

Cheers
-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/29462
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2010-07-05 16:00:48 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2010-07-08 13:36:49 +0000
@@ -84,8 +84,8 @@
         self.ExportBibleItem.setVisible(False)
 
     def onBibleImportClick(self):
-        if self.media_item:
-            self.media_item.onImportClick()
+        if self.mediaItem:
+            self.mediaItem.onImportClick()
 
     def about(self):
         about_text = translate('BiblePlugin',

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2010-06-30 22:05:51 +0000
+++ openlp/plugins/bibles/lib/db.py	2010-07-08 13:36:49 +0000
@@ -342,7 +342,7 @@
                 verse_list.extend(verses)
             else:
                 log.debug(u'OpenLP failed to find book %s', book)
-                QtGui.QMessageBox.information(self.bible_plugin.media_item,
+                QtGui.QMessageBox.information(self.bible_plugin.mediaItem,
                     translate('BibleDB', 'Book not found'),
                     translate('BibleDB', u'The book you requested could not '
                         'be found in this bible.  Please check your spelling '

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2010-06-24 19:36:33 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2010-07-08 13:36:49 +0000
@@ -131,7 +131,8 @@
         self.QuickClearLabel.setObjectName(u'QuickSearchLabel')
         self.QuickLayout.addWidget(self.QuickClearLabel, 4, 0, 1, 1)
         self.ClearQuickSearchComboBox = QtGui.QComboBox(self.QuickTab)
-        self.ClearQuickSearchComboBox.setObjectName(u'ClearQuickSearchComboBox')
+        self.ClearQuickSearchComboBox.setObjectName(
+            u'ClearQuickSearchComboBox')
         self.QuickLayout.addWidget(self.ClearQuickSearchComboBox, 4, 1, 1, 2)
         self.QuickSearchButtonLayout = QtGui.QHBoxLayout()
         self.QuickSearchButtonLayout.setMargin(0)
@@ -169,7 +170,8 @@
         self.AdvancedVersionComboBox.setObjectName(u'AdvancedVersionComboBox')
         self.AdvancedLayout.addWidget(self.AdvancedVersionComboBox, 0, 1, 1, 2)
         self.AdvancedSecondBibleLabel = QtGui.QLabel(self.AdvancedTab)
-        self.AdvancedSecondBibleLabel.setObjectName(u'AdvancedSecondBibleLabel')
+        self.AdvancedSecondBibleLabel.setObjectName(
+            u'AdvancedSecondBibleLabel')
         self.AdvancedLayout.addWidget(self.AdvancedSecondBibleLabel, 1, 0, 1, 1)
         self.AdvancedSecondBibleComboBox = QtGui.QComboBox(self.AdvancedTab)
         self.AdvancedSecondBibleComboBox.setSizeAdjustPolicy(
@@ -223,7 +225,8 @@
             u'AdvancedSearchButtonLayout')
         self.AdvancedSearchButtonSpacer = QtGui.QSpacerItem(40, 20,
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.AdvancedSearchButtonLayout.addItem(self.AdvancedSearchButtonSpacer)
+        self.AdvancedSearchButtonLayout.addItem(
+            self.AdvancedSearchButtonSpacer)
         self.AdvancedSearchButton = QtGui.QPushButton(self.AdvancedTab)
         self.AdvancedSearchButton.setObjectName(u'AdvancedSearchButton')
         self.AdvancedSearchButtonLayout.addWidget(self.AdvancedSearchButton)
@@ -617,7 +620,8 @@
         else:
             self.AdvancedSearchButton.setEnabled(True)
             self.AdvancedMessage.setText(u'')
-            self.adjustComboBox(1, self.chapters_from, self.AdvancedFromChapter)
+            self.adjustComboBox(1, self.chapters_from,
+                self.AdvancedFromChapter)
             self.adjustComboBox(1, self.chapters_from, self.AdvancedToChapter)
             self.adjustComboBox(1, self.verses, self.AdvancedFromVerse)
             self.adjustComboBox(1, self.verses, self.AdvancedToVerse)

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2010-07-05 16:00:48 +0000
+++ openlp/plugins/songs/songsplugin.py	2010-07-08 13:36:49 +0000
@@ -150,8 +150,8 @@
         pass
 
     def onSongImportItemClicked(self):
-        if self.media_item:
-            self.media_item.onImportClick()
+        if self.mediaItem:
+            self.mediaItem.onImportClick()
 
     def onImportSofItemClick(self):
         filenames = QtGui.QFileDialog.getOpenFileNames(