Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-837319 into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #837319 in OpenLP: ""Finish" button in First Time Wizard shows up "momentarily"" https://bugs.launchpad.net/openlp/+bug/837319 For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/bug-837319/+merge/74029 Added some openlp_process_events signals and move the hiding of the finish button higher up in the code. -- https://code.launchpad.net/~raoul-snyman/openlp/bug-837319/+merge/74029 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-837319 into lp:openlp.
=== modified file 'openlp/core/ui/firsttimeform.py' --- openlp/core/ui/firsttimeform.py 2011-08-03 13:19:43 +0000 +++ openlp/core/ui/firsttimeform.py 2011-09-04 21:05:23 +0000 @@ -135,6 +135,7 @@ """ Determine the next page in the Wizard to go to. """ + Receiver.send_message(u'openlp_process_events') if self.currentId() == FirstTimePage.Plugins: if not self.webAccess: return FirstTimePage.NoInternet @@ -175,9 +176,12 @@ elif pageId == FirstTimePage.Progress: Receiver.send_message(u'cursor_busy') self._preWizard() + Receiver.send_message(u'openlp_process_events') self._performWizard() + Receiver.send_message(u'openlp_process_events') self._postWizard() Receiver.send_message(u'cursor_normal') + Receiver.send_message(u'openlp_process_events') def updateScreenListCombo(self): """ @@ -219,6 +223,8 @@ Prepare the UI for the process. """ self.max_progress = 0 + self.finishButton.setVisible(False) + Receiver.send_message(u'openlp_process_events') # Loop through the songs list and increase for each selected item for i in xrange(self.songsListWidget.count()): item = self.songsListWidget.item(i) @@ -242,7 +248,6 @@ filename = item.data(QtCore.Qt.UserRole).toString() size = self._getFileSize(u'%s%s' % (self.web, filename)) self.max_progress += size - self.finishButton.setVisible(False) if self.max_progress: # Add on 2 for plugins status setting plus a "finished" point. self.max_progress = self.max_progress + 2
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp