From 3722253bcfe4597807331fb3cf9d270155cd3c79 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Fri, 26 Aug 2011 23:14:30 -0400 Subject: [PATCH 1/4] Added code to process any Bibles downloaded during the re-run of the First Time wizard --- openlp/core/ui/mainwindow.py | 3 +++ openlp/plugins/bibles/bibleplugin.py | 5 ++++- openlp/plugins/bibles/lib/mediaitem.py | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 4ecf792bc..5bd8e9fb7 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -767,6 +767,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.themeManagerContents.loadThemes(True) Receiver.send_message(u'theme_update_global', self.themeManagerContents.global_theme) + # Check if any Bibles downloaded. If there are, they will be + # processed. + Receiver.send_message(u'bibles_load_list', True) def blankCheck(self): """ diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 619581b17..900f04b50 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -29,7 +29,8 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import Plugin, StringContent, build_icon, translate +from openlp.core.lib import Plugin, StringContent, build_icon, translate, \ + Receiver from openlp.core.lib.ui import base_action, UiStrings from openlp.core.utils.actions import ActionList from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem @@ -62,6 +63,8 @@ class BiblePlugin(Plugin): self.exportBibleItem.setVisible(False) if len(self.manager.old_bible_databases): self.toolsUpgradeItem.setVisible(True) + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'bibles_appStartup'), self.appStartup) def finalise(self): """ diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 91009424c..710803bd2 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -391,10 +391,13 @@ class BibleMediaItem(MediaManagerItem): elif len(bibles): self.initialiseAdvancedBible(bibles[0]) - def reloadBibles(self): + def reloadBibles(self, process=False): log.debug(u'Reloading Bibles') self.plugin.manager.reload_bibles() self.loadBibles() + # If called from first time wizard re-run, process any new bibles. + if process: + Receiver.send_message(u'bibles_appStartup') self.updateAutoCompleter() def initialiseAdvancedBible(self, bible): From d4e6c44d217d982c2e9e3a6755b05a9e39f14441 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Sat, 27 Aug 2011 16:42:22 -0400 Subject: [PATCH 2/4] Fixed signal name --- openlp/plugins/bibles/bibleplugin.py | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 900f04b50..17bad2b64 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -64,7 +64,7 @@ class BiblePlugin(Plugin): if len(self.manager.old_bible_databases): self.toolsUpgradeItem.setVisible(True) QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'bibles_appStartup'), self.appStartup) + QtCore.SIGNAL(u'bibles_app_startup'), self.appStartup) def finalise(self): """ diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 710803bd2..fe0fc58c3 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -397,7 +397,7 @@ class BibleMediaItem(MediaManagerItem): self.loadBibles() # If called from first time wizard re-run, process any new bibles. if process: - Receiver.send_message(u'bibles_appStartup') + Receiver.send_message(u'bibles_app_startup') self.updateAutoCompleter() def initialiseAdvancedBible(self, bible): From 7e4825653430ec51fed47f48c117676a6dc64a16 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Mon, 29 Aug 2011 08:47:32 -0400 Subject: [PATCH 3/4] Removed need for signal to run appStartup --- openlp/plugins/bibles/bibleplugin.py | 2 -- openlp/plugins/bibles/lib/mediaitem.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 17bad2b64..b9f4769cf 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -63,8 +63,6 @@ class BiblePlugin(Plugin): self.exportBibleItem.setVisible(False) if len(self.manager.old_bible_databases): self.toolsUpgradeItem.setVisible(True) - QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'bibles_app_startup'), self.appStartup) def finalise(self): """ diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index fe0fc58c3..9083b18a2 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -397,7 +397,7 @@ class BibleMediaItem(MediaManagerItem): self.loadBibles() # If called from first time wizard re-run, process any new bibles. if process: - Receiver.send_message(u'bibles_app_startup') + self.plugin.appStartup() self.updateAutoCompleter() def initialiseAdvancedBible(self, bible): From 96076a4bac95e99872d5e33b4146aa645ffe1d41 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Mon, 29 Aug 2011 08:59:19 -0400 Subject: [PATCH 4/4] Removed import receiver --- openlp/plugins/bibles/bibleplugin.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index b9f4769cf..619581b17 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -29,8 +29,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import Plugin, StringContent, build_icon, translate, \ - Receiver +from openlp.core.lib import Plugin, StringContent, build_icon, translate from openlp.core.lib.ui import base_action, UiStrings from openlp.core.utils.actions import ActionList from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem