From c8226bf2fc00c14b5d7d5ed21ca6f9d5eeda0877 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 4 Nov 2009 23:13:17 +0000 Subject: [PATCH 1/4] Fix mismerge --- openlp/core/lib/mediamanageritem.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 5c2f0eec6..722d5756e 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -377,7 +377,6 @@ class MediaManagerItem(QtGui.QWidget): service_item = self.buildServiceItem() if service_item: service_item.fromPlugin = True - service_item.uuid = unicode(uuid.uuid1()) self.parent.live_controller.addServiceItem(service_item) def onAddClick(self): From 3d56391d1c1e44b947f193bd36c35b510d4a65a5 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 4 Nov 2009 23:16:33 +0000 Subject: [PATCH 2/4] Fix typo --- openlp/core/ui/generaltab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 4af3faeb7..f2177675e 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -151,7 +151,7 @@ class GeneralTab(SettingsTab): self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) - self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) + self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Service before starting New')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) From 62031c24b94f79bd128cd1db95725531d1d18926 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 5 Nov 2009 00:09:19 +0000 Subject: [PATCH 3/4] Fix last theme.parse() without a cleanTheme() --- openlp/core/ui/thememanager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index a55f39fd3..44ac83043 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -430,6 +430,7 @@ class ThemeManager(QtGui.QWidget): log.debug(u'generateAndSaveImage %s %s %s', dir, name, theme_xml) theme = ThemeXML() theme.parse(theme_xml) + self.cleanTheme(theme) theme.extend_image_filename(dir) frame = self.generateImage(theme) samplepathname = os.path.join(self.path, name + u'.png') From d5e2ba78083e5d12b36b39d979429047f8652b64 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 5 Nov 2009 00:28:05 +0000 Subject: [PATCH 4/4] Fix double checks --- openlp/plugins/bibles/lib/manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 575f5cb66..1b308571e 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -173,14 +173,14 @@ class BibleManager(object): nbible.save_meta(u'WEB', biblesource) # store the web id of the bible nbible.save_meta(u'bibleid', bibleid) - if proxyurl and proxyurl != u'': + if proxyurl: # store the proxy URL nbible.save_meta(u'proxy', proxyurl) nhttp.set_proxy(proxyurl) - if proxyid and proxyid != u'': + if proxyid: # store the proxy userid nbible.save_meta(u'proxyid', proxyid) - if proxypass and proxypass != u'': + if proxypass: # store the proxy password nbible.save_meta(u'proxypass', proxypass) return True