r16151 - in /branches/uf_redesign/gui: uf_objects.py wizard.py -- May 09, 2012 - 15:14

Author: bugman
Date: Wed May  9 15:14:45 2012
New Revision: 16151

URL: http://svn.gna.org/viewcvs/relax?rev=16151&view=rev
Log:
The failure of the user function page on_display() method now prevents the 
wizard from being displayed.


Modified:
    branches/uf_redesign/gui/uf_objects.py
    branches/uf_redesign/gui/wizard.py

Modified: branches/uf_redesign/gui/uf_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16151&r1=16150&r2=16151&view=diff
==============================================================================
--- branches/uf_redesign/gui/uf_objects.py (original)
+++ branches/uf_redesign/gui/uf_objects.py Wed May  9 15:14:45 2012
@@ -431,6 +431,9 @@
 
             # Catch all RelaxErrors.
             except AllRelaxErrors, instance:
+                # Signal the failure to the wizard.
+                self.setup_fail = True
+
                 # Display a dialog with the error.
                 gui_raise(instance)
 

Modified: branches/uf_redesign/gui/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/wizard.py?rev=16151&r1=16150&r2=16151&view=diff
==============================================================================
--- branches/uf_redesign/gui/wizard.py (original)
+++ branches/uf_redesign/gui/wizard.py Wed May  9 15:14:45 2012
@@ -1890,6 +1890,10 @@
         # Display the first page.
         self._display_page(0)
 
+        # Display failure.
+        if self._pages[0].setup_fail:
+            return
+
         # No GUI.
         if not status.show_gui:
             return