r13137 - in /branches/gui_testing/gui: menu.py user_functions/__init__.py -- June 20, 2011 - 19:51

Author: bugman
Date: Mon Jun 20 19:51:28 2011
New Revision: 13137

URL: http://svn.gna.org/viewcvs/relax?rev=13137&view=rev
Log:
Reverted the temporary r13077.

The command used was:
svn merge -r13077:13076 .

.....
  r13077 | bugman | 2011-06-16 19:20:40 +0200 (Thu, 16 Jun 2011) | 5 lines
  Changed paths:
     M /branches/gui_testing/gui/menu.py
     M /branches/gui_testing/gui/user_functions/__init__.py
  
  Temporarily turned off all user functions, save value.set().
  
  This will be used to redesign all of the wizard and user function dialogs 
and panels.
.....


Modified:
    branches/gui_testing/gui/menu.py
    branches/gui_testing/gui/user_functions/__init__.py

Modified: branches/gui_testing/gui/menu.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/menu.py?rev=13137&r1=13136&r2=13137&view=diff
==============================================================================
--- branches/gui_testing/gui/menu.py (original)
+++ branches/gui_testing/gui/menu.py Mon Jun 20 19:51:28 2011
@@ -186,35 +186,35 @@
 
         # The list of entries to build.
         self.entries_uf = [
-            #[wx.NewId(), "&molecule", paths.icon_16x16.molecule, None, [
-            #    [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.molecule.copy],
-            #    [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.molecule.create],
-            #    [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.molecule.delete]
-            #]],
-            #[wx.NewId(), "&pipe", paths.icon_16x16.pipe, None, [
-            #    [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.pipes.copy],
-            #    [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.pipes.create],
-            #    [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.pipes.delete],
-            #    [wx.NewId(), "&switch", paths.icon_16x16.pipe_switch, 
self.gui.user_functions.pipes.switch]
-            #]],
-            #[wx.NewId(), "&relax_data", paths.icon_16x16.relax_data, None, [
-            #    [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.relax_data.delete],
-            #    [wx.NewId(), "&read",   paths.icon_16x16.open, 
self.gui.user_functions.relax_data.read]
-            #]],
-            #[wx.NewId(), "resid&ue", paths.icon_16x16.residue, None, [
-            #    [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.residue.copy],
-            #    [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.residue.create],
-            #    [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.residue.delete]
-            #]],
-            #[wx.NewId(), "s&cript",   paths.icon_16x16.uf_script, 
self.gui.user_functions.script.run, []],
-            #[wx.NewId(), "se&quence", paths.icon_16x16.sequence, None, [
-            #    [wx.NewId(), "&read", paths.icon_16x16.open, 
self.gui.user_functions.sequence.read]
-            #]],
-            #[wx.NewId(), "&spin", paths.icon_16x16.spin, None, [
-            #    [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.spin.copy],
-            #    [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.spin.create],
-            #    [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.spin.delete]
-            #]],
+            [wx.NewId(), "&molecule", paths.icon_16x16.molecule, None, [
+                [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.molecule.copy],
+                [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.molecule.create],
+                [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.molecule.delete]
+            ]],
+            [wx.NewId(), "&pipe", paths.icon_16x16.pipe, None, [
+                [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.pipes.copy],
+                [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.pipes.create],
+                [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.pipes.delete],
+                [wx.NewId(), "&switch", paths.icon_16x16.pipe_switch, 
self.gui.user_functions.pipes.switch]
+            ]],
+            [wx.NewId(), "&relax_data", paths.icon_16x16.relax_data, None, [
+                [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.relax_data.delete],
+                [wx.NewId(), "&read",   paths.icon_16x16.open, 
self.gui.user_functions.relax_data.read]
+            ]],
+            [wx.NewId(), "resid&ue", paths.icon_16x16.residue, None, [
+                [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.residue.copy],
+                [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.residue.create],
+                [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.residue.delete]
+            ]],
+            [wx.NewId(), "s&cript",   paths.icon_16x16.uf_script, 
self.gui.user_functions.script.run, []],
+            [wx.NewId(), "se&quence", paths.icon_16x16.sequence, None, [
+                [wx.NewId(), "&read", paths.icon_16x16.open, 
self.gui.user_functions.sequence.read]
+            ]],
+            [wx.NewId(), "&spin", paths.icon_16x16.spin, None, [
+                [wx.NewId(), "&copy",   paths.icon_16x16.copy, 
self.gui.user_functions.spin.copy],
+                [wx.NewId(), "crea&te", paths.icon_16x16.add, 
self.gui.user_functions.spin.create],
+                [wx.NewId(), "&delete", paths.icon_16x16.remove, 
self.gui.user_functions.spin.delete]
+            ]],
             [wx.NewId(), "&value", paths.icon_16x16.value, None, [
                 [wx.NewId(), "&set",   paths.icon_16x16.add, 
self.gui.user_functions.value.set]
             ]]

Modified: branches/gui_testing/gui/user_functions/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/__init__.py?rev=13137&r1=13136&r2=13137&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/__init__.py (original)
+++ branches/gui_testing/gui/user_functions/__init__.py Mon Jun 20 19:51:28 
2011
@@ -27,13 +27,13 @@
 from prompt.interpreter import Interpreter
 
 # GUI module imports.
-#from molecule import Molecule
-#from pipes import Pipes
-#from residue import Residue
-#from relax_data import Relax_data
-#from script import Script
-#from sequence import Sequence
-#from spin import Spin
+from molecule import Molecule
+from pipes import Pipes
+from residue import Residue
+from relax_data import Relax_data
+from script import Script
+from sequence import Sequence
+from spin import Spin
 from value import Value
 
 
@@ -64,13 +64,13 @@
         self.interpreter.on(verbose=False)
 
         # The user functions.
-        #self.molecule = Molecule(self.gui, self.interpreter)
-        #self.pipes = Pipes(self.gui, self.interpreter)
-        #self.residue = Residue(self.gui, self.interpreter)
-        #self.relax_data = Relax_data(self.gui, self.interpreter)
-        #self.script = Script(self.gui, self.interpreter)
-        #self.sequence = Sequence(self.gui, self.interpreter)
-        #self.spin = Spin(self.gui, self.interpreter)
+        self.molecule = Molecule(self.gui, self.interpreter)
+        self.pipes = Pipes(self.gui, self.interpreter)
+        self.residue = Residue(self.gui, self.interpreter)
+        self.relax_data = Relax_data(self.gui, self.interpreter)
+        self.script = Script(self.gui, self.interpreter)
+        self.sequence = Sequence(self.gui, self.interpreter)
+        self.spin = Spin(self.gui, self.interpreter)
         self.value = Value(self.gui, self.interpreter)
 
 
@@ -78,10 +78,10 @@
         """Close all windows."""
 
         # Send the commands onwards to the user function classes.
-        #self.molecule.destroy()
-        #self.pipes.destroy()
-        #self.residue.destroy()
-        #self.relax_data.destroy()
-        #self.sequence.destroy()
-        #self.spin.destroy()
+        self.molecule.destroy()
+        self.pipes.destroy()
+        self.residue.destroy()
+        self.relax_data.destroy()
+        self.sequence.destroy()
+        self.spin.destroy()
         self.value.destroy()