r16008 - /branches/uf_redesign/gui/pipe_editor.py -- May 05, 2012 - 22:04

Author: bugman
Date: Sat May  5 22:04:23 2012
New Revision: 16008

URL: http://svn.gna.org/viewcvs/relax?rev=16008&view=rev
Log:
The pipe editor window now uses the auto-generated pipe user function GUI 
objects.


Modified:
    branches/uf_redesign/gui/pipe_editor.py

Modified: branches/uf_redesign/gui/pipe_editor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/pipe_editor.py?rev=16008&r1=16007&r2=16008&view=diff
==============================================================================
--- branches/uf_redesign/gui/pipe_editor.py (original)
+++ branches/uf_redesign/gui/pipe_editor.py Sat May  5 22:04:23 2012
@@ -38,7 +38,7 @@
 from gui.message import Question
 from gui.misc import add_border, gui_to_str, str_to_gui
 from gui.paths import icon_16x16, icon_22x22, WIZARD_IMAGE_PATH
-from gui.uf_pages import User_functions
+from gui.uf_objects import Uf_storage
 
 
 class Pipe_editor(wx.Frame):
@@ -63,9 +63,6 @@
 
         # Create GUI elements
         wx.Frame.__init__(self, None, id=-1, title="Data pipe editor")
-
-        # Initialise the user functions.
-        self.user_functions = User_functions(self)
 
         # Set up the window icon.
         self.SetIcons(relax_icons)
@@ -257,17 +254,20 @@
         @type event:    wx event
         """
 
+        # The user function storage singleton.
+        store = Uf_storage()
+
         # Launch the respective user functions.
         if event.GetEventObject() == self.button_create:
-            self.user_functions.pipe.create()
+            store['pipe.create'](event)
         elif event.GetEventObject() == self.button_copy:
-            self.user_functions.pipe.copy()
+            store['pipe.copy'](event)
         elif event.GetEventObject() == self.button_delete:
-            self.user_functions.pipe.delete()
+            store['pipe.delete'](event)
         elif event.GetEventObject() == self.button_hybrid:
-            self.user_functions.pipe.hybrid()
+            store['pipe.hybridise'](event)
         elif event.GetEventObject() == self.button_switch:
-            self.user_functions.pipe.switch()
+            store['pipe.switch'](event)
 
 
     def add_logo(self, box):