Changeset 3798

Timestamp:

11/29/08 18:08:19 (4 years ago)

Author:

luis

Message:

Integration of RadialNet:
- higwidgets
- Added Mapper to Notebook
- Change version number
Credit for commit: me and Daniel Cassiano
AUTHOR of RadialNet: Joao Medeiros

Location:

trunk

Files:

• higwidgets/__init__.py (modified) (1 diff)
• higwidgets/higboxes.py (modified) (3 diffs)
• higwidgets/higbuttons.py (modified) (3 diffs)
• higwidgets/higexpanders.py (modified) (3 diffs)
• higwidgets/higframe.py (modified) (2 diffs)
• higwidgets/higlabels.py (modified) (3 diffs)
• higwidgets/higtables.py (modified) (2 diffs)
• higwidgets/higtextviewers.py (modified) (3 diffs)
• higwidgets/higwindows.py (modified) (3 diffs)
• umitCore/Version.py (modified) (1 diff)
• umitCore/__init__.py (modified) (1 diff)
• umitGUI/ScanNotebook.py (modified) (8 diffs)
• umitGUI/__init__.py (modified) (1 diff)
• umitGUI/radialnet/ControlWidget.py (modified) (33 diffs)
• umitGUI/radialnet/GraphBuilder.py (modified) (2 diffs)
• umitGUI/radialnet/HostsViewer.py (modified) (3 diffs)
• umitGUI/radialnet/NodeNotebook.py (modified) (28 diffs)
• umitGUI/radialnet/NodeWindow.py (modified) (7 diffs)
• umitGUI/radialnet/Toolbar.py (modified) (1 diff)
• umitGUI/radialnet/__init__.py (modified) (1 diff)

trunk/higwidgets/__init__.py

@@ -32 +32 @@
 """
 
-__version__ = "0.9.5"
+__version__ = "1.0A-svn"
+
+# added to RadialNet compatibility
+import gtk
+
+gtk_version_major, gtk_version_minor, gtk_version_release = gtk.gtk_version
 
 from gtkutils import *

trunk/higwidgets/higboxes.py

@@ -7 +7 @@
 # Author: Adriano Monteiro Marques <adriano@umitproject.org>
 #         Cleber Rodrigues <cleber.gnu@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -39 +40 @@
         self.pack_start(widget, expand=True, fill=True)
 
+    # Methods included for RadialNet integration
+    def _pack_expand_nofill(self, widget):
+        self.pack_start(widget, expand=True, fill=False)
+
+    def _pack_end_noexpand_nofill(self, widget):
+        self.pack_end(widget, expand=False, fill=False)
+
+    def _pack_end_expand_fill(self, widget):
+        self.pack_end(widget, expand=True, fill=True)
+
+    def _pack_end_expand_nofill(self, widget):
+        self.pack_end(widget, expand=True, fill=False)
+
 class HIGHBox(gtk.HBox, HIGBox):
     def __init__(self, homogeneous=False, spacing=12):
@@ -70 +84 @@
 def hig_box_space_holder():
     return gtk.Label("    ")
+
+
+class HIGStatusbar(gtk.Statusbar, HIGBox):
+    def __init__(self, homogeneous=False, spacing=12):
+        gtk.HBox.__init__(self, homogeneous, spacing)
+
+
+class HIGScrolledWindow(gtk.ScrolledWindow):
+    def __init__(self):
+        gtk.ScrolledWindow.__init__(self)
+        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        self.set_shadow_type(gtk.SHADOW_NONE)
+        self.set_border_width(6)
+

trunk/higwidgets/higbuttons.py

@@ -7 +7 @@
 # Author: Adriano Monteiro Marques <adriano@umitproject.org>
 #         Cleber Rodrigues <cleber.gnu@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -28 +29 @@
 """
 
-__all__ = ['HIGMixButton', 'HIGButton', 'HIGArrowButton', 'MiniButton']
+__all__ = ['HIGMixButton', 'HIGButton', 'HIGArrowButton', 'MiniButton', 'HIGStockButton', 
+           'HIGToggleButton', 'HIGToggleStockButton']
 
 import gtk
@@ -75 +77 @@
         else:
             gtk.ToggleButton.__init__(self)
+
+class HIGStockButton(gtk.Button):
+    """
+    """
+    def __init__(self, stock, text=None, size=gtk.ICON_SIZE_BUTTON):
+        """
+        """
+        gtk.Button.__init__(self, text)
+
+        self.__size = size
+
+        self.__image = gtk.Image()
+        self.__image.set_from_stock(stock, self.__size)
+        self.set_image(self.__image)
+
+class HIGToggleStockButton(gtk.ToggleButton):
+    """
+    """
+    def __init__(self, stock, text=None, size=gtk.ICON_SIZE_BUTTON):
+        """
+        """
+        gtk.ToggleButton.__init__(self, text)
+
+        self.__size = size
+
+        self.__image = gtk.Image()
+        self.__image.set_from_stock(stock, self.__size)
+        self.set_image(self.__image)
 
 class MiniButton(gtk.Button):

trunk/higwidgets/higexpanders.py

