Author: bugman Date: Thu May 10 20:00:03 2012 New Revision: 16202 URL: http://svn.gna.org/viewcvs/relax?rev=16202&view=rev Log: The user function 'gui_sync' attribute is now passed all the way into the GUI uf objects. Modified: branches/uf_redesign/gui/relax_gui.py branches/uf_redesign/gui/uf_objects.py Modified: branches/uf_redesign/gui/relax_gui.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/relax_gui.py?rev=16202&r1=16201&r2=16202&view=diff ============================================================================== --- branches/uf_redesign/gui/relax_gui.py (original) +++ branches/uf_redesign/gui/relax_gui.py Thu May 10 20:00:03 2012 @@ -284,7 +284,7 @@ # Generate the user functions. for name, data in uf_info.uf_loop(): # Generate a new container. - obj = Uf_object(name, self, title=data.title, size=data.wizard_size, height_desc=data.wizard_height_desc, apply_button=data.wizard_apply_button) + obj = Uf_object(name, self, title=data.title, size=data.wizard_size, height_desc=data.wizard_height_desc, apply_button=data.wizard_apply_button, sync=data.gui_sync) # Store it. store[name] = obj Modified: branches/uf_redesign/gui/uf_objects.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16202&r1=16201&r2=16202&view=diff ============================================================================== --- branches/uf_redesign/gui/uf_objects.py (original) +++ branches/uf_redesign/gui/uf_objects.py Thu May 10 20:00:03 2012 @@ -57,7 +57,7 @@ wizard = Wiz_window(parent=self._parent, size_x=self._size[0], size_y=self._size[1], title=self._title) # Create the page. - page = Uf_page(self._name, parent=wizard, height_desc=self._height_desc) + page = Uf_page(self._name, parent=wizard, height_desc=self._height_desc, sync=self._sync) # Add the page to the wizard. wizard.add_page(page, apply_button=self._apply_button) @@ -66,7 +66,7 @@ wizard.run() - def __init__(self, name, parent, title=None, size=None, height_desc=None, apply_button=True): + def __init__(self, name, parent, title=None, size=None, height_desc=None, apply_button=True, sync=False): """Set up the object. @param name: The name of the user function. @@ -81,6 +81,8 @@ @type height_desc: int or None @keyword apply_button: A flag specifying if the apply button should be shown or not. This defaults to True. @type apply_button: bool + @keyword sync: A flag which if True will call user functions via interpreter.apply and if False via interpreter.queue. + @type sync: bool """ # Store the args. @@ -90,6 +92,7 @@ self._size = size self._height_desc = height_desc self._apply_button = apply_button + self._sync = sync