r13809 - /branches/gui_testing/gui/user_functions/pipe.py -- July 21, 2011 - 16:21

Author: bugman
Date: Thu Jul 21 16:21:48 2011
New Revision: 13809

URL: http://svn.gna.org/viewcvs/relax?rev=13809&view=rev
Log:
The pipe.hybridise user function window now uses the new Combo_list GUI 
element for pipe selection.


Modified:
    branches/gui_testing/gui/user_functions/pipe.py

Modified: branches/gui_testing/gui/user_functions/pipe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/pipe.py?rev=13809&r1=13808&r2=13809&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/pipe.py (original)
+++ branches/gui_testing/gui/user_functions/pipe.py Thu Jul 21 16:21:48 2011
@@ -31,7 +31,8 @@
 
 # GUI module imports.
 from base import UF_base, UF_page
-from gui.misc import gui_to_str
+from gui.misc import gui_to_list, gui_to_str
+from gui.components.combo_list import Combo_list
 from gui.paths import WIZARD_IMAGE_PATH
 from gui.wizard import Wiz_window
 
@@ -90,7 +91,7 @@
         """
 
         # Execute the wizard.
-        wizard = Wiz_window(size_x=800, size_y=500, 
title=self.get_title('pipe', 'hybridise'))
+        wizard = Wiz_window(size_x=800, size_y=800, 
title=self.get_title('pipe', 'hybridise'))
         page = Hybridise_page(wizard, self.gui)
         wizard.add_page(page)
         wizard.run()
@@ -254,7 +255,7 @@
         self.hybrid = self.input_field(sizer, "The hybrid pipe name:", 
tooltip=self.uf._doc_args_dict['hybrid'])
 
         # The pipe selection.
-        self.pipes = self.combo_list(sizer, "The pipes to hybridise:", [[]], 
tooltip=self.uf._doc_args_dict['pipes'])
+        self.pipes = Combo_list(self, sizer, "The pipes to hybridise:", n=2, 
choices=pipe_names(), tooltip=self.uf._doc_args_dict['pipes'])
 
 
     def on_execute(self):