From 1027d6063578f08c942a4d564eb465f75e17fbbc Mon Sep 17 00:00:00 2001 From: M2j Date: Wed, 22 Dec 2010 19:15:48 +0100 Subject: [PATCH 1/3] Fix: Bug in editsongform Fix: Bug in bibleserver import --- openlp/core/ui/mainwindow.py | 2 +- openlp/plugins/bibles/lib/http.py | 1 + openlp/plugins/songs/forms/editsongdialog.py | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index a319e005f..ed06877e5 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -148,7 +148,7 @@ class Ui_MainWindow(object): 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) diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index d3b14661b..79d3f311f 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -284,6 +284,7 @@ class BSExtract(object): 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: diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 0d2e65f95..ffe05553b 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -146,8 +146,7 @@ class Ui_EditSongDialog(object): 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 @@ class Ui_EditSongDialog(object): 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 @@ class Ui_EditSongDialog(object): sizePolicy.setHeightForWidth( self.SongbookCombo.sizePolicy().hasHeightForWidth()) self.SongbookCombo.setEditable(True) + self.SongbookCombe.setInsertPolicy(QtGui.QComboBox.NoInsert) self.SongbookCombo.setSizePolicy(sizePolicy) self.SongbookCombo.setObjectName(u'SongbookCombo') self.SongbookLayout.addRow(self.SongbookNameLabel, self.SongbookCombo) @@ -315,6 +316,7 @@ class Ui_EditSongDialog(object): 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) From 5dddb3a53df25d137486fce310d053bda599655f Mon Sep 17 00:00:00 2001 From: M2j Date: Wed, 22 Dec 2010 20:03:38 +0100 Subject: [PATCH 2/3] typo --- openlp/plugins/songs/forms/editsongdialog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index ffe05553b..66ade5bcd 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -271,7 +271,7 @@ class Ui_EditSongDialog(object): sizePolicy.setHeightForWidth( self.SongbookCombo.sizePolicy().hasHeightForWidth()) self.SongbookCombo.setEditable(True) - self.SongbookCombe.setInsertPolicy(QtGui.QComboBox.NoInsert) + self.SongbookCombo.setInsertPolicy(QtGui.QComboBox.NoInsert) self.SongbookCombo.setSizePolicy(sizePolicy) self.SongbookCombo.setObjectName(u'SongbookCombo') self.SongbookLayout.addRow(self.SongbookNameLabel, self.SongbookCombo) From 2d0acec7badbe1f6a6ef989317bb131226b2f75f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 23 Dec 2010 10:43:00 +0200 Subject: [PATCH 3/3] Fix bug #693694 --- openlp/plugins/remotes/html/openlp.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js index 03e846376..0c7105a68 100644 --- a/openlp/plugins/remotes/html/openlp.js +++ b/openlp/plugins/remotes/html/openlp.js @@ -206,8 +206,12 @@ OpenLP.Namespace.create("OpenLP.Remote", { }, sendLiveSet: function (e) { - var id = OpenLP.Events.getElement(e).parent().attr("value"); - OpenLP.Remote.sendEvent("slidecontroller_live_set", id); + var tr = OpenLP.Events.getElement(e).parent(); + if (tr[0].tagName != "TR") + { + tr = tr.parent(); + } + OpenLP.Remote.sendEvent("slidecontroller_live_set", tr.attr("value")); return false; }, sendSetItem: function (e)