Merge lp:~donadigo/switchboard-plug-networking/wifi-page-status into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

This branch fixes the bug #1479940. Wifi item now uses status from wifi page instead of enable / disable states. This needed some code refactoring from the ground because of how currently the wifi page is created in the plug.

[Adam Bieńkowski (donadigo)]

The branch will no longer be merged to the trunk as of the new branch that has merged this one.

Unmerged revisions

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-07-30 20:10:55 +0000
+++ src/Plug.vala	2015-08-01 11:43:57 +0000
@@ -42,13 +42,11 @@
         private Gtk.Grid? main_grid = null;
         private Gtk.Stack content;
         private Gtk.ScrolledWindow scrolled_window;
-        private Widgets.DevicePage page;
+        private Widgets.Page page;
         private Widgets.DeviceList device_list;
         private Widgets.Footer footer;   
         private Widgets.InfoScreen no_devices;
 
-        private uint8 wifi_page_id = 0;
-
         public Plug () {
             Object (category: Category.NETWORK,
                     code_name: Build.PLUGCODENAME,
@@ -96,8 +94,6 @@
                 paned.pack2 (content, true, true);
                 paned.set_position (240);
 
-                device_list.wifi_device_detected.connect (setup_wifi_page);
-
                 device_list.init ();
                 connect_signals ();
                 device_list.select_first_item ();
@@ -110,31 +106,6 @@
             return main_grid;
         }
 
-        private void setup_wifi_page (NM.DeviceWifi? device) {
-            device_list.create_wifi_entry ();
-
-            var wifi_page = new Widgets.WiFiPage (device as NM.DeviceWifi);
-            wifi_page.list_connections ();
-            
-            string string_id = "wifi-page-%i".printf (wifi_page_id);
-            content.add_named (wifi_page, string_id);
-
-            update_wifi_status ();
-            client.notify["wireless-enabled"].connect (() => {
-                update_wifi_status ();
-                wifi_page.info_box.info_changed ();
-            });
-            
-            device_list.wifi.activate.connect (() => {
-                if (content.get_visible_child_name () != string_id)
-                    content.set_visible_child (wifi_page);
-
-                current_device = null;
-            });
-
-            wifi_page_id++;
-        }
-
         /* Main function to connect all the signals */
         private void connect_signals () {
             device_list.create_proxy_entry ();
@@ -158,7 +129,12 @@
 
             device_list.row_changed.connect ((row) => {
                 if ((row as Widgets.DeviceItem).get_item_device () != current_device) {
-                    page = new Widgets.DevicePage.from_owner (row as Widgets.DeviceItem); 
+                    if ((row as Widgets.DeviceItem).get_item_device ().get_device_type () == NM.DeviceType.WIFI) {
+                        page = new Widgets.WiFiPage (((Widgets.DeviceItem) row));   
+                    } else {
+                        page = new Widgets.DevicePage.from_owner (row as Widgets.DeviceItem); 
+                    }
+
                     content.add (page);
                     content.set_visible_child (page);
                     
@@ -198,14 +174,6 @@
             });
         }
 
-        private void update_wifi_status () {
-            if (client.wireless_get_enabled ()) {
-                device_list.wifi.switch_status (null, "wifi-enabled");
-            } else {
-                device_list.wifi.switch_status (null, "wifi-disabled");
-            }
-        }
-
         private void show_error_dialog () {
             var error_dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, " ");
             error_dialog.text = _("Could not enable device: there are no available
 
=== modified file 'src/Widgets/Device/DeviceItem.vala'
--- src/Widgets/Device/DeviceItem.vala	2015-07-23 21:29:23 +0000
+++ src/Widgets/Device/DeviceItem.vala	2015-08-01 11:43:57 +0000
@@ -44,10 +44,19 @@
             create_ui (icon_name);
         }
 
-        public DeviceItem.from_device (NM.Device _device, string _icon_name = "network-wired", bool _special = false) {
+        public DeviceItem.from_device (NM.Device _device,
+                                    string _icon_name = "network-wired",
+                                    bool _special = false,
+                                    string _title = "") {
             this.special = _special;
             this.device = _device;
-            this.title = Utils.type_to_string (device.get_device_type ());
+
+            if (_title != "") {
+               this.title = _title;
+            } else {
+               this.title = Utils.type_to_string (device.get_device_type ());
+            }
+           
             this.subtitle = "";
             this.icon_name = _icon_name;
 
@@ -148,14 +157,6 @@
                         row_description.label = _("Enabled (auto mode)");
                         status_image.icon_name = "user-available";
                         break;
-                    case "wifi-enabled":
-                        row_description.label = _("Enabled");
-                        status_image.icon_name = "user-available";
-                        break;
-                    case "wifi-disabled":
-                        row_description.label = _("Disabled");
-                        status_image.icon_name = "user-busy";
-                        break;
                }
            }
 
 
=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2015-07-22 20:52:07 +0000
+++ src/Widgets/DeviceList.vala	2015-08-01 11:43:57 +0000
@@ -24,7 +24,6 @@
     public class DeviceList : Gtk.ListBox {
         public signal void row_changed (Gtk.ListBoxRow row);
         public signal void show_no_devices (bool show);
-        public signal void wifi_device_detected (NM.DeviceWifi? d);
         
         public NM.Client client;
         public DeviceItem wifi = null;
@@ -37,6 +36,8 @@
         private Gtk.Label settings_l;
         private Gtk.Label devices_l;
 
+        private int wireless_item = 0;
+
         public DeviceList (NM.Client _client) {
             this.selection_mode = Gtk.SelectionMode.SINGLE;
             this.activate_on_single_click = true;  
@@ -112,7 +113,15 @@
 
         private void add_device_to_list (NM.Device device) {
             if (device.get_device_type () == NM.DeviceType.WIFI) {
-                this.wifi_device_detected (device as NM.DeviceWifi);
+                string title = _("Wireless");
+                if (wireless_item > 0) {
+                    title += " " + wireless_item.to_string ();
+                }
+
+                item = new DeviceItem.from_device (device, "network-wireless", false, title);  
+                items.append (item);
+                this.add (item);  
+                wireless_item++;                 
                 return;
             }
 
@@ -144,12 +153,6 @@
             items = new_items.copy ();
         }
 
-        public void create_wifi_entry () {
-            wifi = new DeviceItem (_("Wireless"), "", "network-wireless");  
-            items.append (wifi);
-            this.add (wifi);            
-        }
-  
         public void create_proxy_entry () {
             proxy = new DeviceItem (_("Proxy"), "", "preferences-system-network", true);
             this.add (proxy);  
 
=== modified file 'src/Widgets/WiFi/WiFiPage.vala'
--- src/Widgets/WiFi/WiFiPage.vala	2015-07-24 17:42:48 +0000
+++ src/Widgets/WiFi/WiFiPage.vala	2015-08-01 11:43:57 +0000
@@ -32,12 +32,12 @@
         /* When access point added insert is on top */
         private bool insert_on_top = true;
 
-        public WiFiPage (NM.DeviceWifi? wifidevice) {
-            this.device = wifidevice;
+        public WiFiPage (DeviceItem owner) {
+            this.device = ((NM.DeviceWifi) owner.get_item_device ());
             this.icon_name = "network-wireless";
             this.title = _("Wi-Fi Network");
-            info_box = new InfoBox.from_device (device);
-            this.init (wifidevice, info_box);
+            info_box = new InfoBox.from_owner (owner);
+            this.init (device, info_box);
 
             entries = new List<WiFiEntry> ();