Merge lp:~stefan-schwarzburg/qreator/wifi_sorting into lp:qreator

[Schwarzburg]

This branch adds a sorting feature to the Wifi signals. The wifi signals are updated, sorted and now also feature an icon.

[Schwarzburg (stefan-schwarzburg)]

David already stated that he had looked at this branch, and is ok with merging.
So I will go ahead and merge it.

review: Approve

[David Planella (dpm)]

Al 28/02/13 14:02, En/na Schwarzburg ha escrit:
> Review: Approve
>
> David already stated that he had looked at this branch, and is ok with merging.
> So I will go ahead and merge it.
>

Thanks!

=== modified file 'data/ui/QrCodeWifi.ui'
--- data/ui/QrCodeWifi.ui	2012-12-01 16:17:02 +0000
+++ data/ui/QrCodeWifi.ui	2013-02-27 14:13:42 +0000
@@ -121,13 +121,12 @@
       </packing>
     </child>
     <child>
-      <object class="GtkComboBoxText" id="comboboxtextSSID">
+      <object class="GtkComboBox" id="comboboxSSID">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="has_entry">True</property>
         <property name="entry_text_column">0</property>
-        <property name="id_column">1</property>
-        <signal name="changed" handler="on_comboboxtextSSID_changed" swapped="no"/>
+        <signal name="changed" handler="on_comboboxSSID_changed" swapped="no"/>
         <child internal-child="entry">
           <object class="GtkEntry" id="entrySSID">
             <property name="can_focus">True</property>

=== modified file 'qreator/qrcodes/QRCodeWifiGtk.py'
--- qreator/qrcodes/QRCodeWifiGtk.py	2012-11-22 12:37:55 +0000
+++ qreator/qrcodes/QRCodeWifiGtk.py	2013-02-27 14:13:42 +0000
@@ -17,7 +17,7 @@
 from GtkHelpers import clear_text_entry, show_clear_icon
 from qreator_lib.i18n import _
 from qreator_lib.helpers import get_data_file
-from gi.repository import Gtk, NetworkManager, NMClient
+from gi.repository import Gtk, NetworkManager, NMClient, GLib, GdkPixbuf
 
 
 class QRCodeWifiGtk(object):
@@ -32,9 +32,27 @@
 
         self.comboboxtextSecurity = self.builder.get_object(
             'comboboxtextSecurity')
+        self.entryPassword = self.builder.get_object('entryPassword')
+
+        # SSID
         self.entrySSID = self.builder.get_object('entrySSID')
-        self.entryPassword = self.builder.get_object('entryPassword')
-        self.comboboxtextSSID = self.builder.get_object('comboboxtextSSID')
+        self.comboboxSSID = self.builder.get_object('comboboxSSID')
+        self.SSIDmodel = Gtk.ListStore(str, GdkPixbuf.Pixbuf)
+        self.comboboxSSID.set_model(self.SSIDmodel)
+
+        # create the renderers for the strength
+        # for some reason, the text renderer already works
+        strengthcell = Gtk.CellRendererPixbuf()
+        self.comboboxSSID.pack_start(strengthcell, False)
+        self.comboboxSSID.add_attribute(strengthcell, 'pixbuf', 1)
+
+        icontheme = Gtk.IconTheme.get_default()
+        size = 24
+        self.strength_pixbufs = []
+        for strength in ["weak", "ok", "good", "excellent"]:
+            self.strength_pixbufs.append(icontheme.load_icon(
+                "network-wireless-signal-{0}-symbolic".format(strength),
+                size, Gtk.IconLookupFlags.USE_BUILTIN))
 
         # Initialize combo boxes (Glade seems not to do it for us)
         self.comboboxtextSecurity.set_active(0)
@@ -46,10 +64,24 @@
         self.entryPassword.set_placeholder_text(_('[Network password]'))
 
     def update_ssids(self):
+        # check if there are already ssids in the combobox
+        ssidlistmodel = self.comboboxSSID.get_model()
+        ssidelements = []
+        item = ssidlistmodel.get_iter_first()
+        while not item is None:
+            ssidelements.append(ssidlistmodel.get_value(item, 0))
+            item = ssidlistmodel.iter_next(item)
+        
+        # get the new ssids from the network manager
+        # and add them to combobox
         ssids = get_ssids()
         for ssid in ssids:
-            # TODO: clear combobox
-            self.comboboxtextSSID.append_text(ssid)
+            if not ssid[1] in ssidelements:
+                p = self.strength_pixbufs[ssid[0] // 25]
+                self.SSIDmodel.append([ssid[1], p])
+                self.comboboxSSID.set_model(self.SSIDmodel)
+
+        return True  # -> repeat the timeout calls
 
     def update_wifi_qr_code(self, security=None, ssid=None, password=None):
         if not security:
@@ -72,9 +104,9 @@
     def on_entrySSID_icon_press(self, widget, icon, mouse_button):
         clear_text_entry(widget, icon)
 
-    def on_comboboxtextSSID_changed(self, widget, data=None):
+    def on_comboboxSSID_changed(self, widget, data=None):
         show_clear_icon(self.entrySSID)
-        self.update_wifi_qr_code(ssid=widget.get_active_text())
+        self.update_wifi_qr_code(ssid=widget.get_child().get_text())
 
     def on_entryPassword_icon_press(self, widget, icon, mouse_button):
         clear_text_entry(widget, icon)
@@ -90,13 +122,15 @@
             self.entryPassword.set_visibility(False)
 
     def on_activated(self):
-        self.update_ssids()
+        pass
 
     def on_prepared(self):
-        pass
+        # check for new ssids every 5 seconds
+        GLib.timeout_add_seconds(5, self.update_ssids)
 
 
 def get_ssids():
+    """Returns a list of ssids sorted by the signal strength."""
     nmc = NMClient.Client.new()
     devs = nmc.get_devices()
 
@@ -104,6 +138,7 @@
     for dev in devs:
         if dev.get_device_type() == NetworkManager.DeviceType.WIFI:
             for ap in dev.get_access_points():
-                ssids.append(ap.get_ssid())
-
+                ssids.append((ap.get_strength(), ap.get_ssid()))
+    ssids.sort()
+    ssids.reverse()   # strongest has the highest number -> should be first
     return ssids