Merge Network interface

3 files changed, 38 insertions, 17 deletions

diff --git a/logviewer.py b/logviewer.py
index 9e62f5c..903d515 100644
--- a/logviewer.py
+++ b/logviewer.py
@@ -31,6 +31,7 @@ from sugar.activity import activity
 from sugar import env
 from sugar.graphics.toolbutton import ToolButton
 from ps_watcher import PresenceServiceNameWatcher
+from network import NetworkView
 
 class MultiLogView(gtk.VBox):
     def __init__(self, path, extra_files):
@@ -236,6 +237,7 @@ class LogHandler(activity.Activity):
 
         self._viewer = MultiLogView(main_path, ext_files).hbox
         self._ps = PresenceServiceNameWatcher(dbus.SessionBus())
+        self._network = NetworkView()
 
         self._box = gtk.HBox()
         self._box.pack_start(self._viewer)
@@ -260,31 +262,50 @@ class LogHandler(activity.Activity):
         toolbar.keep.hide()
 
     def switch_to_logviewer(self):
-        self._box.remove(self._box.get_children()[0])
+        self._clean_box()
         self._box.pack_start(self._viewer)
-      
+
     def switch_to_presence(self):
-        self._box.remove(self._box.get_children()[0])
+        self._clean_box()
         self._box.pack_start(self._ps)
 
+    def switch_to_network(self):
+        self._clean_box()
+        self._box.pack_start(self._network)
+
+    def _clean_box(self):
+        childs = self._box.get_children()
+        for c in childs:
+            self._box.remove(c)
+
 class LogToolbar(gtk.Toolbar):
     def __init__(self, handler):
         gtk.Toolbar.__init__(self)
         self._handler = handler
-        self._logviewer = ToolButton('zoom-best-fit')
-        self._logviewer.set_tooltip(_('Log Viewer'))
-        self._logviewer.connect('clicked', self._on_logviewer_clicked_cb)
-        self.insert(self._logviewer, -1)
-        self._logviewer.show()
-
-        self._presence = ToolButton('computer-xo')
-        self._presence.set_tooltip(_('Presence Service'))
-        self._presence.connect('clicked', self._on_presence_clicked_cb)
-        self.insert(self._presence, -1)
-        self._presence.show()
+        
+        logviewer = ToolButton('zoom-best-fit')
+        logviewer.set_tooltip(_('Log Viewer'))
+        logviewer.connect('clicked', self._on_logviewer_clicked_cb)
+        self.insert(logviewer, -1)
+        logviewer.show()
+
+        network = ToolButton('network-wireless-060')
+        network.set_tooltip(_('Network Status'))
+        network.connect('clicked', self._on_network_clicked_cb)
+        self.insert(network, -1)
+        network.show()
+
+        presence = ToolButton('computer-xo')
+        presence.set_tooltip(_('Presence Service'))
+        presence.connect('clicked', self._on_presence_clicked_cb)
+        self.insert(presence, -1)
+        presence.show()
 
     def _on_logviewer_clicked_cb(self, widget):
         self._handler.switch_to_logviewer()
 
     def _on_presence_clicked_cb(self, widget):
         self._handler.switch_to_presence()
+
+    def _on_network_clicked_cb(self, widget):
+        self._handler.switch_to_network()
diff --git a/netdevice.py b/netdevice.py
index fb6ae5d..c739ba3 100644
--- a/netdevice.py
+++ b/netdevice.py
@@ -19,7 +19,7 @@ import fcntl
 import struct
 import string
 
-class NetDevice:
+class NetDevice(object):
     def __init__(self):
         self._dev = self.get_interfaces()
 
diff --git a/network.py b/network.py
index d2b2cca..2bd867d 100644
--- a/network.py
+++ b/network.py
@@ -17,7 +17,7 @@
 
 import gobject
 from netdevice import NetDevice
-from ui.treeview import TreeView
+from treeview import TreeView
 
 class NetworkView(TreeView):
     def __init__(self):
@@ -35,7 +35,7 @@ class NetworkView(TreeView):
         cols_type = [str, str, str, str, str, str, str, str]
         TreeView.__init__(self, cols_type, col_names)
 
-        self._dev = Device()
+        self._dev = NetDevice()
         self.show_all()
         gobject.timeout_add(1500, self._update_data)