super calls

This commit is contained in:
Andreas Preikschat 2013-07-18 21:49:44 +02:00
parent e93a59e83a
commit 5fe64a1d39
5 changed files with 13 additions and 13 deletions

View File

@ -85,7 +85,7 @@ class BibleImportForm(OpenLPWizard):
""" """
Set up the UI for the bible wizard. Set up the UI for the bible wizard.
""" """
OpenLPWizard.setupUi(self, image) super(BibleImportForm, self).setupUi(image)
self.formatComboBox.currentIndexChanged.connect(self.onCurrentIndexChanged) self.formatComboBox.currentIndexChanged.connect(self.onCurrentIndexChanged)
def onCurrentIndexChanged(self, index): def onCurrentIndexChanged(self, index):
@ -516,7 +516,7 @@ class BibleImportForm(OpenLPWizard):
""" """
Prepare the UI for the import. Prepare the UI for the import.
""" """
OpenLPWizard.pre_wizard(self) super(BibleImportForm, self).pre_wizard()
bible_type = self.field(u'source_format') bible_type = self.field(u'source_format')
if bible_type == BibleFormat.WebDownload: if bible_type == BibleFormat.WebDownload:
self.progress_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Registering Bible...')) self.progress_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Registering Bible...'))

View File

@ -82,7 +82,7 @@ class BibleUpgradeForm(OpenLPWizard):
""" """
Set up the UI for the bible wizard. Set up the UI for the bible wizard.
""" """
OpenLPWizard.setupUi(self, image) super(BibleUpgradeForm, self).setupUi(image)
Registry().execute(u'openlp_stop_wizard', self.stop_import) Registry().execute(u'openlp_stop_wizard', self.stop_import)
def stop_import(self): def stop_import(self):
@ -334,7 +334,7 @@ class BibleUpgradeForm(OpenLPWizard):
""" """
Prepare the UI for the upgrade. Prepare the UI for the upgrade.
""" """
OpenLPWizard.pre_wizard(self) super(BibleUpgradeForm, self).pre_wizard()
self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Starting upgrade...')) self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Starting upgrade...'))
self.application.process_events() self.application.process_events()
@ -560,4 +560,4 @@ class BibleUpgradeForm(OpenLPWizard):
self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Upgrade failed.')) self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Upgrade failed.'))
# Remove temp directory. # Remove temp directory.
shutil.rmtree(self.temp_dir, True) shutil.rmtree(self.temp_dir, True)
OpenLPWizard.post_wizard(self) super(BibleUpgradeForm, self).post_wizard()

View File

@ -67,8 +67,8 @@ class DuplicateSongRemovalForm(OpenLPWizard):
self.review_total_count = 0 self.review_total_count = 0
# Used to interrupt ongoing searches when cancel is clicked. # Used to interrupt ongoing searches when cancel is clicked.
self.break_search = False self.break_search = False
OpenLPWizard.__init__(self, Registry().get('main_window'), plugin, u'duplicateSongRemovalWizard', super(DuplicateSongRemovalForm, self).__init__(Registry().get('main_window'),
u':/wizards/wizard_duplicateremoval.bmp', False) plugin, u'duplicateSongRemovalWizard', u':/wizards/wizard_duplicateremoval.bmp', False)
self.setMinimumWidth(730) self.setMinimumWidth(730)
def custom_signals(self): def custom_signals(self):
@ -269,7 +269,7 @@ class DuplicateSongRemovalForm(OpenLPWizard):
else: else:
self.proceed_to_next_review() self.proceed_to_next_review()
return False return False
return OpenLPWizard.validateCurrentPage(self) return super(DuplicateSongRemovalForm, self).validateCurrentPage()
def remove_button_clicked(self, song_review_widget): def remove_button_clicked(self, song_review_widget):
""" """

View File

@ -75,7 +75,7 @@ class SongExportForm(OpenLPWizard):
""" """
Set up the song wizard UI. Set up the song wizard UI.
""" """
OpenLPWizard.setupUi(self, image) super(SongExportForm, self).setupUi(image)
def custom_signals(self): def custom_signals(self):
""" """
@ -239,7 +239,7 @@ class SongExportForm(OpenLPWizard):
""" """
Perform pre export tasks. Perform pre export tasks.
""" """
OpenLPWizard.pre_wizard(self) super(SongExportForm, self).pre_wizard()
self.progress_label.setText(translate('SongsPlugin.ExportWizardForm', 'Starting export...')) self.progress_label.setText(translate('SongsPlugin.ExportWizardForm', 'Starting export...'))
self.application.process_events() self.application.process_events()

View File

@ -60,7 +60,7 @@ class SongImportForm(OpenLPWizard):
``plugin`` ``plugin``
The songs plugin. The songs plugin.
""" """
OpenLPWizard.__init__(self, parent, plugin, u'songImportWizard', u':/wizards/wizard_importsong.bmp') super(SongImportForm, self).__init__(parent, plugin, u'songImportWizard', u':/wizards/wizard_importsong.bmp')
self.clipboard = self.main_window.clipboard self.clipboard = self.main_window.clipboard
def setupUi(self, image): def setupUi(self, image):
@ -68,7 +68,7 @@ class SongImportForm(OpenLPWizard):
Set up the song wizard UI. Set up the song wizard UI.
""" """
self.format_widgets = dict([(song_format, {}) for song_format in SongFormat.get_format_list()]) self.format_widgets = dict([(song_format, {}) for song_format in SongFormat.get_format_list()])
OpenLPWizard.setupUi(self, image) super(SongImportForm, self).setupUi(image)
self.current_format = SongFormat.OpenLyrics self.current_format = SongFormat.OpenLyrics
self.format_stack.setCurrentIndex(self.current_format) self.format_stack.setCurrentIndex(self.current_format)
self.format_combo_box.currentIndexChanged.connect(self.onCurrentIndexChanged) self.format_combo_box.currentIndexChanged.connect(self.onCurrentIndexChanged)
@ -329,7 +329,7 @@ class SongImportForm(OpenLPWizard):
""" """
Perform pre import tasks Perform pre import tasks
""" """
OpenLPWizard.pre_wizard(self) super(SongImportForm, self).pre_wizard()
self.progress_label.setText(WizardStrings.StartingImport) self.progress_label.setText(WizardStrings.StartingImport)
self.application.process_events() self.application.process_events()