Andreas Preikschat has proposed merging lp:~googol-hush/openlp/fixes2 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/fixes2/+merge/58138
Hello,
- fixed bug #763309
Details:
1) Do not hide the next button on the NoInternet page (and don't show the
finish button)
2) When we are on the NoInternet page, we ensure, that the next page is the
progress page
--
https://code.launchpad.net/~googol-hush/openlp/fixes2/+merge/58138
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/fixes2 into lp:openlp.
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2011-03-24 19:04:02 +0000
+++ openlp/core/ui/firsttimeform.py 2011-04-18 15:09:36 +0000
@@ -140,6 +140,8 @@
return FirstTimePage.Songs
elif self.currentId() == FirstTimePage.Progress:
return -1
+ elif self.currentId() == FirstTimePage.NoInternet:
+ return FirstTimePage.Progress
else:
return self.currentId() + 1
@@ -147,11 +149,7 @@
"""
Detects Page changes and updates as approprate.
"""
- if pageId == FirstTimePage.NoInternet:
- self.finishButton.setVisible(True)
- self.finishButton.setEnabled(True)
- self.nextButton.setVisible(False)
- elif pageId == FirstTimePage.Defaults:
+ if pageId == FirstTimePage.Defaults:
self.themeComboBox.clear()
for iter in xrange(self.themesListWidget.count()):
item = self.themesListWidget.item(iter)
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
