openlp-core team mailing list archive

[Stevan Pettit <smpettit@xxxxxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~smpettit/openlp/ftw into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #825152 in OpenLP: "Bibles downloaded when re-running the first time Wizard are only available after restarting OpenLP"
  https://bugs.launchpad.net/openlp/+bug/825152

For more details, see:
https://code.launchpad.net/~smpettit/openlp/ftw/+merge/73134

Bug #825152

Added code to reload Bible list after first time wizard is rerun.

appStartup in bibleplugin is invoked to check if any Bibles need converted. 
-- 
https://code.launchpad.net/~smpettit/openlp/ftw/+merge/73134
Your team OpenLP Core is requested to review the proposed merge of lp:~smpettit/openlp/ftw into lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2011-08-20 19:36:51 +0000
+++ openlp/core/ui/mainwindow.py	2011-08-27 11:58:19 +0000
@@ -767,6 +767,9 @@
             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):
         """

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2011-07-23 21:29:24 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2011-08-27 11:58:19 +0000
@@ -29,7 +29,8 @@
 
 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 @@
         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):
         """

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2011-08-15 09:30:36 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2011-08-27 11:58:19 +0000
@@ -391,10 +391,13 @@
         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):