r16885 - in /branches/interatomic: ./ gui/input_elements/sequence.py gui/input_elements/sequence_2D.py -- June 12, 2012 - 17:57

Author: bugman
Date: Tue Jun 12 17:57:01 2012
New Revision: 16885

URL: http://svn.gna.org/viewcvs/relax?rev=16885&view=rev
Log:
Merged revisions 16884 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r16884 | bugman | 2012-06-12 17:56:04 +0200 (Tue, 12 Jun 2012) | 3 lines
  
  Bug fix for the Sequence GUI input element - the Sequence_list_ctrl class 
was in the wrong module!
........

Modified:
    branches/interatomic/   (props changed)
    branches/interatomic/gui/input_elements/sequence.py
    branches/interatomic/gui/input_elements/sequence_2D.py

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 12 17:57:01 2012
@@ -1,1 +1,1 @@
-/trunk:1-16881
+/trunk:1-16884

Modified: branches/interatomic/gui/input_elements/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/gui/input_elements/sequence.py?rev=16885&r1=16884&r2=16885&view=diff
==============================================================================
--- branches/interatomic/gui/input_elements/sequence.py (original)
+++ branches/interatomic/gui/input_elements/sequence.py Tue Jun 12 17:57:01 
2012
@@ -24,6 +24,7 @@
 """Module containing a set of special GUI elements to be used in the relax 
wizards."""
 
 # Python module imports.
+from string import upper
 import wx
 import wx.lib.mixins.listctrl
 
@@ -363,6 +364,23 @@
 
 
 
+class Sequence_list_ctrl(wx.ListCtrl, wx.lib.mixins.listctrl.TextEditMixin, 
wx.lib.mixins.listctrl.ListCtrlAutoWidthMixin):
+    """The string list ListCtrl object."""
+
+    def __init__(self, parent):
+        """Initialise the control.
+
+        @param parent:  The parent window.
+        @type parent:   wx.Frame instance
+        """
+
+        # Execute the parent __init__() methods.
+        wx.ListCtrl.__init__(self, parent, -1, 
style=wx.BORDER_SUNKEN|wx.LC_REPORT|wx.LC_HRULES|wx.LC_VRULES)
+        wx.lib.mixins.listctrl.TextEditMixin.__init__(self)
+        wx.lib.mixins.listctrl.ListCtrlAutoWidthMixin.__init__(self)
+
+
+
 class Sequence_window(wx.Dialog):
     """The Python sequence object editor window."""
 

Modified: branches/interatomic/gui/input_elements/sequence_2D.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/gui/input_elements/sequence_2D.py?rev=16885&r1=16884&r2=16885&view=diff
==============================================================================
--- branches/interatomic/gui/input_elements/sequence_2D.py (original)
+++ branches/interatomic/gui/input_elements/sequence_2D.py Tue Jun 12 
17:57:01 2012
@@ -33,7 +33,7 @@
 from status import Status; status = Status()
 
 # relax GUI module imports.
-from gui.input_elements.sequence import Sequence, Sequence_window
+from gui.input_elements.sequence import Sequence, Sequence_list_ctrl, 
Sequence_window
 
 
 class Sequence_2D(Sequence):
@@ -138,23 +138,6 @@
 
 
 
-class Sequence_list_ctrl(wx.ListCtrl, wx.lib.mixins.listctrl.TextEditMixin, 
wx.lib.mixins.listctrl.ListCtrlAutoWidthMixin):
-    """The string list ListCtrl object."""
-
-    def __init__(self, parent):
-        """Initialise the control.
-
-        @param parent:  The parent window.
-        @type parent:   wx.Frame instance
-        """
-
-        # Execute the parent __init__() methods.
-        wx.ListCtrl.__init__(self, parent, -1, 
style=wx.BORDER_SUNKEN|wx.LC_REPORT|wx.LC_HRULES|wx.LC_VRULES)
-        wx.lib.mixins.listctrl.TextEditMixin.__init__(self)
-        wx.lib.mixins.listctrl.ListCtrlAutoWidthMixin.__init__(self)
-
-
-
 class Sequence_window_2D(Sequence_window):
     """The Python 2D sequence object editor window."""