diff --git a/zenmap/radialnet/bestwidgets/boxes.py b/zenmap/radialnet/bestwidgets/boxes.py index f93ee8d91..326bbf400 100644 --- a/zenmap/radialnet/bestwidgets/boxes.py +++ b/zenmap/radialnet/bestwidgets/boxes.py @@ -127,6 +127,9 @@ import gtk +__all__ = ('BWBox', 'BWHBox', 'BWVBox', + 'BWStatusbar', 'BWTable', 'BWScrolledWindow') + class BWBox(gtk.Box): """ diff --git a/zenmap/radialnet/gui/Application.py b/zenmap/radialnet/gui/Application.py index 2796a574d..125a5203a 100644 --- a/zenmap/radialnet/gui/Application.py +++ b/zenmap/radialnet/gui/Application.py @@ -133,7 +133,7 @@ from radialnet.core.XMLHandler import XMLReader from radialnet.gui.ControlWidget import ControlWidget, ControlFisheye from radialnet.gui.Toolbar import Toolbar from radialnet.gui.Image import Pixmaps -from radialnet.gui.RadialNet import * +import radialnet.gui.RadialNet as RadialNet from radialnet.bestwidgets.windows import * from radialnet.bestwidgets.boxes import * @@ -160,7 +160,7 @@ class Application(BWMainWindow): self.__hbox = BWHBox(spacing=0) self.__vbox = BWVBox(spacing=0) - self.__radialnet = RadialNet(LAYOUT_WEIGHTED) + self.__radialnet = RadialNet.RadialNet(RadialNet.LAYOUT_WEIGHTED) self.__control = ControlWidget(self.__radialnet) self.__fisheye = ControlFisheye(self.__radialnet) self.__toolbar = Toolbar(self.__radialnet, diff --git a/zenmap/radialnet/gui/ControlWidget.py b/zenmap/radialnet/gui/ControlWidget.py index 850662351..f3f627f00 100644 --- a/zenmap/radialnet/gui/ControlWidget.py +++ b/zenmap/radialnet/gui/ControlWidget.py @@ -133,7 +133,7 @@ import radialnet.util.geometry as geometry from radialnet.bestwidgets.boxes import * from radialnet.core.Coordinate import PolarCoordinate -from radialnet.gui.RadialNet import * +import radialnet.gui.RadialNet as RadialNet from radialnet.bestwidgets.expanders import BWExpander @@ -207,7 +207,7 @@ class ControlAction(BWExpander): try_set_tooltip_text(self.__jump_to, 'Change focus') self.__jump_to.connect('toggled', self.__change_pointer, - POINTER_JUMP_TO) + RadialNet.POINTER_JUMP_TO) try: # gtk.STOCK_INFO is available only in PyGTK 2.8 and later. @@ -220,20 +220,20 @@ class ControlAction(BWExpander): try_set_tooltip_text(self.__info, 'Show information') self.__info.connect('toggled', self.__change_pointer, - POINTER_INFO) + RadialNet.POINTER_INFO) self.__group = gtk.RadioToolButton(self.__jump_to, gtk.STOCK_ADD) try_set_tooltip_text(self.__group, 'Group children') self.__group.connect('toggled', self.__change_pointer, - POINTER_GROUP) + RadialNet.POINTER_GROUP) self.__region = gtk.RadioToolButton(self.__jump_to, gtk.STOCK_SELECT_COLOR) try_set_tooltip_text(self.__region, 'Fill region') self.__region.connect('toggled', self.__change_pointer, - POINTER_FILL) + RadialNet.POINTER_FILL) self.__region_color = gtk.combo_box_new_text() self.__region_color.append_text(_('Red')) @@ -262,7 +262,7 @@ class ControlAction(BWExpander): if pointer != self.radialnet.get_pointer_status(): self.radialnet.set_pointer_status(pointer) - if pointer == POINTER_FILL: + if pointer == RadialNet.POINTER_FILL: self.__region_color.show() else: self.__region_color.hide() @@ -685,10 +685,10 @@ class ControlInterpolation(BWExpander): self.__cartesian_radio, _('Polar')) self.__cartesian_radio.connect('toggled', self.__change_system, - INTERPOLATION_CARTESIAN) + RadialNet.INTERPOLATION_CARTESIAN) self.__polar_radio.connect('toggled', self.__change_system, - INTERPOLATION_POLAR) + RadialNet.INTERPOLATION_POLAR) self.__system_box = BWHBox() self.__system_box.bw_pack_start_noexpand_nofill(self.__polar_radio) @@ -718,7 +718,7 @@ class ControlInterpolation(BWExpander): """ active = self.radialnet.get_interpolation() - if active == INTERPOLATION_CARTESIAN: + if active == RadialNet.INTERPOLATION_CARTESIAN: self.__cartesian_radio.set_active(True) else: @@ -733,7 +733,7 @@ class ControlInterpolation(BWExpander): active = self.radialnet.get_interpolation() - if active == INTERPOLATION_CARTESIAN: + if active == RadialNet.INTERPOLATION_CARTESIAN: self.__cartesian_radio.set_active(True) else: @@ -781,7 +781,7 @@ class ControlLayout(BWExpander): def __check_layout(self): """ """ - if self.__layout.get_active() == LAYOUT_WEIGHTED: + if self.__layout.get_active() == RadialNet.LAYOUT_WEIGHTED: self.__force.set_sensitive(True) else: diff --git a/zenmap/zenmapGUI/TopologyPage.py b/zenmap/zenmapGUI/TopologyPage.py index 7bd47188d..a6b7882ac 100644 --- a/zenmap/zenmapGUI/TopologyPage.py +++ b/zenmap/zenmapGUI/TopologyPage.py @@ -132,7 +132,7 @@ from zenmapGUI.ScanToolbar import * from zenmapGUI.higwidgets.higboxes import HIGVBox -from radialnet.gui.RadialNet import * +import radialnet.gui.RadialNet as RadialNet from radialnet.gui.ControlWidget import * from radialnet.gui.Toolbar import Toolbar from radialnet.bestwidgets.boxes import * @@ -161,7 +161,7 @@ class TopologyPage(HIGVBox): self.rn_vbox = gtk.VBox() # RadialNet's widgets - self.radialnet = RadialNet(LAYOUT_WEIGHTED) + self.radialnet = RadialNet.RadialNet(RadialNet.LAYOUT_WEIGHTED) self.control = ControlWidget(self.radialnet) self.fisheye = ControlFisheye(self.radialnet) self.rn_toolbar = Toolbar(self.radialnet,