OpenLP

Merge lp:~raoul-snyman/openlp/bug-837319 into lp:openlp

  1. bug-837319
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 1739
Proposed branch: lp:~raoul-snyman/openlp/bug-837319
Merge into: lp:openlp
Diff against target: 41 lines (+6/-1)
1 file modified
openlp/core/ui/firsttimeform.py (+6/-1)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/bug-837319
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+74029@code.launchpad.net

Commit message

Added some openlp_process_events signals and move the hiding of the finish button higher up in the code.

Description of the change

Added some openlp_process_events signals and move the hiding of the finish button higher up in the code.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/firsttimeform.py'
2--- openlp/core/ui/firsttimeform.py 2011-08-03 13:19:43 +0000
3+++ openlp/core/ui/firsttimeform.py 2011-09-04 21:05:23 +0000
4@@ -135,6 +135,7 @@
5 """
6 Determine the next page in the Wizard to go to.
7 """
8+ Receiver.send_message(u'openlp_process_events')
9 if self.currentId() == FirstTimePage.Plugins:
10 if not self.webAccess:
11 return FirstTimePage.NoInternet
12@@ -175,9 +176,12 @@
13 elif pageId == FirstTimePage.Progress:
14 Receiver.send_message(u'cursor_busy')
15 self._preWizard()
16+ Receiver.send_message(u'openlp_process_events')
17 self._performWizard()
18+ Receiver.send_message(u'openlp_process_events')
19 self._postWizard()
20 Receiver.send_message(u'cursor_normal')
21+ Receiver.send_message(u'openlp_process_events')
22
23 def updateScreenListCombo(self):
24 """
25@@ -219,6 +223,8 @@
26 Prepare the UI for the process.
27 """
28 self.max_progress = 0
29+ self.finishButton.setVisible(False)
30+ Receiver.send_message(u'openlp_process_events')
31 # Loop through the songs list and increase for each selected item
32 for i in xrange(self.songsListWidget.count()):
33 item = self.songsListWidget.item(i)
34@@ -242,7 +248,6 @@
35 filename = item.data(QtCore.Qt.UserRole).toString()
36 size = self._getFileSize(u'%s%s' % (self.web, filename))
37 self.max_progress += size
38- self.finishButton.setVisible(False)
39 if self.max_progress:
40 # Add on 2 for plugins status setting plus a "finished" point.
41 self.max_progress = self.max_progress + 2