r17221 - in /trunk/gui: pipe_editor.py relax_gui.py -- July 10, 2012 - 12:26

Author: bugman
Date: Tue Jul 10 12:26:41 2012
New Revision: 17221

URL: http://svn.gna.org/viewcvs/relax?rev=17221&view=rev
Log:
Bug fix for the pipe editor window hiding and restoring.

All of the Pipe_editor.Show() method has been shifted into the GUI 
show_pipe_editor() method.  This
is needed for the technique of unregistering with the observer objects when 
the window is closed via
a Hide() call.


Modified:
    trunk/gui/pipe_editor.py
    trunk/gui/relax_gui.py

Modified: trunk/gui/pipe_editor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/pipe_editor.py?rev=17221&r1=17220&r2=17221&view=diff
==============================================================================
--- trunk/gui/pipe_editor.py (original)
+++ trunk/gui/pipe_editor.py Tue Jul 10 12:26:41 2012
@@ -107,22 +107,6 @@
         self.update_grid()
 
 
-    def Show(self, show=True):
-        """Change the behaviour of showing the window to update the content.
-
-        @keyword show:  A flag which is True shows the window.
-        @type show:     bool
-        """
-
-        # Update the grid.
-        self.update_grid()
-        self.activate()
-
-        # Show the window using the base class method.
-        if status.show_gui:
-            super(Pipe_editor, self).Show(show)
-
-
     def activate(self):
         """Activate or deactivate certain elements in response to the 
execution lock."""
 

Modified: trunk/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/relax_gui.py?rev=17221&r1=17220&r2=17221&view=diff
==============================================================================
--- trunk/gui/relax_gui.py (original)
+++ trunk/gui/relax_gui.py Tue Jul 10 12:26:41 2012
@@ -664,6 +664,10 @@
         if status.show_gui and not self.pipe_editor.IsShown():
             self.pipe_editor.Show()
 
+        # Update the grid.
+        self.pipe_editor.update_grid()
+        self.pipe_editor.activate()
+
         # Register the grid for updating when a user function completes or 
when the GUI analysis tabs change (needed here for the window hiding and 
associated unregistering).
         self.pipe_editor.observer_setup(register=True)