Author: bugman Date: Wed May 16 10:32:03 2012 New Revision: 16306 URL: http://svn.gna.org/viewcvs/relax?rev=16306&view=rev Log: Started to make the wizard_elements module classes independent of the wizard. The references to parent._div_left have been eliminated, this is now expected to be passed in by the parent which has that variable as the divider arg. Modified: branches/uf_redesign/gui/wizard_elements.py Modified: branches/uf_redesign/gui/wizard_elements.py URL: http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/wizard_elements.py?rev=16306&r1=16305&r2=16306&view=diff ============================================================================== --- branches/uf_redesign/gui/wizard_elements.py (original) +++ branches/uf_redesign/gui/wizard_elements.py Wed May 16 10:32:03 2012 @@ -62,8 +62,8 @@ @type desc: str @keyword tooltip: The tooltip which appears on hovering over the text or input field. @type tooltip: str - @keyword divider: The optional position of the divider. If None, the class variable _div_left will be used. - @type divider: None or int + @keyword divider: The position of the divider. + @type divider: int @keyword padding: Spacing to the left and right of the widgets. @type padding: int @keyword spacer: The amount of spacing to add below the field in pixels. If None, a stretchable spacer will be used. @@ -90,7 +90,7 @@ # The divider. if not divider: - divider = parent._div_left + raise RelaxError("The divider position has not been supplied.") # Spacing. x, y = text.GetSize() @@ -173,8 +173,8 @@ @type style: long @keyword tooltip: The tooltip which appears on hovering over all the GUI elements. @type tooltip: str - @keyword divider: The optional position of the divider. If None, the class variable _div_left will be used. - @type divider: None or int + @keyword divider: The position of the divider. + @type divider: int @keyword padding: Spacing to the left and right of the widgets. @type padding: int @keyword spacer: The amount of spacing to add below the field in pixels. If None, a stretchable spacer will be used. @@ -203,7 +203,7 @@ # The divider. if not divider: - divider = parent._div_left + raise RelaxError("The divider position has not been supplied.") # Spacing. x, y = text.GetSize() @@ -303,8 +303,8 @@ @type style: long @keyword tooltip: The tooltip which appears on hovering over all the GUI elements. @type tooltip: str - @keyword divider: The optional position of the divider. If None, the class variable _div_left will be used. - @type divider: None or int + @keyword divider: The position of the divider. + @type divider: int @keyword padding: Spacing to the left and right of the widgets. @type padding: int @keyword spacer: The amount of spacing to add below the field in pixels. If None, a stretchable spacer will be used. @@ -335,7 +335,7 @@ # The divider. if not divider: - divider = parent._div_left + raise RelaxError("The divider position has not been supplied.") # Spacing. x, y = text.GetSize() @@ -473,8 +473,8 @@ @type combo_list_size: int or None @keyword tooltip: The tooltip which appears on hovering over the text or input field. @type tooltip: str - @keyword divider: The optional position of the divider. If None, the class variable _div_left will be used. - @type divider: None or int + @keyword divider: The position of the divider. + @type divider: int @keyword padding: Spacing to the left and right of the widgets. @type padding: int @keyword spacer: The amount of spacing to add below the field in pixels. If None, a stretchable spacer will be used. @@ -528,7 +528,7 @@ # The divider. if not divider: - divider = parent._div_left + raise RelaxError("The divider position has not been supplied.") # Spacing. x, y = text.GetSize() @@ -1210,8 +1210,8 @@ @type max: int @keyword tooltip: The tooltip which appears on hovering over the text or input field. @type tooltip: str - @keyword divider: The optional position of the divider. If None, the class variable _div_left will be used. - @type divider: None or int + @keyword divider: The position of the divider. + @type divider: int @keyword padding: Spacing to the left and right of the widgets. @type padding: int @keyword spacer: The amount of spacing to add below the field in pixels. If None, a stretchable spacer will be used. @@ -1271,7 +1271,7 @@ # The divider. if not divider: - divider = parent._div_left + raise RelaxError("The divider position has not been supplied.") # Spacing. x, y = text.GetSize()