Author: bugman Date: Tue Jun 12 20:46:09 2012 New Revision: 16886 URL: http://svn.gna.org/viewcvs/relax?rev=16886&view=rev Log: Ported r16884 from trunk so that the 2.0.0 tag will be usable! The command used was: svn merge -r16883:r16884 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk . ..... r16884 | bugman | 2012-06-12 17:56:04 +0200 (Tue, 12 Jun 2012) | 3 lines Changed paths: M /trunk/gui/input_elements/sequence.py M /trunk/gui/input_elements/sequence_2D.py Bug fix for the Sequence GUI input element - the Sequence_list_ctrl class was in the wrong module! ..... Modified: tags/2.0.0/gui/input_elements/sequence.py tags/2.0.0/gui/input_elements/sequence_2D.py Modified: tags/2.0.0/gui/input_elements/sequence.py URL: http://svn.gna.org/viewcvs/relax/tags/2.0.0/gui/input_elements/sequence.py?rev=16886&r1=16885&r2=16886&view=diff ============================================================================== --- tags/2.0.0/gui/input_elements/sequence.py (original) +++ tags/2.0.0/gui/input_elements/sequence.py Tue Jun 12 20:46:09 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: tags/2.0.0/gui/input_elements/sequence_2D.py URL: http://svn.gna.org/viewcvs/relax/tags/2.0.0/gui/input_elements/sequence_2D.py?rev=16886&r1=16885&r2=16886&view=diff ============================================================================== --- tags/2.0.0/gui/input_elements/sequence_2D.py (original) +++ tags/2.0.0/gui/input_elements/sequence_2D.py Tue Jun 12 20:46:09 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."""