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

Post merge fixups: Fix a typo in wizard.py, correct some camelCase -> under_score.

Browse Source
This commit is contained in:
Patrick Zimmermann 2013-04-06 13:53:00 +02:00
parent 974e238850
commit 97c6899a31
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/wizard.py
View File

@ -219,9 +219,9 @@ class OpenLPWizard(QtGui.QWizard):
self.performWizard() self.performWizard()
self.post_wizard() self.post_wizard()
else: else:
self.custom_cage_changed(pageId) self.custom_page_changed(pageId)
def custom_cage_changed(self, pageId): def custom_page_changed(self, pageId):
""" """
Called when changing to a page other than the progress page Called when changing to a page other than the progress page
""" """

18
openlp/plugins/songs/forms/duplicatesongremovalform.py
View File

@ -66,14 +66,14 @@ class DuplicateSongRemovalForm(OpenLPWizard):
OpenLPWizard.__init__(self, self.main_window, plugin, u'duplicateSongRemovalWizard', OpenLPWizard.__init__(self, self.main_window, plugin, u'duplicateSongRemovalWizard',
u':/wizards/wizard_duplicateremoval.bmp', False) u':/wizards/wizard_duplicateremoval.bmp', False)
def customSignals(self): def custom_signals(self):
""" """
Song wizard specific signals. Song wizard specific signals.
""" """
self.finishButton.clicked.connect(self.onWizardExit) self.finish_button.clicked.connect(self.on_wizard_exit)
self.cancelButton.clicked.connect(self.onWizardExit) self.cancel_button.clicked.connect(self.on_wizard_exit)
def addCustomPages(self): def add_custom_pages(self):
""" """
Add song wizard specific pages. Add song wizard specific pages.
""" """
@ -119,9 +119,9 @@ class DuplicateSongRemovalForm(OpenLPWizard):
Song wizard localisation. Song wizard localisation.
""" """
self.setWindowTitle(translate(u'Wizard', u'Wizard')) self.setWindowTitle(translate(u'Wizard', u'Wizard'))
self.titleLabel.setText(WizardStrings.HeaderStyle % translate(u'OpenLP.Ui', self.title_label.setText(WizardStrings.HeaderStyle % translate(u'OpenLP.Ui',
u'Welcome to the Duplicate Song Removal Wizard')) u'Welcome to the Duplicate Song Removal Wizard'))
self.informationLabel.setText(translate("Wizard", self.information_label.setText(translate("Wizard",
u'This wizard will help you to remove duplicate songs from the song database. You will have a chance to ' u'This wizard will help you to remove duplicate songs from the song database. You will have a chance to '
u'review every potential duplicate song before it is deleted. So no songs will be deleted without your ' u'review every potential duplicate song before it is deleted. So no songs will be deleted without your '
u'explicit approval.')) u'explicit approval.'))
@ -138,7 +138,7 @@ class DuplicateSongRemovalForm(OpenLPWizard):
self.review_page.setTitle(translate(u'Wizard', u'Review duplicate songs (%s/%s)') % \ self.review_page.setTitle(translate(u'Wizard', u'Review duplicate songs (%s/%s)') % \
(self.review_current_count, self.review_total_count)) (self.review_current_count, self.review_total_count))
def customPageChanged(self, page_id): def custom_page_changed(self, page_id):
""" """
Called when changing the wizard page. Called when changing the wizard page.
@ -227,12 +227,12 @@ class DuplicateSongRemovalForm(OpenLPWizard):
duplicate_added = True duplicate_added = True
return duplicate_added return duplicate_added
def onWizardExit(self): def on_wizard_exit(self):
""" """
Once the wizard is finished, refresh the song list, Once the wizard is finished, refresh the song list,
since we potentially removed songs from it. since we potentially removed songs from it.
""" """
self.plugin.mediaItem.onSearchTextButtonClicked() self.plugin.media_item.on_search_text_button_clicked()
def setDefaults(self): def setDefaults(self):
""" """