openlp-core team mailing list archive

[mohij <patrick@xxxxxxxxx>]

mohij has proposed merging lp:~patrick-zakweb/openlp/pre-wizard-rename-bug into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~patrick-zakweb/openlp/pre-wizard-rename-bug/+merge/160973

Correct the naming of preWizard -> pre_wizard resulting in the method not being called anymore.
Seems to have been slipped through an a previous rename frenzy.
-- 
https://code.launchpad.net/~patrick-zakweb/openlp/pre-wizard-rename-bug/+merge/160973
Your team OpenLP Core is requested to review the proposed merge of lp:~patrick-zakweb/openlp/pre-wizard-rename-bug into lp:openlp.

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2013-04-23 21:47:02 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2013-04-25 18:08:27 +0000
@@ -511,7 +511,7 @@
             name = bible[u'abbreviation']
             self.web_bible_list[download_type][version] = name.strip()
 
-    def preWizard(self):
+    def pre_wizard(self):
         """
         Prepare the UI for the import.
         """

=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py	2013-04-18 17:45:14 +0000
+++ openlp/plugins/bibles/forms/bibleupgradeform.py	2013-04-25 18:08:27 +0000
@@ -105,7 +105,7 @@
         Perform necessary functions depending on which wizard page is active.
         """
         if self.page(pageId) == self.progress_page:
-            self.preWizard()
+            self.pre_wizard()
             self.performWizard()
             self.post_wizard()
         elif self.page(pageId) == self.selectPage and not self.files:
@@ -329,7 +329,7 @@
         self.cancel_button.setVisible(True)
         settings.endGroup()
 
-    def preWizard(self):
+    def pre_wizard(self):
         """
         Prepare the UI for the upgrade.
         """

=== modified file 'openlp/plugins/songs/forms/songexportform.py'
--- openlp/plugins/songs/forms/songexportform.py	2013-03-31 10:31:54 +0000
+++ openlp/plugins/songs/forms/songexportform.py	2013-04-25 18:08:27 +0000
@@ -235,7 +235,7 @@
             self.availableListWidget.addItem(item)
         self.application.set_normal_cursor()
 
-    def preWizard(self):
+    def pre_wizard(self):
         """
         Perform pre export tasks.
         """

=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py	2013-03-19 19:43:22 +0000
+++ openlp/plugins/songs/forms/songimportform.py	2013-04-25 18:08:27 +0000
@@ -325,7 +325,7 @@
         self.error_copy_to_button.setHidden(True)
         self.error_save_to_button.setHidden(True)
 
-    def preWizard(self):
+    def pre_wizard(self):
         """
         Perform pre import tasks
         """