raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.

Browse Source 
Fixes: https://launchpad.net/bugs/1194622
This commit is contained in:
Tomas Groth 2014-11-11 14:58:03 +01:00
parent a8bd5f1996
commit 75960ac8da
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openlp/core/ui/firsttimeform.py
View File

@ -90,6 +90,21 @@ class FirstTimeForm(QtGui.QWizard, UiFirstTimeWizard, RegistryProperties):
super(FirstTimeForm, self).__init__(parent) super(FirstTimeForm, self).__init__(parent)
self.setup_ui(self) self.setup_ui(self)
def get_next_page_id(self):
"""
Returns the id of the next FirstTimePage to go to based on enabled plugins
"""
# The songs plugin is enabled
if FirstTimePage.Welcome < self.currentId() < FirstTimePage.Songs and self.songs_check_box.isChecked():
return FirstTimePage.Songs
# The Bibles plugin is enabled
elif FirstTimePage.Welcome < self.currentId() < FirstTimePage.Bibles and self.bible_check_box.isChecked():
return FirstTimePage.Bibles
elif FirstTimePage.Welcome < self.currentId() < FirstTimePage.Themes:
return FirstTimePage.Themes
else:
return self.currentId() + 1
def nextId(self): def nextId(self):
""" """
Determine the next page in the Wizard to go to. Determine the next page in the Wizard to go to.
@ -99,7 +114,7 @@ class FirstTimeForm(QtGui.QWizard, UiFirstTimeWizard, RegistryProperties):
if not self.web_access: if not self.web_access:
return FirstTimePage.NoInternet return FirstTimePage.NoInternet
else: else:
return FirstTimePage.Songs return self.get_next_page_id()
elif self.currentId() == FirstTimePage.Progress: elif self.currentId() == FirstTimePage.Progress:
return -1 return -1
elif self.currentId() == FirstTimePage.NoInternet: elif self.currentId() == FirstTimePage.NoInternet:
@ -114,7 +129,7 @@ class FirstTimeForm(QtGui.QWizard, UiFirstTimeWizard, RegistryProperties):
self.application.set_normal_cursor() self.application.set_normal_cursor()
return FirstTimePage.Defaults return FirstTimePage.Defaults
else: else:
return self.currentId() + 1 return self.get_next_page_id()
def exec_(self): def exec_(self):
""" """