r13609 - /branches/gui_testing/gui/wizard.py -- July 14, 2011 - 11:02

Author: bugman
Date: Thu Jul 14 11:02:58 2011
New Revision: 13609

URL: http://svn.gna.org/viewcvs/relax?rev=13609&view=rev
Log:
The default wizard behaviour is now to run on_execute() when next is clicked.


Modified:
    branches/gui_testing/gui/wizard.py

Modified: branches/gui_testing/gui/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/wizard.py?rev=13609&r1=13608&r2=13609&view=diff
==============================================================================
--- branches/gui_testing/gui/wizard.py (original)
+++ branches/gui_testing/gui/wizard.py Thu Jul 14 11:02:58 2011
@@ -950,6 +950,7 @@
         self._page_sizers = []
         self._button_sizers = []
         self._button_apply_flag = []
+        self._exec_on_next = []
         self._buttons = []
         self._button_ids = []
 
@@ -966,6 +967,9 @@
 
             # Set all apply flags to True.
             self._button_apply_flag.append(True)
+
+            # Execute on next by default.
+            self._exec_on_next.append(True)
 
             # Initialise the button storage.
             self._buttons.append({'back': None,
@@ -1121,6 +1125,10 @@
         # Execute the page's on_next() method.
         self._pages[self._current_page].on_next()
 
+        # Execute the page's on_execute() method.
+        if self._exec_on_next[self._current_page]:
+            self._pages[self._current_page].on_execute()
+
         # Change the current page.
         self._current_page += 1
 
@@ -1144,13 +1152,15 @@
         self.Destroy()
 
 
-    def add_page(self, panel, apply_button=True):
+    def add_page(self, panel, apply_button=True, exec_on_next=True):
         """Add a new page to the wizard.
 
         @param panel:           The page to add to the wizard.
         @type panel:            wx.Panel instance
         @keyword apply_button:  A flag which if true will show the apply 
button for that page.
         @type apply_button:     bool
+        @keyword exec_on_next:  A flag which if true will run the 
on_execute() method when clicking on the next button.
+        @type exec_on_next:     bool
         """
 
         # Store the page.
@@ -1171,8 +1181,9 @@
         # Add the sizer for the wizard buttons.
         self._page_sizers[index].Add(self._button_sizers[index], 0, 
wx.ALIGN_RIGHT|wx.ALL, 0)
 
-        # Store the apply button flag.
+        # Store the flags.
         self._button_apply_flag[index] = apply_button
+        self._exec_on_next[index] = exec_on_next
 
         # Store the index of the page.
         panel.page_index = self._num_pages - 1