← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~raoul-snyman/openlp/wizard into lp:openlp

 

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/wizard into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/wizard/+merge/53088

Last few bugs and tweaks fixed.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/wizard/+merge/53088
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/wizard into lp:openlp.
=== modified file 'openlp.pyw'
--- openlp.pyw	2011-03-11 16:36:34 +0000
+++ openlp.pyw	2011-03-11 20:55:51 +0000
@@ -186,7 +186,7 @@
         # start the main app window
         self.appClipboard = self.clipboard()
         self.mainWindow = MainWindow(screens, app_version, self.appClipboard,
-            has_run_wizard)
+            not has_run_wizard)
         self.mainWindow.show()
         if show_splash:
             # now kill the splashscreen

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2011-03-11 16:36:34 +0000
+++ openlp/core/ui/firsttimeform.py	2011-03-11 20:55:51 +0000
@@ -178,8 +178,8 @@
         """
         Prepare the UI for the process.
         """
-        # We start on 9 for the 9 plugins
-        max_progress = 9
+        # We start on 2 for plugins status setting plus a "finished" point.
+        max_progress = 2
         # Loop through the songs list and increase for each selected item
         for i in xrange(self.songsListWidget.count()):
             if self.songsListWidget.item(i).checkState() == QtCore.Qt.Checked:
@@ -209,6 +209,8 @@
         self.finishButton.setEnabled(True)
         self.cancelButton.setVisible(False)
         self.nextButton.setVisible(False)
+        self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+            'Download complete. Click the finish button to start OpenLP.'))
         Receiver.send_message(u'openlp_process_events')
 
     def _performWizard(self):
@@ -219,21 +221,13 @@
         self._incrementProgressBar(translate('OpenLP.FirstTimeWizard',
             'Enabling selected plugins...'))
         self._setPluginStatus(self.songsCheckBox, u'songs/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.bibleCheckBox, u'bibles/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.presentationCheckBox, u'presentations/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.imageCheckBox, u'images/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.mediaCheckBox, u'media/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.remoteCheckBox, u'remotes/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.customCheckBox, u'custom/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.songUsageCheckBox, u'songusage/status')
-        self._incrementProgressBar(None)
         self._setPluginStatus(self.alertCheckBox, u'alerts/status')
         # Build directories for downloads
         songs_destination = AppLocation.get_section_data_path(u'songs')


Follow ups