r14304 - in /branches/gui_testing/gui: menu.py user_functions/__init__.py -- August 09, 2011 - 22:27

Author: bugman
Date: Tue Aug  9 22:27:49 2011
New Revision: 14304

URL: http://svn.gna.org/viewcvs/relax?rev=14304&view=rev
Log:
Implemented all of the molmol user function pages and menu entries.

These include:
    molmol.clear_history
    molmol.command
    molmol.macro_exec
    molmol.ribbon
    molmol.tensor_pdb
    molmol.view
    molmol.write


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=14304&r1=14303&r2=14304&view=diff
==============================================================================
--- branches/gui_testing/gui/menu.py (original)
+++ branches/gui_testing/gui/menu.py Tue Aug  9 22:27:49 2011
@@ -203,6 +203,15 @@
                 [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(), "&molmol", paths.icon_16x16.molmol, None, [
+                [wx.NewId(), "clear_&history", None, 
self.gui.user_functions.molmol.clear_history],
+                [wx.NewId(), "&command", None, 
self.gui.user_functions.molmol.command],
+                [wx.NewId(), "&macro_exec", paths.icon_16x16.molmol, 
self.gui.user_functions.molmol.macro_exec],
+                [wx.NewId(), "&ribbon", None, 
self.gui.user_functions.molmol.ribbon],
+                [wx.NewId(), "&tensor_pdb", None, 
self.gui.user_functions.molmol.tensor_pdb],
+                [wx.NewId(), "&view", None, 
self.gui.user_functions.molmol.view],
+                [wx.NewId(), "&write", paths.icon_16x16.save, 
self.gui.user_functions.molmol.write]
+            ]],
             [wx.NewId(), "&noe", None, None, [
                 [wx.NewId(), "&read_restraints", paths.icon_16x16.open, 
self.gui.user_functions.noe.read_restraints],
                 [wx.NewId(), "&spectrum_type",   None, 
self.gui.user_functions.noe.spectrum_type]

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=14304&r1=14303&r2=14304&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/__init__.py (original)
+++ branches/gui_testing/gui/user_functions/__init__.py Tue Aug  9 22:27:49 
2011
@@ -31,6 +31,7 @@
 from gpl import Gpl
 from grace import Grace
 from molecule import Molecule
+from molmol import Molmol
 from noe import Noe
 from pipe import Pipe
 from residue import Residue
@@ -51,6 +52,7 @@
            'gpl',
            'grace',
            'molecule',
+           'molmol',
            'noe',
            'pipe',
            'residue',
@@ -82,6 +84,7 @@
         self.gpl = Gpl(self.gui)
         self.grace = Grace(self.gui)
         self.molecule = Molecule(self.gui)
+        self.molmol = Molmol(self.gui)
         self.noe = Noe(self.gui)
         self.pipe = Pipe(self.gui)
         self.residue = Residue(self.gui)
@@ -104,6 +107,7 @@
         self.gpl.destroy()
         self.grace.destroy()
         self.molecule.destroy()
+        self.molmol.destroy()
         self.noe.destroy()
         self.pipe.destroy()
         self.residue.destroy()