openlp-core team mailing list archive

[Stevan Pettit <smpettit@xxxxxxxxxxxxxxx>]

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

Requested reviews:
  Raoul Snyman (raoul-snyman)
  Andreas Preikschat (googol)
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/73229

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.

Changed signal name

Removed need for signal
-- 
https://code.launchpad.net/~smpettit/openlp/ftw/+merge/73229
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2011-08-29 06:30:31 +0000
+++ openlp/core/ui/mainwindow.py	2011-08-29 13:05:26 +0000
@@ -791,6 +791,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/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2011-08-15 09:30:36 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2011-08-29 13:05:26 +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:
+            self.plugin.appStartup()
         self.updateAutoCompleter()
 
     def initialiseAdvancedBible(self, bible):