@@ -7 +7 @@
 # Author: Adriano Monteiro Marques <adriano@umitproject.org>
 #         Cleber Rodrigues <cleber.gnu@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -28 +29 @@
 """
 
-__all__ = ['HIGExpander']
+__all__ = ['HIGExpander', 'HIGExpanderRNet']
 
 import gtk
 
 from higwidgets.higboxes import HIGHBox, hig_box_space_holder
+from higwidgets.higlabels import HIGSectionLabel
 
 class HIGExpander(gtk.Expander):
@@ -49 +51 @@
     def get_container(self):
         return self.hbox
+
+#class needed to maintain compatibility of RadialNet with higwidgets
+class HIGExpanderRNet(gtk.Expander):
+    def __init__(self, label=''):
+        gtk.Expander.__init__(self)
+
+        self.__label = HIGSectionLabel(label)
+        self.set_label_widget(self.__label)
+
+        self.__alignment = gtk.Alignment(0, 0, 1, 1)
+        self.__alignment.set_padding(12, 0, 24, 0)
+
+        self.add(self.__alignment)
+
+
+    def _set_label_text(self, text):
+        self.__label._set_text(text)
+
+
+    def _add(self, widget):
+        if len(self.__alignment.get_children()) > 0:
+            self.__alignment.remove(self.__alignment.get_children()[0])
+
+        self.__alignment.add(widget)
+
+
+    def _no_padding(self):
+        self.__alignment.set_padding(0, 0, 0, 0)

trunk/higwidgets/higframe.py

@@ -5 +5 @@
 #
 # Author: Guilherme Polo <ggpolo@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -45 +46 @@
         self._flabel.set_markup("<b>%s</b>" % label)
 
+#class needed to maintain compatibility of RadialNet with higwidgets 
+class HIGFrameRNet(gtk.Frame):
+    def __init__(self, label=''):
+        gtk.Frame.__init__(self)
+
+        self.set_border_width(3)
+        self.set_shadow_type(gtk.SHADOW_NONE)
+
+        self.__alignment = gtk.Alignment(0, 0, 1, 1)
+        self.__alignment.set_padding(12, 0, 24, 0)
+
+        self.add(self.__alignment)
+
+        self.bw_set_label(label)
+
+
+    def _set_label(self, label):
+        self.set_label("<b>%s</b>" % label)
+        self.get_label_widget().set_use_markup(True)
+
+
+    def _add(self, widget):
+        self.__alignment.add(widget)
+
+
+    def _remove(self, widget):
+        self.__alignment.remove(widget)
+
 # Demo
 if __name__ == "__main__":

trunk/higwidgets/higlabels.py

@@ -7 +7 @@
 # Author: Adriano Monteiro Marques <adriano@umitproject.org>
 #         Cleber Rodrigues <cleber.gnu@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -43 +44 @@
             self.set_alignment(0, 0.50)
             self.set_line_wrap(True)
+
+    def _set_text(self, text):
+        self.set_markup("<b>%s</b>" % (text))
 
 class HIGHintSectionLabel(gtk.HBox, object):
@@ -121 +125 @@
         self.set_line_wrap(True)
 
+class HIGLabel(gtk.Label):
+    def __init__(self, text=''):
+        gtk.Label.__init__(self)
+
+        self.set_text(text)
+        self.set_justify(gtk.JUSTIFY_LEFT)
+        self.set_alignment(0, 0.50)
+        self.set_line_wrap(True)
+
 if __name__ == "__main__":
     w = gtk.Window()

trunk/higwidgets/higtables.py

@@ -34 +34 @@
 #from higlabels import *
 #from higentries import *
+from higwidgets.higboxes import HIGBox
 
 class HIGTable(gtk.Table):
@@ -57 +58 @@
     def attach_entry(self, widget, x0, x, y0, y):
         self.attach(widget, x0, x, y0, y, xoptions=gtk.FILL|gtk.EXPAND)
+
+class HIGTableRNet(gtk.Table, HIGBox):
+    def __init__(self, rows=1, columns=1, homogeneous=False):
+        gtk.Table.__init__(self, rows, columns, homogeneous)
+        self._set_spacing(12)
+
+        self.__rows = rows
+        self.__columns = columns
+
+        self.__last_point = (0, 0)
+
+
+    def _set_spacing(self, spacing):
+        self.set_row_spacings(spacing)
+        self.set_col_spacings(spacing)
+
+
+    def _resize(self, rows, columns):
+        self.__rows = rows
+        self.__columns = columns
+
+        self.resize(rows, columns)
+
+
+    def _attach_next(self,
+                     child,
+                     xoptions=gtk.EXPAND|gtk.FILL,
+                     yoptions=gtk.EXPAND|gtk.FILL,
+                     xpadding=0,
+                     ypadding=0):
+        row, column = self.__last_point
+
+        if row != self.__rows:
+
+            self.attach(child,
+                        column,
+                        column + 1,
+                        row,
+                        row + 1,
+                        xoptions,
+                        yoptions,
+                        xpadding,
+                        ypadding)
+
+            if column + 1 == self.__columns:
+
+                column = 0
+                row += 1
+
+            else:
+                column += 1
+
+            self.__last_point = (row, column)

trunk/higwidgets/higtextviewers.py

@@ -7 +7 @@
 # Author: Adriano Monteiro Marques <adriano@umitproject.org>
 #         Cleber Rodrigues <cleber.gnu@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -31 +32 @@
 
 import gtk
+from higwidgets.higboxes import HIGHBox, HIGScrolledWindow
 
 class HIGTextView(gtk.TextView):
@@ -37 +39 @@
         self.set_wrap_mode(gtk.WRAP_WORD)
         self.get_buffer().set_text(text)
+
+#class needed to maintain compatibility of RadialNet with higwidgets 
+class HIGTextViewRNet(HIGScrolledWindow):
+    def __init__(self):
+        HIGScrolledWindow.__init__(self)
+        self.__auto_scroll = False
+        self.__create_widgets()
+
+    def __create_widgets(self):
+        self.__textbuffer = gtk.TextBuffer()
+        self.__textview = gtk.TextView(self.__textbuffer)
+
+        self.add_with_viewport(self.__textview)
+
+    def _set_auto_scroll(self, value):
+        self.__auto_scroll = value
+
+    def _set_editable(self, editable):
+        self.__textview.set_editable(False)
+
+    def _modify_font(self, font):
+        self.__textview.modify_font(font)
+
+    def _set_text(self, text):
+        self.__textbuffer.set_text(text)
+
+        if self.__auto_scroll:
+            self._set_scroll_down()
+
+
+    def _get_text(self):
+        return self.__textbuffer.get_text(self.__textbuffer.get_start_iter(),
+                                          self.__textbuffer.get_end_iter())
+
+    def _set_scroll_down(self):
+        self.get_vadjustment().set_value(self.get_vadjustment().upper)
+
+    def _get_textbuffer(self):
+        return self.__textbuffer
+
+
+class HIGTextEditor(HIGScrolledWindow):
+    def __init__(self):
+        HIGScrolledWindow.__init__(self)
+        self.connect('expose_event', self.__expose)
+
+        self.__auto_scroll = False
+
+        self.__create_widgets()
+
+    def __create_widgets(self):
+        self.__hbox = HIGHBox(spacing=6)
+
+        self.__textbuffer = gtk.TextBuffer()
+        self.__textview = gtk.TextView(self.__textbuffer)
+
+        self.__linebuffer = gtk.TextBuffer()
+        self.__lineview = gtk.TextView(self.__linebuffer)
+        self.__lineview.set_justification(gtk.JUSTIFY_RIGHT)
+        self.__lineview.set_editable(False)
+        self.__lineview.set_sensitive(False)
+
+        self.__hbox._pack_noexpand_nofill(self.__lineview)
+        self.__hbox._pack_expand_fill(self.__textview)
+
+        self.add_with_viewport(self.__hbox)
+
+    def __expose(self, widget, event):
+        # code to fix a gtk issue that don't show text correctly
+        self.__hbox.check_resize()
+
+    def _set_auto_scroll(self, value):
+        self.__auto_scroll = value
+
+    def _set_editable(self, editable):
+        self.__textview.set_editable(False)
+
+    def _modify_font(self, font):
+        self.__textview.modify_font(font)
+        self.__lineview.modify_font(font)
+
+    def _set_text(self, text):
+        if text != "":
+
+            count = text.count('\n') + text.count('\r')
+
+            lines = range(1, count + 2)
+            lines = [str(i).strip() for i in lines]
+
+            self.__textbuffer.set_text(text)
+            self.__linebuffer.set_text('\n'.join(lines))
+
+            if self.__auto_scroll:
+                self.bw_set_scroll_down()
+
+        else:
+
+            self.__textbuffer.set_text("")
+            self.__linebuffer.set_text("")
+
+
+    def _get_text(self):
+        return self.__textbuffer.get_text(self.__textbuffer.get_start_iter(),
+                                          self.__textbuffer.get_end_iter())
+
+    def _set_scroll_down(self):
+        self.get_vadjustment().set_value(self.get_vadjustment().upper)
+

trunk/higwidgets/higwindows.py

@@ -7 +7 @@
 # Author: Adriano Monteiro Marques <adriano@umitproject.org>
 #         Cleber Rodrigues <cleber.gnu@gmail.com>
+#         João Paulo de Souza Medeiros <ignotus21@gmail.com>
 #
 # This library is free software; you can redistribute it and/or modify 
@@ -29 +30 @@
 
 import gtk
+from higwidgets import gtk_version_minor
+
+PRIMARY_TEXT_MARKUP = '<span weight="bold" size="larger">%s</span>'
+
+class HIGAlertDialog(gtk.MessageDialog):
+    def __init__(self, parent=None, flags=0, type=gtk.MESSAGE_INFO,
+                 buttons=gtk.BUTTONS_OK,
+                 primary_text=None,
+                 secondary_text=None):
+
+        gtk.MessageDialog.__init__(self, parent, flags, type, buttons)
+
+        self.connect('response', self.__destroy)
+
+        self.set_resizable(False)
+
+        self.set_title("Alert")
+        self.set_markup(PRIMARY_TEXT_MARKUP % primary_text)
+
+        if secondary_text:
+
+            # GTK up to version 2.4 does not have secondary_text
+            if gtk_version_minor > 4:
+                self.format_secondary_text(secondary_text)
+
+
+    def __destroy(self, dialog, id):
+        self.destroy()
 
 class HIGWindow(gtk.Window):
@@ -39 +68 @@
 # so it should be really a gtk.Window
 HIGMainWindow = gtk.Window
+
+

trunk/umitCore/Version.py

@@ -1 @@
-VERSION = "0.9.5"
+VERSION = "1.0A"

trunk/umitCore/__init__.py

@@ -22 +22 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-__version__ = "0.9.5"
+__version__ = "1.0A-svn"

trunk/umitGUI/ScanNotebook.py

@@ -37 +37 @@
 from umitGUI.ScanRunDetailsPage import ScanRunDetailsPage
 from umitGUI.ScanNmapOutputPage import ScanNmapOutputPage
+from umitGUI.ScanMapperPage import ScanMapperPage
 from umitGUI.Icons import get_os_icon, get_os_logo, get_vulnerability_logo
 
@@ -347 +348 @@
     def __create_scan_result(self):
         self.scan_result = ScanResult()
+        self.scan_result.set_parse(self.parsed)
 
     def __create_toolbar(self):
@@ -674 +676 @@
         ####
         self._parse(file_to_parse=file_to_parse)
-
+        
+        ###
+        # Updating Topology
+        self.scan_result.set_parse(self.parsed)
+        ###
+        
         ####
         # Setting status to unsaved_unchanged
@@ -1213 +1220 @@
     def __init__(self):
         gtk.HPaned.__init__(self)
-        
+        self.parsed = None
         self.scan_host_view = ScanHostsView()
         self.scan_result_notebook = ScanResultNotebook()
@@ -1219 +1226 @@
         self.pack1(self.scan_host_view, True, False)
         self.pack2(self.scan_result_notebook, True, False)
-
+    def set_parse(self, parse):
+        self.parsed = parse
+        self.scan_result_notebook.set_parse(self.parsed)
     def set_nmap_output(self, msg):
         nmap_output = self.scan_result_notebook.nmap_output.nmap_output
@@ -1281 +1290 @@
         self.append_page(self.host_details_page, gtk.Label(_('Host Details')))
         self.append_page(self.scan_details_page, gtk.Label(_('Scan Details')))
-
+        self.append_page(self.scan_mapper, gtk.Label(_('Topology')))
+
+        self.parsed = None
+        
+    def set_parse(self, parse):
+        self.parsed = parse
+        self.scan_mapper.set_parse(self.parsed)
+        self.scan_mapper.create_widgets()
+        
         PluginEngine().core.emit('ScanResultNotebook-created', self)
 
@@ -1300 +1317 @@
         self.scan_details_vbox = HIGVBox()
         self.host_details_vbox = HIGVBox()
+        self.scan_mapper = self.__create_mapper()
         
         self.open_ports = ScanOpenPortsPage()
@@ -1318 +1336 @@
         self.scan_details_page.add_with_viewport(self.scan_details_vbox)
         self.scan_details_vbox._pack_expand_fill(self.scan_details)
-    
+    def __create_mapper(self):
+        page = ScanMapperPage()
+        
+        return page
     def __nmap_output_refreshing(self):
         self.connect('switch-page', self.refresh_cb)

trunk/umitGUI/__init__.py

@@ -21 +21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-__version__ = "0.9.5"
+__version__ = "1.0A-svn"

trunk/umitGUI/radialnet/ControlWidget.py

@@ -23 +23 @@
 import gobject
 
-import bestwidgets as bw
+#import bestwidgets as bw
 import higwidgets.drawing as drawing
 
@@ -29 +29 @@
 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 +45 @@
 
 
-class ControlWidget(bw.BWVBox):
+class ControlWidget(HIGVBox):
     """
     """
@@ -48 +51 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
         self.set_border_width(6)
 
@@ -64 +67 @@
         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 +80 @@
         """
         """
-        bw.BWExpander.__init__(self, 'Action')
+        HIGExpanderRNet.__init__(self, 'Action')
         self.set_expanded(True)
 
@@ -88 +91 @@
         """
         """
-        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 +129 @@
         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 +357 @@
 
 
-class ControlVariable(bw.BWHBox):
+class ControlVariable(HIGHBox):
     """
     """
@@ -360 +363 @@
         """
         """
-        bw.BWHBox.__init__(self, spacing=0)
+        HIGHBox.__init__(self, spacing=0)
 
         self.__increment_pass = increment
@@ -399 +402 @@
         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 +435 @@
 
 
-class ControlFisheye(bw.BWVBox):
+class ControlFisheye(HIGVBox):
     """
     """
@@ -438 +441 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
         self.set_border_width(6)
 
@@ -450 +453 @@
         """
         """
-        self.__params = bw.BWHBox()
+        self.__params = HIGHBox()
 
         self.__fisheye_label = gtk.Label('<b>Fisheye</b> on ring')
@@ -477 +480 @@
         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 +581 @@
 
 
-class ControlInterpolation(bw.BWExpander):
+class ControlInterpolation(HIGExpanderRNet):
     """
     """
@@ -584 +587 @@
         """
         """
-        bw.BWExpander.__init__(self, 'Interpolation')
+        HIGExpanderRNet.__init__(self, 'Interpolation')
 
         self.radialnet = radialnet
@@ -594 +597 @@
         """
         """
-        self.__vbox = bw.BWVBox()
+        self.__vbox = HIGVBox()
 
         self.__cartesian_radio = gtk.RadioButton(None, 'Cartesian')
@@ -605 +608 @@
                                    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 +621 @@
         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 +668 @@
 
 
-class ControlLayout(bw.BWExpander):
+class ControlLayout(HIGExpanderRNet):
     """
     """
@@ -671 +674 @@
         """
         """
-        bw.BWExpander.__init__(self, 'Layout')
+        HIGExpanderRNet.__init__(self, 'Layout')
 
         self.radialnet = radialnet
@@ -681 +684 @@
         """
         """
-        self.__hbox = bw.BWHBox()
+        self.__hbox = HIGHBox()
 
         self.__layout = gtk.combo_box_new_text()
@@ -691 +694 @@
         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 +732 @@
 
 
-class ControlRingGap(bw.BWVBox):
+class ControlRingGap(HIGVBox):
     """
     """
@@ -735 +738 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
 
         self.radialnet = radialnet
@@ -758 +761 @@
         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 +777 @@
 
 
-class ControlOptions(bw.BWScrolledWindow):
+class ControlOptions(HIGScrolledWindow):
     """
     """
@@ -780 +783 @@
         """
         """
-        bw.BWScrolledWindow.__init__(self)
+        HIGScrolledWindow.__init__(self)
 
         self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
@@ -875 +878 @@
 
 
-class ControlView(bw.BWExpander):
+class ControlView(HIGExpanderRNet):
     """
     """
@@ -881 +884 @@
         """
         """
-        bw.BWExpander.__init__(self, 'View')
+        HIGExpanderRNet.__init__(self, 'View')
         self.set_expanded(True)
 
@@ -892 +895 @@
         """
         """
-        self.__vbox = bw.BWVBox(spacing=0)
+        self.__vbox = HIGVBox(spacing=0)
 
         self.__zoom = ControlVariable('Zoom',
@@ -904 +907 @@
         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)
 
 

trunk/umitGUI/radialnet/GraphBuilder.py

@@ -297 +297 @@
     
         all_extraports = list()
-        print host_extraports
+        #print host_extraports
         for extraports in host_extraports:
     
@@ -434 +434 @@
             
             for node in nodes:
-                if ip['addr'] == node.get_info('ip'):
+                if ip.has_key('addr') and ip['addr'] == node.get_info('ip'):
                     break
     

trunk/umitGUI/radialnet/HostsViewer.py

@@ -23 +23 @@
 import gobject
 
-import bestwidgets as bw
+#import bestwidgets as bw
 
 from umitGUI.radialnet.NodeNotebook import NodeNotebook
 
+from higwidgets.higwindows import HIGMainWindow
 
 HOSTS_COLORS = ['#d5ffd5', '#ffffd5', '#ffd5d5']
@@ -38 +39 @@
 
 
-class HostsViewer(bw.BWMainWindow):
+class HostsViewer(HIGMainWindow):
     """
     """
@@ -44 +45 @@
         """
         """
-        bw.BWMainWindow.__init__(self)
+        HIGMainWindow.__init__(self)
         self.set_title('Hosts Viewer')
         self.set_default_size(DIMENSION[0], DIMENSION[1])

trunk/umitGUI/radialnet/NodeNotebook.py

@@ -23 +23 @@
 import gobject
 
-import bestwidgets as bw
-
+#import bestwidgets as bw
+
+from higwidgets.higboxes import HIGBox, HIGHBox, HIGVBox, HIGScrolledWindow
+from higwidgets.higexpanders import HIGExpanderRNet
+from higwidgets.higlabels import HIGLabel, HIGSectionLabel
+from higwidgets.higtables import HIGTableRNet
+from higwidgets.higtextviewers import HIGTextEditor
 
 PORTS_HEADER = ['Port', 'Protocol', 'State', 'Service', 'Method']
@@ -83 +88 @@
 
         # packing notebook elements
-        self.append_page(self.__system_page, bw.BWLabel('General'))
-        self.append_page(self.__services_page, bw.BWLabel('Services'))
-        self.append_page(self.__trace_page, bw.BWLabel('Traceroute'))
+        self.append_page(self.__system_page, HIGLabel('General'))
+        self.append_page(self.__services_page, HIGLabel('Services'))
+        self.append_page(self.__trace_page, HIGLabel('Traceroute'))
 
 
@@ -111 +116 @@
 
         # texteditor widgets
-        self.__texteditor = bw.BWTextEditor()
-        self.__texteditor.bw_modify_font(self.__font)
-        self.__texteditor.bw_set_editable(False)
+        self.__texteditor = HIGTextEditor()
+        self.__texteditor._modify_font(self.__font)
+        self.__texteditor._set_editable(False)
         self.__texteditor.set_border_width(0)
 
@@ -119 +124 @@
         self.__select_combobox.connect('changed', self.__change_text_value)
 
-        self.__viewer = bw.BWVBox(spacing=6)
+        self.__viewer = HIGVBox(spacing=6)
         self.__viewer.set_border_width(6)
 
-        self.__viewer.bw_pack_start_noexpand_nofill(self.__select_combobox)
-        self.__viewer.bw_pack_start_expand_fill(self.__texteditor)
+        self.__viewer._pack_noexpand_nofill(self.__select_combobox)
+        self.__viewer._pack_expand_fill(self.__texteditor)
 
         self.__text = list()
@@ -129 +134 @@
         # ports information
         number_of_ports = len(self.__node.get_info('ports'))
-        self.__ports_label = bw.BWLabel('Ports (%s)' % number_of_ports)
-
-        self.__ports_scroll = bw.BWScrolledWindow()
+        self.__ports_label = HIGLabel('Ports (%s)' % number_of_ports)
+
+        self.__ports_scroll = HIGScrolledWindow()
 
         self.__ports_store = gtk.TreeStore(gobject.TYPE_INT,
@@ -242 +247 @@
         number_of_xports = 0
 
-        self.__xports_scroll = bw.BWScrolledWindow()
+        self.__xports_scroll = HIGScrolledWindow()
 
         self.__xports_store = gtk.TreeStore(gobject.TYPE_INT,
@@ -293 +298 @@
 
         xports_label_text = 'Extraports (%s)' % number_of_xports
-        self.__xports_label = bw.BWLabel(xports_label_text)
+        self.__xports_label = HIGLabel(xports_label_text)
 
         self.__xports_scroll.add_with_viewport(self.__xports_treeview)
@@ -299 +304 @@
         self.append_page(self.__ports_scroll, self.__ports_label)
         self.append_page(self.__xports_scroll, self.__xports_label)
-        self.append_page(self.__viewer, bw.BWLabel('Special fields'))
+        self.append_page(self.__viewer, HIGLabel('Special fields'))
 
         if len(self.__text) > 0:
@@ -310 +315 @@
         id = self.__select_combobox.get_active()
 
-        self.__texteditor.bw_set_text(self.__text[id])
-
-
-
-class SystemPage(bw.BWScrolledWindow):
+        self.__texteditor._set_text(self.__text[id])
+
+
+
+class SystemPage(HIGScrolledWindow):
     """
     """
@@ -320 +325 @@
         """
         """
-        bw.BWScrolledWindow.__init__(self)
+        HIGScrolledWindow.__init__(self)
 
         self.__node = node
@@ -331 +336 @@
         """
         """
-        self.__vbox = bw.BWVBox()
+        self.__vbox = HIGVBox()
         self.__vbox.set_border_width(6)
 
         self.__cell = gtk.CellRendererText()
 
-        self.__general_frame = bw.BWExpander('General information')
-        self.__sequences_frame = bw.BWExpander('Sequences')
-        self.__os_frame = bw.BWExpander('Operating System')
-
-        self.__sequences_frame.bw_add(gtk.Label('No sequence information.'))
-        self.__os_frame.bw_add(gtk.Label('No OS information.'))
+        self.__general_frame = HIGExpanderRNet('General information')
+        self.__sequences_frame = HIGExpanderRNet('Sequences')
+        self.__os_frame = HIGExpanderRNet('Operating System')
+
+        self.__sequences_frame._add(gtk.Label('No sequence information.'))
+        self.__os_frame._add(gtk.Label('No OS information.'))
 
         # general information widgets
-        self.__general = bw.BWTable(3, 2)
-
-        self.__address_label = bw.BWSectionLabel('Address:')
+        self.__general = HIGTableRNet(3, 2)
+
+        self.__address_label = HIGSectionLabel('Address:')
         self.__address_list = gtk.combo_box_entry_new_text()
         self.__address_list.child.set_editable(False)
@@ -362 +367 @@
         self.__address_list.set_active(0)
 
-        self.__general.bw_attach_next(self.__address_label,
-                                      yoptions=gtk.FILL,
-                                      xoptions=gtk.FILL)
-        self.__general.bw_attach_next(self.__address_list, yoptions=gtk.FILL)
+        self.__general._attach_next(self.__address_label,
+                                    yoptions=gtk.FILL,
+                                    xoptions=gtk.FILL)
+        self.__general._attach_next(self.__address_list, yoptions=gtk.FILL)
 
         if self.__node.get_info('hostnames') != None:
 
-            self.__hostname_label = bw.BWSectionLabel('Hostname:')
+            self.__hostname_label = HIGSectionLabel('Hostname:')
             self.__hostname_list = gtk.combo_box_entry_new_text()
             self.__hostname_list.child.set_editable(False)
@@ -380 +385 @@
             self.__hostname_list.set_active(0)
 
-            self.__general.bw_attach_next(self.__hostname_label,
-                                          yoptions=gtk.FILL,
-                                          xoptions=gtk.FILL)
-            self.__general.bw_attach_next(self.__hostname_list,
-                                          yoptions=gtk.FILL)
+            self.__general._attach_next(self.__hostname_label,
+                                        yoptions=gtk.FILL,
+                                        xoptions=gtk.FILL)
+            self.__general._attach_next(self.__hostname_list,
+                                        yoptions=gtk.FILL)
 
         if self.__node.get_info('uptime') != None:
 
-            self.__uptime_label = bw.BWSectionLabel('Last boot:')
+            self.__uptime_label = HIGSectionLabel('Last boot:')
 
             seconds = self.__node.get_info('uptime')['seconds']
@@ -395 +400 @@
             text = '%s (%s seconds).' % (lastboot, seconds)
 
-            self.__uptime_value = bw.BWLabel(text)
+            self.__uptime_value = HIGLabel(text)
             self.__uptime_value.set_selectable(True)
             self.__uptime_value.set_line_wrap(False)
 
-            self.__general.bw_attach_next(self.__uptime_label,
-                                          yoptions=gtk.FILL,
-                                          xoptions=gtk.FILL)
-            self.__general.bw_attach_next(self.__uptime_value,
-                                          yoptions=gtk.FILL)
-
-        self.__general_frame.bw_add(self.__general)
+            self.__general._attach_next(self.__uptime_label,
+                                        yoptions=gtk.FILL,
+                                        xoptions=gtk.FILL)
+            self.__general._attach_next(self.__uptime_value,
+                                        yoptions=gtk.FILL)
+
+        self.__general_frame._add(self.__general)
         self.__general_frame.set_expanded(True)
 
         # sequences information widgets
-        self.__sequences = bw.BWTable(5, 3)
+        self.__sequences = HIGTableRNet(5, 3)
 
         sequences = self.__node.get_info('sequences')
@@ -415 +420 @@
         if len(sequences) > 0:
 
-            self.__sequences.attach(bw.BWSectionLabel('Class'), 1, 2, 0, 1)
-            self.__sequences.attach(bw.BWSectionLabel('Values'), 2, 3, 0, 1)
-
-            self.__sequences.attach(bw.BWSectionLabel('TCP *'), 0, 1, 1, 2)
-            self.__sequences.attach(bw.BWSectionLabel('IP ID'), 0, 1, 2, 3)
-            self.__sequences.attach(bw.BWSectionLabel('TCP Timestamp'),
+            self.__sequences.attach(HIGSectionLabel('Class'), 1, 2, 0, 1)
+            self.__sequences.attach(HIGSectionLabel('Values'), 2, 3, 0, 1)
+
+            self.__sequences.attach(HIGSectionLabel('TCP *'), 0, 1, 1, 2)
+            self.__sequences.attach(HIGSectionLabel('IP ID'), 0, 1, 2, 3)
+            self.__sequences.attach(HIGSectionLabel('TCP Timestamp'),
                                     0,
                                     1,
@@ -429 +434 @@
             tcp = sequences['tcp']
 
-            tcp_class = bw.BWLabel(tcp['class'])
+            tcp_class = HIGLabel(tcp['class'])
             tcp_class.set_selectable(True)
 
@@ -443 +448 @@
             self.__sequences.attach(tcp_values, 2, 3, 1, 2)
 
-            tcp_note = bw.BWLabel()
+            tcp_note = HIGLabel()
             tcp_note.set_selectable(True)
             tcp_note.set_line_wrap(False)
@@ -454 +459 @@
             ip_id = sequences['ip_id']
 
-            ip_id_class = bw.BWLabel(ip_id['class'])
+            ip_id_class = HIGLabel(ip_id['class'])
             ip_id_class.set_selectable(True)
 
@@ -471 +476 @@
             tcp_ts = sequences['tcp_ts']
 
-            tcp_ts_class = bw.BWLabel(tcp_ts['class'])
+            tcp_ts_class = HIGLabel(tcp_ts['class'])
             tcp_ts_class.set_selectable(True)
 
@@ -487 +492 @@
                 self.__sequences.attach(tcp_ts_values, 2, 3, 3, 4)
 
-            self.__sequences_frame.bw_add(self.__sequences)
+            self.__sequences_frame._add(self.__sequences)
 
         # operating system information widgets
@@ -499 +504 @@
             if os.has_key('matches'):
 
-                self.__match_scroll = bw.BWScrolledWindow()
+                self.__match_scroll = HIGScrolledWindow()
 
                 self.__match_store = gtk.ListStore(gobject.TYPE_INT,
@@ -536 +541 @@
                 self.__match_scroll.add_with_viewport(self.__match_treeview)
 
-                self.__os.append_page(self.__match_scroll, bw.BWLabel('Match'))
+                self.__os.append_page(self.__match_scroll, HIGLabel('Match'))
 
             if os.has_key('classes'):
 
-                self.__class_scroll = bw.BWScrolledWindow()
+                self.__class_scroll = HIGScrolledWindow()
 
                 self.__class_store = gtk.ListStore(gobject.TYPE_INT,
@@ -586 +591 @@
                 self.__class_scroll.add_with_viewport(self.__class_treeview)
 
-                self.__os.append_page(self.__class_scroll, bw.BWLabel('Class'))
-
-            self.__fp_viewer = bw.BWTextEditor()
-            self.__fp_viewer.bw_modify_font(self.__font)
-            self.__fp_viewer.bw_set_editable(False)
-            self.__fp_viewer.bw_set_text(os['fingerprint'])
-
-            self.__fp_ports = bw.BWHBox()
-            self.__fp_label = bw.BWSectionLabel('Used ports:')
+                self.__os.append_page(self.__class_scroll, HIGLabel('Class'))
+
+            self.__fp_viewer = HIGTextEditor()
+            self.__fp_viewer._modify_font(self.__font)
+            self.__fp_viewer._set_editable(False)
+            self.__fp_viewer._set_text(os['fingerprint'])
+
+            self.__fp_ports = HIGHBox()
+            self.__fp_label = HIGSectionLabel('Used ports:')
 
             self.__fp_ports_list = gtk.combo_box_entry_new_text()
             self.__fp_ports_list.child.set_editable(False)
 
-            self.__fp_vbox = bw.BWVBox()
+            self.__fp_vbox = HIGVBox()
 
             if os.has_key('used_ports'):
@@ -612 +617 @@
                 self.__fp_ports_list.set_active(0)
 
-                self.__fp_ports.bw_pack_start_noexpand_nofill(self.__fp_label)
-                self.__fp_ports.bw_pack_start_expand_fill(self.__fp_ports_list)
-
-                self.__fp_vbox.bw_pack_start_noexpand_nofill(self.__fp_ports)
-
-            self.__os.append_page(self.__fp_viewer, bw.BWLabel('Fingerprint'))
-            self.__fp_vbox.bw_pack_start_expand_fill(self.__os)
-
-            self.__os_frame.bw_add(self.__fp_vbox)
+                self.__fp_ports._pack_noexpand_nofill(self.__fp_label)
+                self.__fp_ports._pack_expand_fill(self.__fp_ports_list)
+
+                self.__fp_vbox._pack_noexpand_nofill(self.__fp_ports)
+
+            self.__os.append_page(self.__fp_viewer, HIGLabel('Fingerprint'))
+            self.__fp_vbox._pack_expand_fill(self.__os)
+
+            self.__os_frame._add(self.__fp_vbox)
             self.__os_frame.set_expanded(True)
 
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__general_frame)
-        self.__vbox.bw_pack_start_expand_fill(self.__os_frame)
-        self.__vbox.bw_pack_start_noexpand_nofill(self.__sequences_frame)
+        self.__vbox._pack_noexpand_nofill(self.__general_frame)
+        self.__vbox._pack_expand_fill(self.__os_frame)
+        self.__vbox._pack_noexpand_nofill(self.__sequences_frame)
 
         self.add_with_viewport(self.__vbox)
@@ -631 +636 @@
 
 
-class TraceroutePage(bw.BWVBox):
+class TraceroutePage(HIGVBox):
     """
     """
@@ -637 +642 @@
         """
         """
-        bw.BWVBox.__init__(self)
+        HIGVBox.__init__(self)
         self.set_border_width(6)
 
@@ -661 +666 @@
             self.__cell = gtk.CellRendererText()
 
-            self.__trace_scroll = bw.BWScrolledWindow()
+            self.__trace_scroll = HIGScrolledWindow()
             self.__trace_scroll.set_border_width(0)
 
@@ -725 +730 @@
                                  len(self.__node.get_info('trace')['hops']))
 
-            self.__trace_label = bw.BWLabel(TRACE_TEXT % self.__trace_info)
+            self.__trace_label = HIGLabel(TRACE_TEXT % self.__trace_info)
             self.__trace_label.set_use_markup(True)
 
-            self.bw_pack_start_expand_fill(self.__trace_scroll)
-            self.bw_pack_start_noexpand_nofill(self.__trace_label)
+            self._pack_expand_fill(self.__trace_scroll)
+            self._pack_noexpand_nofill(self.__trace_label)

trunk/umitGUI/radialnet/NodeWindow.py

@@ -22 +22 @@
 import pango
 
-import bestwidgets as bw
+#import bestwidgets as bw
 import higwidgets.drawing as drawing
 
@@ -28 +28 @@
 from umitGUI.radialnet.NodeNotebook import NodeNotebook
 
+from higwidgets.higboxes import HIGBox, HIGHBox, HIGVBox
+from higwidgets.higlabels import HIGSectionLabel
+from higwidgets.higwindows import HIGWindow
 
 DIMENSION_NORMAL = (600, 400)
@@ -34 +37 @@
 
 
-class NodeWindow(bw.BWWindow):
+class NodeWindow(HIGWindow):
     """
     """
@@ -40 +43 @@
         """
         """
-        bw.BWWindow.__init__(self, gtk.WINDOW_POPUP)
+        HIGWindow.__init__(self, gtk.WINDOW_POPUP)
         self.set_decorated(False)
         self.set_keep_above(True)
@@ -78 +81 @@
         """
         """
-        self.__content = bw.BWVBox()
-        self.__head = bw.BWHBox(spacing=2)
+        self.__content = HIGVBox()
+        self.__head = HIGHBox(spacing=2)
 
         self.__notebook = NodeNotebook(self.__node)
@@ -102 +105 @@
         self.__title += self.__node.get_info('ip')
 
-        self.__title_label = bw.BWSectionLabel(self.__title)
+        self.__title_label = HIGSectionLabel(self.__title)
         self.__title_label.modify_font(self.__title_font)
 
@@ -122 +125 @@
 
         # packing head elements
-        self.__head.bw_pack_start_noexpand_nofill(self.__color_box)
-        self.__head.bw_pack_start_expand_fill(self.__title_label)
-        self.__head.bw_pack_start_noexpand_nofill(self.__collapse_box)
-        self.__head.bw_pack_start_noexpand_nofill(self.__close_box)
+        self.__head._pack_start_noexpand_nofill(self.__color_box)
+        self.__head._pack_expand_fill(self.__title_label)
+        self.__head._pack_start_noexpand_nofill(self.__collapse_box)
+        self.__head._pack_start_noexpand_nofill(self.__close_box)
 
         # packing all to content
-        self.__content.bw_pack_start_noexpand_nofill(self.__head)
-        self.__content.bw_pack_start_expand_fill(self.__notebook)
+        self.__content._pack_start_noexpand_nofill(self.__head)
+        self.__content._pack_expand_fill(self.__notebook)
 
         # add context to window

trunk/umitGUI/radialnet/Toolbar.py

@@ -22 +22 @@
 import gobject
 
-import bestwidgets as bw
+#import bestwidgets as bw
 from umitGUI.radialnet.HostsViewer import HostsViewer
 

trunk/umitGUI/radialnet/__init__.py

@@ +1 @@
+__all__ = ["higwidgets", "core", "gui", "util"]