From 03fc07cabf8dc38483e91ef8716cbfc675919813 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 25 Jan 2011 01:19:57 +0000 Subject: [PATCH 1/2] Fix for NGÜ bible --- openlp/plugins/bibles/resources/bibleserver.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/resources/bibleserver.csv b/openlp/plugins/bibles/resources/bibleserver.csv index c0d109f97..942d43116 100644 --- a/openlp/plugins/bibles/resources/bibleserver.csv +++ b/openlp/plugins/bibles/resources/bibleserver.csv @@ -19,7 +19,7 @@ IBS-fordítás (Új Károli), KAR King James Version, KJV Luther 1984, LUT Septuaginta, LXX -Neue Genfer Übersetzung, NGÜ +Neue Genfer Übersetzung, NGU New International Readers Version, NIRV New International Version, NIV Neues Leben, NL From c0eccc4b857e2bbbb38bc2fb48dbeea6fae3ed28 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Tue, 25 Jan 2011 04:42:15 +0000 Subject: [PATCH 2/2] Fix theme editing --- openlp/core/lib/mediamanageritem.py | 10 +++------- openlp/core/ui/themeform.py | 18 +++++------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 5799a3f41..9565a9b37 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -98,13 +98,9 @@ class MediaManagerItem(QtGui.QWidget): visible_title = self.plugin.getString(StringContent.VisibleName) self.title = unicode(visible_title[u'title']) self.settingsSection = self.plugin.name.lower() - if isinstance(icon, QtGui.QIcon): - self.icon = icon - elif isinstance(icon, basestring): - self.icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), - QtGui.QIcon.Normal, QtGui.QIcon.Off) - else: - self.icon = None + self.icon = None + if icon: + self.icon = build_icon(icon) self.toolbar = None self.remoteTriggered = None self.serviceItemIconName = None diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 60c1b97bc..43f1034f4 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -55,7 +55,6 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): self.thememanager = parent self.setupUi(self) self.registerFields() - self.accepted = False self.updateThemeAllowed = True QtCore.QObject.connect(self.backgroundComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'), @@ -120,14 +119,12 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): QtCore.QObject.connect(self.mainFontComboBox, QtCore.SIGNAL(u'activated(int)'), self.calculateLines) - QtCore.QObject.connect(self, QtCore.SIGNAL(u'accepted()'), self.accept) def setDefaults(self): """ Set up display at start of theme edit. """ self.restart() - self.accepted = False self.setBackgroundPageValues() self.setMainAreaPageValues() self.setFooterAreaPageValues() @@ -448,9 +445,10 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): """ Background gradient Combo box has changed. """ - self.theme.background_direction = \ - BackgroundGradientType.to_string(index) - self.setBackgroundPageValues() + if self.updateThemeAllowed: + self.theme.background_direction = \ + BackgroundGradientType.to_string(index) + self.setBackgroundPageValues() def onColorButtonClicked(self): """ @@ -562,13 +560,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): """ Lets save the them as Finish has been pressed """ - # Some reason getting double submission. - # Hack to stop it for now. - if self.accepted: - return # Save the theme name - self.theme.theme_name = \ - unicode(self.field(u'name').toString()) + self.theme.theme_name = unicode(self.field(u'name').toString()) if not self.theme.theme_name: criticalErrorMessageBox( translate('OpenLP.ThemeForm', 'Theme Name Missing'), @@ -592,7 +585,6 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): if not self.edit_mode and \ not self.thememanager.checkIfThemeExists(self.theme.theme_name): return - self.accepted = True self.thememanager.saveTheme(self.theme, saveFrom, saveTo) return QtGui.QDialog.accept(self)