openlp-core team mailing list archive

[m2j <meinertjordan@xxxxxxxxxx>]

m2j has proposed merging lp:~m2j/openlp/work into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
Related bugs:
  #661867 Invalid author added in song dialog
  https://bugs.launchpad.net/bugs/661867

For more details, see:
https://code.launchpad.net/~m2j/openlp/work/+merge/44508

My mysterious bug: author was added to AuthorsSelectionComboItem without a database entry.

PS: sorry, a typo happened.
-- 
https://code.launchpad.net/~m2j/openlp/work/+merge/44508
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-12-11 20:49:50 +0000
+++ openlp/core/ui/mainwindow.py	2010-12-22 19:06:57 +0000
@@ -148,7 +148,7 @@
         self.MediaManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_left)
         self.MediaManagerDock.setObjectName(u'MediaManagerDock')
-        self.MediaManagerContents = QtGui.QWidget()
+        self.MediaManagerContents = QtGui.QWidget(MainWindow)
         self.MediaManagerContents.setObjectName(u'MediaManagerContents')
         self.MediaManagerLayout = QtGui.QHBoxLayout(self.MediaManagerContents)
         self.MediaManagerLayout.setContentsMargins(0, 2, 0, 0)

=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py	2010-12-21 19:39:35 +0000
+++ openlp/plugins/bibles/lib/http.py	2010-12-22 19:06:57 +0000
@@ -284,6 +284,7 @@
             if not soup:
                 return None
         Receiver.send_message(u'openlp_process_events')
+        content = None
         try:
             content = soup.find(u'div', u'content').find(u'div').findAll(u'div')
         except:

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2010-09-14 18:18:47 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2010-12-22 19:06:57 +0000
@@ -146,8 +146,7 @@
             self.AuthorsSelectionComboItem.sizePolicy().hasHeightForWidth())
         self.AuthorsSelectionComboItem.setSizePolicy(sizePolicy)
         self.AuthorsSelectionComboItem.setEditable(True)
-        self.AuthorsSelectionComboItem.setInsertPolicy(
-            QtGui.QComboBox.InsertAlphabetically)
+        self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.AuthorsSelectionComboItem.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.AuthorsSelectionComboItem.setMinimumContentsLength(8)
@@ -224,6 +223,7 @@
         sizePolicy.setHeightForWidth(
             self.SongTopicCombo.sizePolicy().hasHeightForWidth())
         self.SongTopicCombo.setEditable(True)
+        self.SongTopicCombo.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.SongTopicCombo.setSizePolicy(sizePolicy)
         self.SongTopicCombo.setObjectName(u'SongTopicCombo')
         self.TopicAddLayout.addWidget(self.SongTopicCombo)
@@ -271,6 +271,7 @@
         sizePolicy.setHeightForWidth(
             self.SongbookCombo.sizePolicy().hasHeightForWidth())
         self.SongbookCombo.setEditable(True)
+        self.SongbookCombo.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.SongbookCombo.setSizePolicy(sizePolicy)
         self.SongbookCombo.setObjectName(u'SongbookCombo')
         self.SongbookLayout.addRow(self.SongbookNameLabel, self.SongbookCombo)
@@ -315,6 +316,7 @@
         self.ThemeLayout.setObjectName(u'ThemeLayout')
         self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
         self.ThemeSelectionComboItem.setEditable(True)
+        self.ThemeSelectionComboItem.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.ThemeSelectionComboItem.setObjectName(u'ThemeSelectionComboItem')
         self.ThemeLayout.addWidget(self.ThemeSelectionComboItem)
         self.ThemeAddButton = QtGui.QPushButton(self.ThemeGroupBox)