Merge lp:~donadigo/switchboard-plug-networking/page-in-deviceitem into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Soft-code page switching.
* Page variable directly in DeviceItem.
* Do not hardcode proxy item.
* Removed unused methods.
* ProxyPage: changed tabs to spaces.
* Code clean.

This is the new version of page-in-deviceitem refreshed for new revision.

***
The goal here is to remove as much hard-coded functions as possible. Creating page variable directly in the DeviceItem allows us to easily add and manage switching pages just by getting the variable from the device item. In consequence proxy page is no longer a "special" item but normal item that has it's page.

[xapantu (xapantu)]

There are several minor bugs, but I'm going to report them and we can fix them later.

review: Approve

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-09-11 12:46:58 +0000
+++ src/Plug.vala	2015-10-20 20:37:51 +0000
@@ -47,20 +47,24 @@
 
 
         protected override void add_interface (WidgetNMInterface widget_interface) {
-            device_list.add_device_to_list (widget_interface.device);
-            content.add(widget_interface);
+            device_list.add_device_to_list (widget_interface);
+
+            select_first ();
+            show_all ();
+        }
+
+        protected override void remove_interface (WidgetNMInterface widget_interface) {
+            device_list.remove_device_from_list (widget_interface.device);
+            content.remove (widget_interface);
             
+            select_first ();
+            show_all ();
+        }
+
+        private void select_first () {
             if (network_interface.length () <= 1) {
                 device_list.select_first_item ();
-            }
-            show_all ();
-        }
-
-        protected override void remove_interface (WidgetNMInterface widget_interface) {
-            device_list.remove_device_from_list (widget_interface.device);
-            content.remove(widget_interface);
-            
-            show_all ();
+            }           
         }
 
         protected override void build_ui () {
@@ -70,7 +74,7 @@
             content = new Gtk.Stack ();
 
             var sidebar = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            device_list = new Widgets.DeviceList (client);
+            device_list = new Widgets.DeviceList ();
 
             footer = new Widgets.Footer (client);
             footer.hexpand = false;
@@ -109,34 +113,14 @@
 
         /* Main function to connect all the signals */
         private void connect_signals () {
-            device_list.create_proxy_entry ();
-
-            var proxy_page = new Widgets.ProxyPage ();
-            proxy_page.stack.set_visible_child_name ("configuration");
-
-            proxy_page.update_status_label.connect ((mode) => {
-                device_list.proxy.switch_status (null, mode);
-            });
-
-            proxy_page.update_mode ();
-
-            content.add_named (proxy_page, "proxy-page");
-            device_list.proxy.activate.connect (() => {
-                if (content.get_visible_child_name () != "proxy-page")
-                    content.set_visible_child (proxy_page);
-
-                current_device = null;
-            });
-
-            device_list.row_changed.connect ((row) => {
-                NM.Device device = (row as Widgets.DeviceItem).get_item_device ();
-                foreach(var w in network_interface) {
-                    if(w.is_device(device)) {
-                        content.set_visible_child(w);
-                    }
+            device_list.row_activated.connect ((row) => {
+                if (!Utils.list_contains (content.get_children (), ((Widgets.DeviceItem) row).page)) {
+                    content.add (((Widgets.DeviceItem) row).page);
                 }
+
+                content.visible_child = ((Widgets.DeviceItem) row).page;
             });
-
+            
             device_list.show_no_devices.connect ((show) => {
                 if (show) {
                     content.set_visible_child (no_devices);
 
=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-10-09 19:12:42 +0000
+++ src/Utils.vala	2015-10-20 20:37:51 +0000
@@ -1,21 +1,11 @@
 namespace Network.Utils {
-    public static Polkit.Permission? permission = null;
-
-    public static Polkit.Permission? get_permission () {
-            if (permission != null)
-                return permission;
-            try {
-                var user = Polkit.UnixUser.new_for_name (Environment.get_user_name ()) as Polkit.UnixUser;
-                permission = new Polkit.Permission.sync ("org.freedesktop.NetworkManager.settings.modify.hostname",
-                                                        Polkit.UnixProcess.new_for_owner (Posix.getpid (), 0, user.get_uid ()));
-                return permission;
-            } catch (Error e) {
-                critical (e.message);
-                return null;
-            }
+    public enum ItemType {
+        DEVICE = 0,
+        PROXY,
+        INVALID
     }
 
-    public new Gtk.Button get_advanced_button_from_device (NM.Device? device, string title = _("Advanced Settings…")) {
+    public Gtk.Button get_advanced_button_from_device (NM.Device? device, string title = _("Advanced Settings…")) {
         var details_btn = new Gtk.Button.with_label (title);
         details_btn.clicked.connect (() => {
             new Granite.Services.SimpleCommand ("/usr/bin",
@@ -25,6 +15,16 @@
         return details_btn;
     }
     
+    public bool list_contains (List list, List.G data) {
+      foreach (var unit in list.copy ()) {
+            if (unit == data) {
+                return true;
+             }
+        }
+
+        return false;
+    }
+
     public string state_to_string (NM.DeviceState state) {
         switch (state) {
             case NM.DeviceState.ACTIVATED:
 
=== modified file 'src/Widgets/Device/DeviceItem.vala'
--- src/Widgets/Device/DeviceItem.vala	2015-10-08 19:04:34 +0000
+++ src/Widgets/Device/DeviceItem.vala	2015-10-20 20:37:51 +0000
@@ -22,7 +22,10 @@
 
 namespace Network.Widgets {
     public class DeviceItem : Gtk.ListBoxRow {
-        public bool special = false;
+        public NM.Device? device = null;
+        public Gtk.Box? page = null;
+        public Utils.ItemType type;
+
         public Gtk.Label row_description;
         private Gtk.Image row_image;
         private Gtk.Image status_image;
@@ -33,24 +36,23 @@
 
         private Gtk.Grid row_grid;
         private Gtk.Label row_title;
-        public NM.Device device = null;
 
-        public DeviceItem (string _title, string _subtitle, string _icon_name = "network-wired", bool _special = false) {
-            this.special = _special;
+        public DeviceItem (string _title, string _subtitle, string _icon_name = "network-wired") {
             this.title = _title;
             this.subtitle = _subtitle;
             this.icon_name = _icon_name;
+            this.type = Utils.ItemType.INVALID;
 
             create_ui (icon_name);
         }
 
-        public DeviceItem.from_device (NM.Device _device,
+        public DeviceItem.from_interface (WidgetNMInterface iface,
                                     string _icon_name = "network-wired",
-                                    bool _special = false,
                                     string _title = "") {
-            this.special = _special;
-            this.device = _device;
-
+            this.page = iface;
+            this.device = iface.device;
+            this.type = Utils.ItemType.DEVICE;
+            
             if (_title != "") {
                 this.title = _title;
             } else {
 
=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2015-10-08 19:04:34 +0000
+++ src/Widgets/DeviceList.vala	2015-10-20 20:37:51 +0000
@@ -22,7 +22,6 @@
 
 namespace Network.Widgets {
     public class DeviceList : Gtk.ListBox {
-        public signal void row_changed (Gtk.ListBoxRow row);
         public signal void show_no_devices (bool show);
         
         public NM.Client client;
@@ -37,12 +36,11 @@
 
         private int wireless_item = 0;
 
-        public DeviceList (NM.Client _client) {
+        public DeviceList () {
             this.selection_mode = Gtk.SelectionMode.SINGLE;
             this.activate_on_single_click = true;  
             this.set_header_func (update_headers);
 
-            client = _client;
             items = new List<DeviceItem> ();
 
             settings_l = new Gtk.Label (_("Virtual"));
@@ -53,54 +51,42 @@
             devices_l.get_style_context ().add_class ("h4");
             devices_l.halign = Gtk.Align.START;
 
-            this.row_selected.connect ((row) => {
-                if (row != null) {
-                    if (row == proxy) {
-                        proxy.activate ();
-                        return;
-                    }
-
-                    if (wifi == null || row != wifi) {
-                        row_changed (row);
-                    } else if (wifi != null && row == wifi) {
-                        wifi.activate ();
-                    }
-                }
-            });
-
             bool show = (items.length () > 0);
             this.show_no_devices (!show);
+            this.add_proxy ();
         }
 
-        public void add_device_to_list (NM.Device device) {
-            if (device.get_device_type () == NM.DeviceType.WIFI) {
+         
+        public void add_device_to_list (WidgetNMInterface iface) {
+            if (iface.device.get_device_type () == NM.DeviceType.WIFI) {
                 string title = _("Wireless");
                 if (wireless_item > 0) {
-                    title += " " + wireless_item.to_string ();
+                    title += SUFFIX + wireless_item.to_string ();
                 }
 
-                item = new DeviceItem.from_device (device, "network-wireless", false, title);  
+                item = new DeviceItem.from_interface (iface, "network-wireless", title);
                 wireless_item++;
             } else {
 
-                if (!device.get_managed ()) {
-                    warning("Unmanaged device? probably something that has just been added…");
+                if (!iface.device.get_managed ()) {
+                    warning ("Unmanaged device, probably something that has just been added.");
                 }
-                if (device.get_iface ().has_prefix ("usb")) {
-                    item = new DeviceItem.from_device (device, "drive-removable-media");
+
+                if (iface.device.get_iface ().has_prefix ("usb")) {
+                    item = new DeviceItem.from_interface (iface, "drive-removable-media");
                 } else {
-                    item = new DeviceItem.from_device (device);
+                    item = new DeviceItem.from_interface (iface);
                 }
             }
 
             items.append (item);
-            insert (item, (int)(items.length() - 1));
+            insert (item, (int) items.length () - 1);
             show_all ();
         }
 
         public void remove_device_from_list (NM.Device device) {
             foreach (var list_item in items) {
-                if(list_item.device == device) {
+                if (list_item.device == device) {
                     remove_row_from_list (list_item);
                     break;
                 }
@@ -114,18 +100,18 @@
             this.select_row (this.get_row_at_index (0));
         }
 
-        public void create_proxy_entry () {
-            proxy = new DeviceItem (_("Proxy"), "", "preferences-system-network", true);
+        private void add_proxy () {
+            proxy = new DeviceItem (_("Proxy"), "", "preferences-system-network");
+            proxy.page = new Widgets.ProxyPage (proxy);
+            proxy.type = Utils.ItemType.PROXY;
             this.add (proxy);
         }
-
         public void select_first_item () {
-            var first_row = this.get_row_at_index (0);
-            this.select_row (first_row);
+            this.get_row_at_index (0).activate ();
         }  
 
         private void update_headers (Gtk.ListBoxRow row, Gtk.ListBoxRow? before = null) {
-            if (row == proxy) {
+            if (((DeviceItem) row).type != Utils.ItemType.DEVICE) {
                 row.set_header (settings_l);
             } else if (row == items.nth_data (0)) {
                 row.set_header (devices_l);
 
=== modified file 'src/Widgets/InfoBox.vala'
--- src/Widgets/InfoBox.vala	2015-09-11 12:46:58 +0000
+++ src/Widgets/InfoBox.vala	2015-10-20 20:37:51 +0000
@@ -27,7 +27,6 @@
         private NM.Device device;
         private DeviceItem? owner;
 
-        private string status_l = (_("Status:") + SUFFIX);
         private string ipaddress_l = (_("IP Address:") + SUFFIX);
         private string mask_l = (_("Subnet mask:") + SUFFIX);
         private string router_l = (_("Router:") + SUFFIX);
 
=== modified file 'src/Widgets/Proxy/ProxyPage.vala'
--- src/Widgets/Proxy/ProxyPage.vala	2015-10-08 19:04:34 +0000
+++ src/Widgets/Proxy/ProxyPage.vala	2015-10-20 20:37:51 +0000
@@ -3,7 +3,10 @@
         public Gtk.Stack stack;
         public signal void update_status_label (string mode);
 
-        public ProxyPage () {
+        private DeviceItem owner;
+
+        public ProxyPage (DeviceItem _owner) {
+            this.owner = _owner;
             this.orientation = Gtk.Orientation.VERTICAL;
             this.baseline_position = Gtk.BaselinePosition.CENTER;
             this.margin_top = 20;
@@ -19,17 +22,19 @@
             stack.add_titled (exceptions_page, "exceptions", _("Exceptions"));
             stackswitcher.stack = stack;
 
-            proxy_settings.changed.connect (() => {
-                update_mode ();
-            });
+            proxy_settings.changed.connect (update_mode);
+
+            update_mode ();
 
             this.add (stackswitcher);
             this.add (stack);
             this.show_all ();
+
+            stack.visible_child = configuration_page;
         }
 
         public void update_mode () {
-            this.update_status_label (proxy_settings.mode);
+            owner.switch_status (null, proxy_settings.mode);
         }
     }
 }