Ticket #1652: 0001-3G-Connection-Info.2.patch

extensions/deviceicon/network.py

@@ -23 +23 @@
 import socket
 import struct
 import re
-
+import datetime
+import time
 import gtk
 import gobject
 import gconf
@@ -52 +53 @@
 _NM_DEVICE_IFACE = 'org.freedesktop.NetworkManager.Device'
 _NM_WIRED_IFACE = 'org.freedesktop.NetworkManager.Device.Wired'
 _NM_WIRELESS_IFACE = 'org.freedesktop.NetworkManager.Device.Wireless'
+_NM_SERIAL_IFACE = 'org.freedesktop.NetworkManager.Device.Serial'
 _NM_OLPC_MESH_IFACE = 'org.freedesktop.NetworkManager.Device.OlpcMesh'
 _NM_ACCESSPOINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
 _NM_ACTIVE_CONN_IFACE = 'org.freedesktop.NetworkManager.Connection.Active'
@@ -220 +222 @@
                                  gobject.TYPE_NONE, ([])),
     }
 
+    def _add_widget_with_padding(self, child, xalign=0, yalign=0.5):
+            alignment = gtk.Alignment(xalign=xalign, yalign=yalign,
+                                   xscale=1, yscale=0.33)
+            alignment.set_padding(style.DEFAULT_SPACING,
+                               style.DEFAULT_SPACING,
+                               style.DEFAULT_SPACING,
+                               style.DEFAULT_SPACING)
+            alignment.add(child)
+            return alignment
+
     def __init__(self):
+
         Palette.__init__(self, label=_('Wireless modem'))
 
         self._current_state = None
@@ -232 +245 @@
 
         self.set_state(_GSM_STATE_NOT_READY)
 
+        self.info_box = gtk.VBox()
+
+        self._data_label = gtk.Label()
+        self._data_label.props.xalign = 0.0
+        label_alignment = self._add_widget_with_padding(self._data_label) 
+        self.info_box.pack_start(label_alignment)
+        self._data_label.show()
+        label_alignment.show()
+
+        self._conn_time_label = gtk.Label()
+        self._conn_time_label.props.xalign = 0.0
+        label_alignment = self._add_widget_with_padding(self._conn_time_label) 
+        self.info_box.pack_start(label_alignment)
+        self._conn_time_label.show()
+        label_alignment.show()
+
+        self.info_box.show()
+        self.set_content(self.info_box)
+
     def set_state(self, state):
         self._current_state = state
         self._update_label_and_text()
@@ -683 +715 @@
     FRAME_POSITION_RELATIVE = 303
 
     def __init__(self, device):
+        self._connection_time_handler = None
+        self._connection_timestamp = 0
+
         client = gconf.client_get_default()
         color = xocolor.XoColor(client.get_string('/desktop/sugar/user/color'))
 
@@ -697 +732 @@
                                       signal_name='StateChanged',
                                       path=self._device.object_path,
                                       dbus_interface=_NM_DEVICE_IFACE)
-
+        self._bus.add_signal_receiver(self.__ppp_stats_changed_cb,
+                                      signal_name='PppStats',
+                                      path=self._device.object_path,
+                                      dbus_interface=_NM_SERIAL_IFACE)
     def create_palette(self):
         palette = GsmPalette()
 
@@ -770 +808 @@
 
         if state is network.DEVICE_STATE_ACTIVATED:
             gsm_state = _GSM_STATE_CONNECTED
-
-        elif state is network.DEVICE_STATE_DISCONNECTED:
+            connection = network.find_gsm_connection()
+            if connection is not None:
+                connection.set_connected()
+                self._connection_timestamp =  time.time() - connection.get_settings().connection.timestamp
+                self._connection_time_handler = gobject.timeout_add(1000, self.__connection_timecount_cb) 
+                self._update_stats(0, 0)
+                self._update_connectiontime()                
+                self._palette.info_box.show() 
+
+        if state is network.DEVICE_STATE_DISCONNECTED:
             gsm_state = _GSM_STATE_DISCONNECTED
+            self._connection_timestamp = 0
+            if self._connection_time_handler is not None:
+                gobject.source_remove(self._connection_time_handler)
+            self._palette.info_box.hide() 
 
         elif state in [network.DEVICE_STATE_UNMANAGED,
                        network.DEVICE_STATE_UNAVAILABLE,
@@ -792 +842 @@
                                          signal_name='StateChanged',
                                          path=self._device.object_path,
                                          dbus_interface=_NM_DEVICE_IFACE)
-
+        
+    def __ppp_stats_changed_cb(self, in_bytes, out_bytes):
+        self._update_stats(in_bytes, out_bytes)
+
+    def _update_stats(self, in_bytes, out_bytes):
+        in_kbytes = in_bytes / 1024
+        out_kbytes = out_bytes / 1024
+        self._palette._data_label.set_text(_("Data sent %d kb / received %d kb") % (out_kbytes ,in_kbytes))
+
+    def __connection_timecount_cb(self):
+        self._connection_timestamp = self._connection_timestamp + 1
+        self._update_connectiontime()
+        return True
+
+    def _update_connectiontime(self):
+        connection_time = datetime.datetime.fromtimestamp(self._connection_timestamp)
+        self._palette._conn_time_label.set_text(_("Connection time ") + connection_time.strftime('%H : %M : %S'))
+    
 class WirelessDeviceObserver(object):
     def __init__(self, device, tray, device_type):
         self._device = device

src/jarabe/model/network.py

@@ -350 +350 @@
         self._secrets = secrets
 
     def set_connected(self):
-        if not self._settings.connection.autoconnect:
-            self._settings.connection.autoconnect = True
-            self._settings.connection.timestamp = int(time.time())
-            if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
-                self.save()
+        if self._settings.connection.type == NM_CONNECTION_TYPE_GSM:
+             self._settings.connection.timestamp = int(time.time())
+        else:
+            if not self._settings.connection.autoconnect:
+                self._settings.connection.autoconnect = True
+                self._settings.connection.timestamp = int(time.time())
+                if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
+                    self.save()
 
     def set_secrets(self, secrets):
         self._secrets = secrets