diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index b1aedbe65..4ea5209c8 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -85,7 +85,7 @@ class BibleImportForm(OpenLPWizard): """ Set up the UI for the bible wizard. """ - OpenLPWizard.setupUi(self, image) + super(BibleImportForm, self).setupUi(image) self.formatComboBox.currentIndexChanged.connect(self.onCurrentIndexChanged) def onCurrentIndexChanged(self, index): @@ -516,7 +516,7 @@ class BibleImportForm(OpenLPWizard): """ Prepare the UI for the import. """ - OpenLPWizard.pre_wizard(self) + super(BibleImportForm, self).pre_wizard() bible_type = self.field(u'source_format') if bible_type == BibleFormat.WebDownload: self.progress_label.setText(translate('BiblesPlugin.ImportWizardForm', 'Registering Bible...')) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index b2f0f470b..070f73689 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -82,7 +82,7 @@ class BibleUpgradeForm(OpenLPWizard): """ 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) def stop_import(self): @@ -334,7 +334,7 @@ class BibleUpgradeForm(OpenLPWizard): """ 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.application.process_events() @@ -560,4 +560,4 @@ class BibleUpgradeForm(OpenLPWizard): self.progress_label.setText(translate('BiblesPlugin.UpgradeWizardForm', 'Upgrade failed.')) # Remove temp directory. shutil.rmtree(self.temp_dir, True) - OpenLPWizard.post_wizard(self) + super(BibleUpgradeForm, self).post_wizard() diff --git a/openlp/plugins/songs/forms/duplicatesongremovalform.py b/openlp/plugins/songs/forms/duplicatesongremovalform.py index 424e913b1..428764941 100644 --- a/openlp/plugins/songs/forms/duplicatesongremovalform.py +++ b/openlp/plugins/songs/forms/duplicatesongremovalform.py @@ -67,8 +67,8 @@ class DuplicateSongRemovalForm(OpenLPWizard): self.review_total_count = 0 # Used to interrupt ongoing searches when cancel is clicked. self.break_search = False - OpenLPWizard.__init__(self, Registry().get('main_window'), plugin, u'duplicateSongRemovalWizard', - u':/wizards/wizard_duplicateremoval.bmp', False) + super(DuplicateSongRemovalForm, self).__init__(Registry().get('main_window'), + plugin, u'duplicateSongRemovalWizard', u':/wizards/wizard_duplicateremoval.bmp', False) self.setMinimumWidth(730) def custom_signals(self): @@ -269,7 +269,7 @@ class DuplicateSongRemovalForm(OpenLPWizard): else: self.proceed_to_next_review() return False - return OpenLPWizard.validateCurrentPage(self) + return super(DuplicateSongRemovalForm, self).validateCurrentPage() def remove_button_clicked(self, song_review_widget): """ diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index 41e0b86f9..7f30c9abc 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -75,7 +75,7 @@ class SongExportForm(OpenLPWizard): """ Set up the song wizard UI. """ - OpenLPWizard.setupUi(self, image) + super(SongExportForm, self).setupUi(image) def custom_signals(self): """ @@ -239,7 +239,7 @@ class SongExportForm(OpenLPWizard): """ Perform pre export tasks. """ - OpenLPWizard.pre_wizard(self) + super(SongExportForm, self).pre_wizard() self.progress_label.setText(translate('SongsPlugin.ExportWizardForm', 'Starting export...')) self.application.process_events() diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index bcf86ceba..955b35096 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -60,7 +60,7 @@ class SongImportForm(OpenLPWizard): ``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 def setupUi(self, image): @@ -68,7 +68,7 @@ class SongImportForm(OpenLPWizard): Set up the song wizard UI. """ 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.format_stack.setCurrentIndex(self.current_format) self.format_combo_box.currentIndexChanged.connect(self.onCurrentIndexChanged) @@ -329,7 +329,7 @@ class SongImportForm(OpenLPWizard): """ Perform pre import tasks """ - OpenLPWizard.pre_wizard(self) + super(SongImportForm, self).pre_wizard() self.progress_label.setText(WizardStrings.StartingImport) self.application.process_events()