Index: trunk/umitGUI/radialnet/ControlWidget.py =================================================================== --- trunk/umitGUI/radialnet/ControlWidget.py (revision 3726) +++ trunk/umitGUI/radialnet/ControlWidget.py (revision 3798) @@ -23,5 +23,5 @@ import gobject -import bestwidgets as bw +#import bestwidgets as bw import higwidgets.drawing as drawing @@ -29,4 +29,7 @@ from umitGUI.radialnet.RadialNet import * +from higwidgets.higboxes import HIGBox, HIGHBox, HIGVBox, HIGScrolledWindow +from higwidgets.higexpanders import HIGExpanderRNet +from higwidgets.higtables import HIGTableRNet OPTIONS = ['address', @@ -42,5 +45,5 @@ -class ControlWidget(bw.BWVBox): +class ControlWidget(HIGVBox): """ """ @@ -48,5 +51,5 @@ """ """ - bw.BWVBox.__init__(self) + HIGVBox.__init__(self) self.set_border_width(6) @@ -64,12 +67,12 @@ self.__view = ControlView(self.radialnet) - self.bw_pack_start_noexpand_nofill(self.__action) - self.bw_pack_start_noexpand_nofill(self.__interpolation) - self.bw_pack_start_noexpand_nofill(self.__layout) - self.bw_pack_start_noexpand_nofill(self.__view) - - - -class ControlAction(bw.BWExpander): + self._pack_noexpand_nofill(self.__action) + self._pack_noexpand_nofill(self.__interpolation) + self._pack_noexpand_nofill(self.__layout) + self._pack_noexpand_nofill(self.__view) + + + +class ControlAction(HIGExpanderRNet): """ """ @@ -77,5 +80,5 @@ """ """ - bw.BWExpander.__init__(self, 'Action') + HIGExpanderRNet.__init__(self, 'Action') self.set_expanded(True) @@ -88,7 +91,7 @@ """ """ - self.__tbox = bw.BWTable(1, 4) - self.__tbox.bw_set_spacing(0) - self.__vbox = bw.BWVBox() + self.__tbox = HIGTableRNet(1, 4) + self.__tbox._set_spacing(0) + self.__vbox = HIGVBox() self.__tooltips = gtk.Tooltips() @@ -126,13 +129,13 @@ self.__region_color.set_active(self.radialnet.get_region_color()) - self.__tbox.bw_attach_next(self.__jump_to) - self.__tbox.bw_attach_next(self.__info) - self.__tbox.bw_attach_next(self.__group) - self.__tbox.bw_attach_next(self.__region) - - self.__vbox.bw_pack_start_noexpand_nofill(self.__tbox) - self.__vbox.bw_pack_start_noexpand_nofill(self.__region_color) - - self.bw_add(self.__vbox) + self.__tbox._attach_next(self.__jump_to) + self.__tbox._attach_next(self.__info) + self.__tbox._attach_next(self.__group) + self.__tbox._attach_next(self.__region) + + self.__vbox._pack_noexpand_nofill(self.__tbox) + self.__vbox._pack_noexpand_nofill(self.__region_color) + + self._add(self.__vbox) self.__jump_to.set_active(True) @@ -354,5 +357,5 @@ -class ControlVariable(bw.BWHBox): +class ControlVariable(HIGHBox): """ """ @@ -360,5 +363,5 @@ """ """ - bw.BWHBox.__init__(self, spacing=0) + HIGHBox.__init__(self, spacing=0) self.__increment_pass = increment @@ -399,7 +402,7 @@ self.__right_button.connect('released', self.__released) - self.bw_pack_start_noexpand_nofill(self.__left_button) - self.bw_pack_start_expand_fill(self.__control) - self.bw_pack_start_noexpand_nofill(self.__right_button) + self._pack_noexpand_nofill(self.__left_button) + self._pack_expand_fill(self.__control) + self._pack_noexpand_nofill(self.__right_button) @@ -432,5 +435,5 @@ -class ControlFisheye(bw.BWVBox): +class ControlFisheye(HIGVBox): """ """ @@ -438,5 +441,5 @@ """ """ - bw.BWVBox.__init__(self) + HIGVBox.__init__(self) self.set_border_width(6) @@ -450,5 +453,5 @@ """ """ - self.__params = bw.BWHBox() + self.__params = HIGHBox() self.__fisheye_label = gtk.Label('Fisheye on ring') @@ -477,13 +480,13 @@ self.__spread_spin.set_digits(2) - self.__params.bw_pack_start_noexpand_nofill(self.__fisheye_label) - self.__params.bw_pack_start_noexpand_nofill(self.__ring_spin) - self.__params.bw_pack_start_expand_fill(self.__ring_scale) - self.__params.bw_pack_start_noexpand_nofill(self.__interest_label) - self.__params.bw_pack_start_noexpand_nofill(self.__interest_spin) - self.__params.bw_pack_start_noexpand_nofill(self.__spread_label) - self.__params.bw_pack_start_noexpand_nofill(self.__spread_spin) - - self.bw_pack_start_noexpand_nofill(self.__params) + self.__params._pack_noexpand_nofill(self.__fisheye_label) + self.__params._pack_noexpand_nofill(self.__ring_spin) + self.__params._pack_expand_fill(self.__ring_scale) + self.__params._pack_noexpand_nofill(self.__interest_label) + self.__params._pack_noexpand_nofill(self.__interest_spin) + self.__params._pack_noexpand_nofill(self.__spread_label) + self.__params._pack_noexpand_nofill(self.__spread_spin) + + self._pack_noexpand_nofill(self.__params) self.__ring.connect('value_changed', self.__change_ring) @@ -578,5 +581,5 @@ -class ControlInterpolation(bw.BWExpander): +class ControlInterpolation(HIGExpanderRNet): """ """ @@ -584,5 +587,5 @@ """ """ - bw.BWExpander.__init__(self, 'Interpolation') + HIGExpanderRNet.__init__(self, 'Interpolation') self.radialnet = radialnet @@ -594,5 +597,5 @@ """ """ - self.__vbox = bw.BWVBox() + self.__vbox = HIGVBox() self.__cartesian_radio = gtk.RadioButton(None, 'Cartesian') @@ -605,9 +608,9 @@ INTERPOLATION_POLAR) - self.__system_box = bw.BWHBox() - self.__system_box.bw_pack_start_noexpand_nofill(self.__polar_radio) - self.__system_box.bw_pack_start_noexpand_nofill(self.__cartesian_radio) - - self.__frames_box = bw.BWHBox() + self.__system_box = HIGHBox() + self.__system_box._pack_noexpand_nofill(self.__polar_radio) + self.__system_box._pack_noexpand_nofill(self.__cartesian_radio) + + self.__frames_box = HIGHBox() self.__frames_label = gtk.Label('Frames') self.__frames_label.set_alignment(0.0, 0.5) @@ -618,11 +621,11 @@ self.__frames.connect('value_changed', self.__change_frames) self.__frames_spin = gtk.SpinButton(self.__frames) - self.__frames_box.bw_pack_start_expand_fill(self.__frames_label) - self.__frames_box.bw_pack_start_noexpand_nofill(self.__frames_spin) - - self.__vbox.bw_pack_start_noexpand_nofill(self.__frames_box) - self.__vbox.bw_pack_start_noexpand_nofill(self.__system_box) - - self.bw_add(self.__vbox) + self.__frames_box._pack_expand_fill(self.__frames_label) + self.__frames_box._pack_noexpand_nofill(self.__frames_spin) + + self.__vbox._pack_noexpand_nofill(self.__frames_box) + self.__vbox._pack_noexpand_nofill(self.__system_box) + + self._add(self.__vbox) gobject.timeout_add(REFRESH_RATE, self.__update_animation) @@ -665,5 +668,5 @@ -class ControlLayout(bw.BWExpander): +class ControlLayout(HIGExpanderRNet): """ """ @@ -671,5 +674,5 @@ """ """ - bw.BWExpander.__init__(self, 'Layout') + HIGExpanderRNet.__init__(self, 'Layout') self.radialnet = radialnet @@ -681,5 +684,5 @@ """ """ - self.__hbox = bw.BWHBox() + self.__hbox = HIGHBox() self.__layout = gtk.combo_box_new_text() @@ -691,8 +694,8 @@ self.__force.connect('clicked', self.__force_update) - self.__hbox.bw_pack_start_expand_fill(self.__layout) - self.__hbox.bw_pack_start_noexpand_nofill(self.__force) - - self.bw_add(self.__hbox) + self.__hbox._pack_expand_fill(self.__layout) + self.__hbox._pack_noexpand_nofill(self.__force) + + self._add(self.__hbox) self.__check_layout() @@ -729,5 +732,5 @@ -class ControlRingGap(bw.BWVBox): +class ControlRingGap(HIGVBox): """ """ @@ -735,5 +738,5 @@ """ """ - bw.BWVBox.__init__(self) + HIGVBox.__init__(self) self.radialnet = radialnet @@ -758,10 +761,10 @@ self.__spin.connect('value_changed', self.__change_lower) - self.__lower_hbox = bw.BWHBox() - self.__lower_hbox.bw_pack_start_expand_fill(self.__label) - self.__lower_hbox.bw_pack_start_noexpand_nofill(self.__spin) - - self.bw_pack_start_noexpand_nofill(self.__radius) - self.bw_pack_start_noexpand_nofill(self.__lower_hbox) + self.__lower_hbox = HIGHBox() + self.__lower_hbox._pack_expand_fill(self.__label) + self.__lower_hbox._pack_noexpand_nofill(self.__spin) + + self._pack_noexpand_nofill(self.__radius) + self._pack_noexpand_nofill(self.__lower_hbox) @@ -774,5 +777,5 @@ -class ControlOptions(bw.BWScrolledWindow): +class ControlOptions(HIGScrolledWindow): """ """ @@ -780,5 +783,5 @@ """ """ - bw.BWScrolledWindow.__init__(self) + HIGScrolledWindow.__init__(self) self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS) @@ -875,5 +878,5 @@ -class ControlView(bw.BWExpander): +class ControlView(HIGExpanderRNet): """ """ @@ -881,5 +884,5 @@ """ """ - bw.BWExpander.__init__(self, 'View') + HIGExpanderRNet.__init__(self, 'View') self.set_expanded(True) @@ -892,5 +895,5 @@ """ """ - self.__vbox = bw.BWVBox(spacing=0) + self.__vbox = HIGVBox(spacing=0) self.__zoom = ControlVariable('Zoom', @@ -904,10 +907,10 @@ self.__options.set_border_width(0) - self.__vbox.bw_pack_start_expand_nofill(self.__options) - self.__vbox.bw_pack_start_noexpand_nofill(self.__navigation) - self.__vbox.bw_pack_start_noexpand_nofill(self.__zoom) - self.__vbox.bw_pack_start_noexpand_nofill(self.__ring_gap) - - self.bw_add(self.__vbox) + self.__vbox._pack_expand_nofill(self.__options) + self.__vbox._pack_noexpand_nofill(self.__navigation) + self.__vbox._pack_noexpand_nofill(self.__zoom) + self.__vbox._pack_noexpand_nofill(self.__ring_gap) + + self._add(self.__vbox)