diff options
author | Eduardo Silva <edsiper@gmail.com> | 2007-10-30 02:42:17 (GMT) |
---|---|---|
committer | Eduardo Silva <edsiper@gmail.com> | 2007-10-30 02:42:17 (GMT) |
commit | 7be570bd51282bc52f324da5612cb3c360cff0d6 (patch) | |
tree | 2c1b8f20bdfebd1531a75fe8ad359b875733dcbf /logviewer.py | |
parent | cfd52a376ef7206a13d2a1af0ad822a98742c170 (diff) |
Merge Network interface
Diffstat (limited to 'logviewer.py')
-rw-r--r-- | logviewer.py | 49 |
1 files changed, 35 insertions, 14 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() |