This commit is contained in:
Andreas Preikschat 2013-05-11 19:28:42 +02:00
parent 0122ac64f2
commit 23d5df568b
2 changed files with 11 additions and 12 deletions

View File

@ -76,8 +76,7 @@ class ThemeScreenshotThread(QtCore.QThread):
class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
""" """
This is the Theme Import Wizard, which allows easy creation and editing of This is the Theme Import Wizard, which allows easy creation and editing of OpenLP themes.
OpenLP themes.
""" """
log.info(u'ThemeWizardForm loaded') log.info(u'ThemeWizardForm loaded')
@ -99,9 +98,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.was_download_cancelled = False self.was_download_cancelled = False
self.theme_screenshot_thread = None self.theme_screenshot_thread = None
self.downloading = translate('OpenLP.FirstTimeWizard', 'Downloading %s...') self.downloading = translate('OpenLP.FirstTimeWizard', 'Downloading %s...')
self.cancelButton.clicked.connect(self.onCancelButtonClicked) self.cancel_button.clicked.connect(self.onCancelButtonClicked)
self.noInternetFinishButton.clicked.connect(self.onNoInternetFinishButtonClicked) self.no_internet_finish_button.clicked.connect(self.onNoInternetFinishButtonClicked)
self.currentIdChanged.connect(self.onCurrentIdChanged) self.currentIdChanged.connect(self.on_current_id_changed)
Registry().register_function(u'config_screen_changed', self.update_screen_list_combo) Registry().register_function(u'config_screen_changed', self.update_screen_list_combo)
def exec_(self): def exec_(self):
@ -117,7 +116,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
""" """
self.restart() self.restart()
check_directory_exists(os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp')) check_directory_exists(os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp'))
self.noInternetFinishButton.setVisible(False) self.no_internet_finish_button.setVisible(False)
# Check if this is a re-run of the wizard. # Check if this is a re-run of the wizard.
self.hasRunWizard = Settings().value(u'core/has run wizard') self.hasRunWizard = Settings().value(u'core/has run wizard')
# Sort out internet access for downloads # Sort out internet access for downloads
@ -177,7 +176,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
else: else:
return self.currentId() + 1 return self.currentId() + 1
def onCurrentIdChanged(self, pageId): def on_current_id_changed(self, pageId):
""" """
Detects Page changes and updates as appropriate. Detects Page changes and updates as appropriate.
""" """
@ -211,9 +210,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
elif pageId == FirstTimePage.NoInternet: elif pageId == FirstTimePage.NoInternet:
self.backButton.setVisible(False) self.backButton.setVisible(False)
self.nextButton.setVisible(False) self.nextButton.setVisible(False)
self.noInternetFinishButton.setVisible(True) self.no_internet_finish_button.setVisible(True)
if self.hasRunWizard: if self.hasRunWizard:
self.cancelButton.setVisible(False) self.cancel_button.setVisible(False)
elif pageId == FirstTimePage.Progress: elif pageId == FirstTimePage.Progress:
self.application.set_busy_cursor() self.application.set_busy_cursor()
self.repaint() self.repaint()
@ -404,7 +403,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
'Click the finish button to start OpenLP.')) 'Click the finish button to start OpenLP.'))
self.finishButton.setVisible(True) self.finishButton.setVisible(True)
self.finishButton.setEnabled(True) self.finishButton.setEnabled(True)
self.cancelButton.setVisible(False) self.cancel_button.setVisible(False)
self.nextButton.setVisible(False) self.nextButton.setVisible(False)
self.application.process_events() self.application.process_events()

View File

@ -66,8 +66,8 @@ class Ui_FirstTimeWizard(object):
FirstTimeWizard.setOptions(QtGui.QWizard.IndependentPages | QtGui.QWizard.NoBackButtonOnStartPage | FirstTimeWizard.setOptions(QtGui.QWizard.IndependentPages | QtGui.QWizard.NoBackButtonOnStartPage |
QtGui.QWizard.NoBackButtonOnLastPage | QtGui.QWizard.HaveCustomButton1) QtGui.QWizard.NoBackButtonOnLastPage | QtGui.QWizard.HaveCustomButton1)
self.finishButton = self.button(QtGui.QWizard.FinishButton) self.finishButton = self.button(QtGui.QWizard.FinishButton)
self.noInternetFinishButton = self.button(QtGui.QWizard.CustomButton1) self.no_internet_finish_button = self.button(QtGui.QWizard.CustomButton1)
self.cancelButton = self.button(QtGui.QWizard.CancelButton) self.cancel_button = self.button(QtGui.QWizard.CancelButton)
self.nextButton = self.button(QtGui.QWizard.NextButton) self.nextButton = self.button(QtGui.QWizard.NextButton)
self.backButton = self.button(QtGui.QWizard.BackButton) self.backButton = self.button(QtGui.QWizard.BackButton)
add_welcome_page(FirstTimeWizard, u':/wizards/wizard_firsttime.bmp') add_welcome_page(FirstTimeWizard, u':/wizards/wizard_firsttime.bmp')