Merge lp:~donadigo/switchboard-plug-networking/common-rewrite into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Complete common code rewrite.

This is almost a complete rewrite of a "common" code which is a code which is a base for this plug and network indicator.

"Common" code is now named "shared".

The changes are made to the naming of the classes and methods, code style and there are a few additions to the common API itself.

All of the classes that need to be implemented are now in the "shared/Abstract" folder.

Classes are now named "Abstract[DeviceType]View" instead of "Abstract[DeviceType]Interface"
"NMVisualizer" class has been renamed to "ViewManager".

The classes are now inheriting Gtk.Bin instead of hardcoding each widget for the projects.
I moved Hotspot and WiFi utilities to the shared Utils class for easier access from the indicator.

Everything should be working as it worked before, there are no additional features introduced in this branch.

This branch needs extensive testing before it can get merged (at least two reviews for UI / function testing).

Obviously this most probably won't make into Loki since there is so many changes introduced.

[kay van der Zander (kay20)]

see diff comments.

please use smaller functions instead of 40+lines in a update function.

don't duplicade code

anduse proper get set functions instead of those ugly property implementation

review: Needs Fixing

[lp:~donadigo/switchboard-plug-networking/common-rewrite]

291. By Adam Bieńkowski on 2016-11-04

Update the branch with suggestions from kay

[Adam Bieńkowski (donadigo)]

kay20: I did fix some of your issues, but not all of them, because I do not agree with them, and the elementary code-style has changed so:

- We don't use "this" anymore. It's used for the case where you have a property and you want to assign it from the parameter like this:
this.a = a;

- I don't agree there should be white lines between the variable creation and checking it for something, simply because it looks for me better and actually holds the concept that this assignment is now verified.

- I moved the portions of the code to shorter methods, however I still couldn't make them all, because they use a lot of variables they depend on and if I would make them into smaller methods, these would need to have parameters, but I agree into moving the code to smaller methods, this branch isn't just place for this.

[Zisu Andrei (matzipan)]

Some comments inline.

I'm not familiarised with the network plug, so I'm not aware of all the subtleties but I did not notice anything fundamentally wrong.

Ideally, changes like this should be done in smaller merges in the future.

review: Needs Fixing

[Zisu Andrei (matzipan)]

There are also some merge commits.

review: Needs Fixing

[lp:~donadigo/switchboard-plug-networking/common-rewrite]

292. By Adam Bieńkowski on 2016-11-20

Address issues from Andrei

[Adam Bieńkowski (donadigo)]

matzipan: I addressed all your issues, except the label styling and unmanaged state of NetworkManager. These should probably be done in a different branch, the code you're seeing is just copied and refactored into more elegant code structure.

[Zisu Andrei (matzipan)]

Whoops. Meant to say there are some merge conflicts and ended up saying there are some merge commits.

review: Needs Fixing

[lp:~donadigo/switchboard-plug-networking/common-rewrite]

293. By Adam Bieńkowski on 2016-11-20

Resolve conflicts and merge trunk

294. By Adam Bieńkowski on 2016-11-20

Restore, rename, and modify deleted files

Unmerged revisions

294. By Adam Bieńkowski on 2016-11-20

Restore, rename, and modify deleted files

293. By Adam Bieńkowski on 2016-11-20

Resolve conflicts and merge trunk

292. By Adam Bieńkowski on 2016-11-20

Address issues from Andrei

291. By Adam Bieńkowski on 2016-11-04

Update the branch with suggestions from kay

290. By Adam Bieńkowski on 2016-08-06

Almost completely rewrite common code

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-10-25 13:34:45 +0000
+++ src/CMakeLists.txt	2016-11-20 19:56:12 +0000
@@ -10,38 +10,42 @@
 include (ValaVersion)
 ensure_vala_version ("0.22.0" MINIMUM)
 
+set (SHARED_SOURCES
+    shared/ViewManager.vala
+    shared/Utils.vala
+    shared/RFKill.vala
+    shared/WifiMenuItem.vala
+    shared/VPNMenuItem.vala
+    shared/PlaceholderLabel.vala
+    shared/HotspotDialog.vala
+    shared/Abstract/AbstractWiFiView.vala
+    shared/Abstract/AbstractEthernetView.vala
+    shared/Abstract/AbstractHotspotView.vala
+    shared/Abstract/AbstractView.vala
+)
+
 include (ValaPrecompile)
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
     Plug.vala
-    Utils.vala
     Settings/ProxySettings.vala
-    Widgets/Page.vala
+    Widgets/View.vala
     Widgets/DeviceList.vala
     Widgets/Device/DeviceItem.vala
     Widgets/Device/DevicePage.vala   
-    Widgets/WifiInterface.vala
-    Widgets/EtherInterface.vala
-    Widgets/HotspotInterface.vala
+    Widgets/WiFiView.vala
+    Widgets/EthernetView.vala
+    Widgets/HotspotView.vala
     Widgets/Proxy/ProxyConfigurationPage.vala
     Widgets/Proxy/ProxyExceptionsPage.vala
-    Widgets/Proxy/ProxyPage.vala    
+    Widgets/Proxy/ProxyView.vala    
     Widgets/InfoBox.vala
     Widgets/SettingsButton.vala
-    Widgets/VPNPage.vala
+    Widgets/VPNView.vala
     Widgets/VPNInfoBox.vala
     Widgets/Footer.vala
     Widgets/InfoScreen.vala
-    Widgets/Hotspot/HotspotDialog.vala
-    common/Utils.vala
-    common/Widgets/WifiMenuItem.vala
-    common/Widgets/VPNMenuItem.vala
-    common/Widgets/AbstractWifiInterface.vala
-    common/Widgets/AbstractEtherInterface.vala
-    common/Widgets/AbstractHotspotInterface.vala
-    common/rfkill.vala
-    common/Widgets/NMVisualizer.vala
-    common/Widgets/WidgetNMInterface.vala
+    ${SHARED_SOURCES}
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     gtk+-3.0

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-07-24 22:04:55 +0000
+++ src/Plug.vala	2016-11-20 19:56:12 +0000
@@ -33,52 +33,16 @@
 namespace Network {
     public static Plug plug;
 
-    public class MainBox : Network.Widgets.NMVisualizer {
+    public class Widgets.MainBox : ViewManager {
         private NM.Device current_device = null;
         private Gtk.Stack content;
         private Gtk.ScrolledWindow scrolled_window;
-        private WidgetNMInterface page;
+        private AbstractView page;
         private Widgets.DeviceList device_list;
         private Widgets.Footer footer;
         private Widgets.InfoScreen no_devices;
         
-        protected override void add_interface (WidgetNMInterface widget_interface) {
-            device_list.add_iface_to_list (widget_interface);
-
-            select_first ();
-            show_all ();
-        }
-
-        protected override void remove_interface (WidgetNMInterface widget_interface) {
-            device_list.remove_iface_from_list (widget_interface);
-    
-            if (content.get_visible_child () == widget_interface) {
-                var row = device_list.get_selected_row ();
-                int index = device_list.get_selected_row ().get_index ();
-                if (row != null && row.get_index () >= 0) {
-                    device_list.get_row_at_index (index).activate ();
-                } else {
-                    select_first ();
-                }
-            }
-
-            content.remove (widget_interface);
-            show_all ();
-        }
-
-        protected override void add_connection (NM.RemoteConnection connection) {
-            device_list.add_connection (connection);
-        }
-
-        protected override void remove_connection (NM.RemoteConnection connection) {
-            device_list.remove_connection (connection);
-        }
-
-        private void select_first () {
-			device_list.select_first_item ();
-        }
-
-        protected override void build_ui () {
+        construct {
             var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
             paned.width_request = 250;
 
@@ -116,10 +80,46 @@
 
             connect_signals ();
 
-            var main_grid = new Gtk.Grid ();
-            main_grid.add (paned);
-            main_grid.show_all ();
-            add (main_grid);
+            add (paned);
+            show_all ();
+
+            populate ();
+        }
+
+        protected override void add_view (AbstractView view) {
+            device_list.add_view_to_list (view);
+
+            select_first ();
+            show_all ();
+        }
+
+        protected override void remove_view (AbstractView view) {
+            device_list.remove_view_from_list (view);
+    
+            if (content.get_visible_child () == view) {
+                var row = device_list.get_selected_row ();
+                int index = device_list.get_selected_row ().get_index ();
+                if (row != null && row.get_index () >= 0) {
+                    device_list.get_row_at_index (index).activate ();
+                } else {
+                    select_first ();
+                }
+            }
+
+            content.remove (view);
+            show_all ();
+        }
+
+        protected override void add_connection (NM.RemoteConnection connection) {
+            device_list.add_connection (connection);
+        }
+
+        protected override void remove_connection (NM.RemoteConnection connection) {
+            device_list.remove_connection (connection);
+        }
+
+        private void select_first () {
+            device_list.select_first_item ();
         }
 
         /* Main function to connect all the signals */
@@ -156,7 +156,7 @@
     }
 
     public class Plug : Switchboard.Plug {
-        MainBox? main_box = null;
+        Widgets.MainBox? main_box = null;
         public Plug () {
             Object (category: Category.NETWORK,
                     code_name: Build.PLUGCODENAME,
@@ -168,7 +168,7 @@
 
         public override Gtk.Widget get_widget () {
             if (main_box == null) {
-                main_box = new MainBox ();
+                main_box = new Widgets.MainBox ();
             }
 
             return main_box;

=== removed file 'src/Utils.vala'
--- src/Utils.vala	2016-07-21 22:42:00 +0000
+++ src/Utils.vala	1970-01-01 00:00:00 +0000
@@ -1,251 +0,0 @@
-/*-
- * Copyright (c) 2015-2016 elementary LLC.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Adam Bieńkowski <[e-mail]>
- */
-
-namespace Network {
-    public const string UNKNOWN_STR = (_("Unknown"));
-
-    public class Utils {
-        public class Hotspot {
-            public delegate void UpdateSecretCallback ();
-
-            public static void activate_hotspot (NM.DeviceWifi wifi_device,
-                                                ByteArray ssid,
-                                                string key,
-                                                NM.Connection? selected) {
-                if (selected != null) {
-                    client.activate_connection (selected, wifi_device, null, null);
-                    return;
-                }
-
-                var hotspot_c = new NM.Connection ();
-
-                var setting_connection = new NM.SettingConnection ();
-                setting_connection.@set (NM.SettingConnection.TYPE, "802-11-wireless");
-                setting_connection.@set (NM.SettingConnection.ID, "Hotspot");
-                setting_connection.autoconnect = false;
-                hotspot_c.add_setting (setting_connection);
-
-                var setting_wireless = new NM.SettingWireless ();
-
-                string? mode = null;
-                var caps = wifi_device.get_capabilities ();
-                if ((caps & NM.DeviceWifiCapabilities.AP) != 0) {
-                    mode = NM.SettingWireless.MODE_AP;
-                } else {
-                    mode = NM.SettingWireless.MODE_ADHOC;
-                }
-
-                setting_wireless.mode = mode;
-                setting_wireless.security = "802-11-wireless-security";
-
-                hotspot_c.add_setting (setting_wireless);
-
-                var ip4_setting = new NM.SettingIP4Config ();
-                ip4_setting.method = "shared";
-                hotspot_c.add_setting (ip4_setting);
-
-                setting_wireless.@set (NM.SettingWireless.SSID, ssid);
-
-                var setting_wireless_security = new NM.SettingWirelessSecurity ();
-
-                if (mode == NM.SettingWireless.MODE_AP) {
-                    if ((caps & NM.DeviceWifiCapabilities.RSN) != 0) {
-                        set_wpa_key (setting_wireless_security, key);
-                        setting_wireless_security.add_proto ("rsn");
-                        setting_wireless_security.add_pairwise ("ccmp");
-                        setting_wireless_security.add_group ("ccmp");
-                    } else if ((caps & NM.DeviceWifiCapabilities.WPA) != 0) {
-                        set_wpa_key (setting_wireless_security, key);
-                        setting_wireless_security.add_proto ("wpa");
-                        setting_wireless_security.add_pairwise ("tkip");
-                        setting_wireless_security.add_group ("tkip");                       
-                    } else {
-                        set_wep_key (setting_wireless_security, key);
-                    }
-                } else {
-                    set_wep_key (setting_wireless_security, key);
-                }
-
-                hotspot_c.add_setting (setting_wireless_security);
-                client.add_and_activate_connection (hotspot_c,
-                                                    wifi_device,
-                                                    null,
-                                                    finish_connection_cb);
-            }
-
-            public static void update_secrets (NM.RemoteConnection connection, UpdateSecretCallback callback) {
-                connection.get_secrets (connection.get_setting_wireless ().get_security (), ((_connection, secrets, error) => {
-                    var setting_wireless = _connection.get_setting_wireless ();
-                    try {
-                        _connection.update_secrets (setting_wireless.get_security (), secrets);
-                    } catch (Error e) {
-                        warning ("%s\n", e.message);
-                        return;
-                    }         
-
-                    callback ();
-                }));
-            }
-
-            public static void deactivate_hotspot (NM.DeviceWifi wifi_device) {
-                client.get_active_connections ().@foreach ((active_connection) => {
-                    var devices = active_connection.get_devices ();
-                    if (devices != null && devices.@get (0) == wifi_device) {
-                        client.deactivate_connection (active_connection);
-                    }
-                });        
-            }
-
-            private static void set_wpa_key (NM.SettingWirelessSecurity setting, string key) {
-                setting.key_mgmt = "wpa-psk";
-                setting.psk = key;
-            }
-
-            private static void set_wep_key (NM.SettingWirelessSecurity setting, string key) {
-                setting.key_mgmt = "none";
-                setting.wep_key0 = key;
-                setting.wep_key_type = NM.WepKeyType.PASSPHRASE;
-            }
-
-            public static bool get_device_is_hotspot (NM.DeviceWifi wifi_device, NM.RemoteSettings nm_settings) {
-                if (wifi_device.get_active_connection () != null) {
-                    var connection = nm_settings.get_connection_by_path (wifi_device.get_active_connection ().get_connection ());
-                    if (connection != null) {
-                        var ip4_setting = connection.get_setting_ip4_config ();
-                        return (ip4_setting != null && ip4_setting.get_method () == "shared");
-                    }
-                }
-
-                return false;
-            }
-
-            public static bool get_connection_is_hotspot (NM.Connection connection) {
-                var setting_connection = connection.get_setting_connection ();
-                if (setting_connection.get_connection_type () != "802-11-wireless") {
-                    return false;
-                }
-
-                var setting_wireless = connection.get_setting_wireless ();
-                if (setting_wireless.get_mode () != "adhoc"
-                    && setting_wireless.get_mode () != "ap") {
-                    return false;
-                }
-
-                if (setting_wireless.get_security () != "802-11-wireless-security") {
-                    return false;
-                }
-
-                var ip4_config = connection.get_setting_ip4_config ();
-                if (ip4_config.get_method () != "shared") {
-                    return false;
-                }
-
-                return true;
-            }
-
-            private static void finish_connection_cb (NM.Client? cb_client,
-                                            NM.ActiveConnection? cb_connection,
-                                            string? new_connection_path,
-                                            Error? error) {
-                if (error != null && error.code != 0) {
-                    warning ("%s\n", error.message);
-                }        
-            }               
-        }
-
-        public enum CustomMode {
-            PROXY_NONE = 0,
-            PROXY_MANUAL,
-            PROXY_AUTO,
-            HOTSPOT_ENABLED,
-            HOTSPOT_DISABLED,
-            INVALID
-        }
-
-        public enum ItemType {
-            DEVICE = 0,
-            VIRTUAL,
-            INVALID
-        }
-
-        public static string state_to_string (NM.DeviceState state) {
-            switch (state) {
-                case NM.DeviceState.ACTIVATED:
-                    return _("Connected");
-                case NM.DeviceState.DISCONNECTED:
-                    return _("Disconnected");  
-                case NM.DeviceState.UNMANAGED:
-                    return _("Unmanaged");
-                case NM.DeviceState.PREPARE:
-                    return _("In preparation");
-                case NM.DeviceState.CONFIG:
-                    return _("Connecting…");
-                case NM.DeviceState.NEED_AUTH:
-                    return _("Requires more information");
-                case NM.DeviceState.IP_CONFIG:
-                    return _("Requesting adresses...");
-                case NM.DeviceState.IP_CHECK:
-                    return _("Checking connection...");
-                case NM.DeviceState.SECONDARIES:
-                    return _("Waiting for connection...");
-                case NM.DeviceState.DEACTIVATING:
-                    return _("Disconnecting...");
-                case NM.DeviceState.FAILED:
-                    return _("Failed to connect");
-                case NM.DeviceState.UNKNOWN:
-                default:
-                    return UNKNOWN_STR;
-            }
-        }
-
-        public static string type_to_string (NM.DeviceType type) {
-            switch (type) {
-                case NM.DeviceType.ETHERNET:
-                    return _("Ethernet");
-                case NM.DeviceType.WIFI:
-                    return _("Wi-Fi");  
-                case NM.DeviceType.UNUSED1:
-                    return _("Not used");
-                case NM.DeviceType.UNUSED2:
-                    return _("Not used");
-                case NM.DeviceType.BT:
-                    return _("Bluetooth");
-                case NM.DeviceType.OLPC_MESH:
-                    return _("OLPC XO");
-                case NM.DeviceType.WIMAX:
-                    return _("WiMAX Broadband");
-                case NM.DeviceType.MODEM:
-                    return _("Modem");
-                case NM.DeviceType.INFINIBAND:
-                    return _("InfiniBand device");
-                case NM.DeviceType.BOND:
-                    return _("Bond master");
-                case NM.DeviceType.VLAN:
-                    return _("VLAN Interface");
-                case NM.DeviceType.ADSL:
-                    return _("ADSL Modem");
-                case NM.DeviceType.BRIDGE:
-                    return _("Bridge master");
-                case NM.DeviceType.UNKNOWN:
-                default:
-                    return UNKNOWN_STR;
-            }
-        }
-    }
-}

=== modified file 'src/Widgets/Device/DeviceItem.vala'
--- src/Widgets/Device/DeviceItem.vala	2016-07-26 21:04:29 +0000
+++ src/Widgets/Device/DeviceItem.vala	2016-11-20 19:56:12 +0000
@@ -18,11 +18,20 @@
  */
 
 namespace Network.Widgets {
+    public enum CustomMode {
+        PROXY_NONE = 0,
+        PROXY_MANUAL,
+        PROXY_AUTO,
+        HOTSPOT_ENABLED,
+        HOTSPOT_DISABLED,
+        INVALID
+    }
+
     public class DeviceItem : Gtk.ListBoxRow {
         public NM.Device? device = null;
         private NM.RemoteSettings? nm_settings = null;
         public Gtk.Widget? page = null;
-        public Utils.ItemType type;
+        public ItemType type;
 
         public Gtk.Label row_description;
         private Gtk.Image row_image;
@@ -43,35 +52,35 @@
         public DeviceItem (string _title, string _subtitle, string _icon_name = "network-wired") {
             this.subtitle = _subtitle;
             this.icon_name = _icon_name;
-            this.type = Utils.ItemType.INVALID;
+            this.type = ItemType.INVALID;
 
             create_ui (icon_name);
             
 			this.title = _title;
         }
 
-        public DeviceItem.from_interface (WidgetNMInterface iface,
+        public DeviceItem.from_view (AbstractView view,
                                     string _icon_name = "network-wired",
                                     string _title = "") {
-            this.page = iface;
-            this.device = iface.device;
-            this.type = Utils.ItemType.DEVICE;
+            this.page = view;
+            this.device = view.get_device ();
+            this.type = ItemType.DEVICE;
 
             this.subtitle = "";
             this.icon_name = _icon_name;
 
             create_ui (icon_name);
-			iface.bind_property ("display-title", this, "title");
+			view.bind_property ("display-title", this, "title");
             
-			switch_status (Utils.CustomMode.INVALID, iface.state);
+			switch_status (CustomMode.INVALID, view.state);
 
             nm_settings = new NM.RemoteSettings (null);
             nm_settings.connections_read.connect (() => {
-                switch_status (Utils.CustomMode.INVALID, iface.state);
+                switch_status (CustomMode.INVALID, view.state);
             });
 
-            iface.notify["state"].connect (() => {
-                switch_status (Utils.CustomMode.INVALID, iface.state);
+            view.notify["state"].connect (() => {
+                switch_status (CustomMode.INVALID, view.state);
             });
         }
 
@@ -125,24 +134,24 @@
             return icon_name;
         }
 
-        public void switch_status (Utils.CustomMode custom_mode, Network.State? state = null) {
+        public void switch_status (CustomMode custom_mode, Network.Utils.State? state = null) {
             if (state != null) {
                 switch (state) {
-                    case Network.State.CONNECTED_WIFI:
-                    case Network.State.CONNECTED_WIFI_WEAK:
-                    case Network.State.CONNECTED_WIFI_OK:
-                    case Network.State.CONNECTED_WIFI_GOOD:
-                    case Network.State.CONNECTED_WIFI_EXCELLENT:
-                    case Network.State.CONNECTED_WIRED:
-                    case Network.State.CONNECTED_VPN:
+                    case Network.Utils.State.CONNECTED_WIFI:
+                    case Network.Utils.State.CONNECTED_WIFI_WEAK:
+                    case Network.Utils.State.CONNECTED_WIFI_OK:
+                    case Network.Utils.State.CONNECTED_WIFI_GOOD:
+                    case Network.Utils.State.CONNECTED_WIFI_EXCELLENT:
+                    case Network.Utils.State.CONNECTED_WIRED:
+                    case Network.Utils.State.CONNECTED_VPN:
                         status_image.icon_name = "user-available";
                         break;
-                    case Network.State.DISCONNECTED:
+                    case Network.Utils.State.DISCONNECTED:
                         status_image.icon_name = "user-offline";
                         break;
-                    case Network.State.FAILED_WIRED:
-                    case Network.State.FAILED_WIFI:
-                    case Network.State.FAILED_VPN:
+                    case Network.Utils.State.FAILED_WIRED:
+                    case Network.Utils.State.FAILED_WIFI:
+                    case Network.Utils.State.FAILED_VPN:
                         status_image.icon_name = "user-busy";
                         break;
                     default:
@@ -150,18 +159,18 @@
                         break;
                 }
 
-                row_description.label = Common.Utils.network_state_to_string (state);
-            } else if (custom_mode != Utils.CustomMode.INVALID) {
+                row_description.label = state.to_localized_string ();
+            } else if (custom_mode != CustomMode.INVALID) {
                 switch (custom_mode) {
-                    case Utils.CustomMode.PROXY_NONE:
+                    case CustomMode.PROXY_NONE:
                         row_description.label = _("Disabled");
                         status_image.icon_name = "user-offline";
                         break;
-                    case Utils.CustomMode.PROXY_MANUAL:
+                    case CustomMode.PROXY_MANUAL:
                         row_description.label = _("Enabled (manual mode)");
                         status_image.icon_name = "user-available";
                         break;
-                    case Utils.CustomMode.PROXY_AUTO:
+                    case CustomMode.PROXY_AUTO:
                         row_description.label = _("Enabled (auto mode)");
                         status_image.icon_name = "user-available";
                         break;

=== modified file 'src/Widgets/Device/DevicePage.vala'
--- src/Widgets/Device/DevicePage.vala	2016-07-29 19:49:28 +0000
+++ src/Widgets/Device/DevicePage.vala	2016-11-20 19:56:12 +0000
@@ -18,15 +18,14 @@
  */
 
 namespace Network.Widgets {
-    public class DevicePage : WidgetNMInterface {
-
+    public class DevicePage : View {
         public DevicePage (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
             this.init (device);
 
             bottom_revealer.transition_type = Gtk.RevealerTransitionType.NONE;
 
-            this.icon_name = "network-wired";
-            display_title = Utils.type_to_string (device.get_device_type ());
+            icon_name = "network-wired";
+            display_title = Network.Utils.device_type_to_string (device.get_device_type ());
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             details_box.pack_end (new SettingsButton.from_device (device), false, false, 0);
@@ -44,7 +43,7 @@
             this.init (owner.get_item_device ());
 
             this.icon_name = owner.get_item_icon_name ();
-            display_title = Utils.type_to_string (device.get_device_type ());
+            display_title = Network.Utils.device_type_to_string (device.get_device_type ());
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             details_box.pack_start (new SettingsButton.from_device (device), false, false, 0);

=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2016-07-26 21:04:29 +0000
+++ src/Widgets/DeviceList.vala	2016-11-20 19:56:12 +0000
@@ -18,6 +18,12 @@
  */
 
 namespace Network.Widgets {
+    public enum ItemType {
+        DEVICE = 0,
+        VIRTUAL,
+        INVALID
+    }
+
     public class DeviceList : Gtk.ListBox {
         public signal void show_no_devices (bool show);
 
@@ -46,18 +52,18 @@
             this.add_vpn ();
         }
 
-        public void add_iface_to_list (WidgetNMInterface iface) {
+        public void add_view_to_list (AbstractView iface) {
             DeviceItem item;
-            if (iface is AbstractWifiInterface) {
-                item = new DeviceItem.from_interface (iface, "network-wireless");              
-            } else if (iface is AbstractHotspotInterface) {
-                item = new DeviceItem.from_interface (iface, "network-wireless-hotspot");
-                item.type = Utils.ItemType.VIRTUAL;
+            if (iface is AbstractWiFiView) {
+                item = new DeviceItem.from_view (iface, "network-wireless");              
+            } else if (iface is AbstractHotspotView) {
+                item = new DeviceItem.from_view (iface, "network-wireless-hotspot");
+                item.type = ItemType.VIRTUAL;
             } else {
-                if (iface.device.get_iface ().has_prefix ("usb")) {
-                    item = new DeviceItem.from_interface (iface, "drive-removable-media");
+                if (iface.get_device ().get_iface ().has_prefix ("usb")) {
+                    item = new DeviceItem.from_view (iface, "drive-removable-media");
                 } else {
-                    item = new DeviceItem.from_interface (iface);
+                    item = new DeviceItem.from_view (iface);
                 }
             }
 
@@ -65,7 +71,7 @@
             show_all ();
         }
 
-        public void remove_iface_from_list (WidgetNMInterface iface) {
+        public void remove_view_from_list (AbstractView iface) {
             foreach (Gtk.Widget _list_item in get_children ()) {
                 var list_item = (DeviceItem)_list_item;
                 if (list_item.page == iface) {
@@ -77,7 +83,7 @@
         public void add_connection (NM.RemoteConnection connection) {
             switch (connection.get_connection_type ()) {
                 case NM.SettingVpn.SETTING_NAME:
-                    ((VPNPage)vpn.page).add_connection (connection);
+                    ((VPNView)vpn.page).add_connection (connection);
                     break;
                 default:
                     break;
@@ -87,7 +93,7 @@
         public void remove_connection (NM.RemoteConnection connection) {
             switch (connection.get_connection_type ()) {
                 case NM.SettingVpn.SETTING_NAME:
-                    ((VPNPage)vpn.page).remove_connection (connection);
+                    ((VPNView)vpn.page).remove_connection (connection);
                     break;
                 default:
                     break;
@@ -101,16 +107,16 @@
 
         private void add_proxy () {
             proxy = new DeviceItem (_("Proxy"), "", "preferences-system-network");
-            proxy.page = new ProxyPage (proxy);
-            proxy.type = Utils.ItemType.VIRTUAL;
+            proxy.page = new ProxyView (proxy);
+            proxy.type = ItemType.VIRTUAL;
 
             this.add (proxy);
         }
 
         private void add_vpn () {
             vpn = new DeviceItem (_("VPN"), "", "network-vpn");
-            vpn.page = new VPNPage (vpn);
-            vpn.type = Utils.ItemType.VIRTUAL;
+            vpn.page = new VPNView (vpn);
+            vpn.type = ItemType.VIRTUAL;
 
             this.add (vpn);
         }
@@ -120,9 +126,9 @@
         }  
 
         private int sort_items (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
-            if (((DeviceItem) row1).type == Utils.ItemType.DEVICE) {
+            if (((DeviceItem) row1).type == ItemType.DEVICE) {
                 return -1;
-            } else if (((DeviceItem) row1).type == Utils.ItemType.VIRTUAL) {
+            } else if (((DeviceItem) row1).type == ItemType.VIRTUAL) {
                 return 1;
             } else {
                 return 0;
@@ -130,26 +136,26 @@
         }
 
         private void update_headers (Gtk.ListBoxRow row, Gtk.ListBoxRow? before = null) {
-            if (((DeviceItem) row).type == Utils.ItemType.VIRTUAL) {
-                if (before != null && ((DeviceItem) before).type == Utils.ItemType.VIRTUAL) {
+            if (((DeviceItem) row).type == ItemType.VIRTUAL) {
+                if (before != null && ((DeviceItem) before).type == ItemType.VIRTUAL) {
                     return;
                 } 
 
-                remove_headers_for_type (Utils.ItemType.VIRTUAL);
+                remove_headers_for_type (ItemType.VIRTUAL);
                 row.set_header (virtual_l);
-            } else if (((DeviceItem) row).type == Utils.ItemType.DEVICE) {
-                if (before != null && ((DeviceItem) before).type == Utils.ItemType.DEVICE) {
+            } else if (((DeviceItem) row).type == ItemType.DEVICE) {
+                if (before != null && ((DeviceItem) before).type == ItemType.DEVICE) {
                     return;
                 } 
 
-                remove_headers_for_type (Utils.ItemType.DEVICE);
+                remove_headers_for_type (ItemType.DEVICE);
                 row.set_header (devices_l);
             } else {
                 row.set_header (null);
             }
         }
 
-        private void remove_headers_for_type (Utils.ItemType type) {
+        private void remove_headers_for_type (ItemType type) {
             foreach (Gtk.Widget _item in get_children ()) {
                 var item = (DeviceItem)_item;
                 if (item.type == type) {

=== renamed file 'src/Widgets/EtherInterface.vala' => 'src/Widgets/EthernetView.vala'
--- src/Widgets/EtherInterface.vala	2016-08-09 12:41:03 +0000
+++ src/Widgets/EthernetView.vala	2016-11-20 19:56:12 +0000
@@ -18,25 +18,28 @@
  */
 
 namespace Network.Widgets {
-    public class EtherInterface : AbstractEtherInterface {
+    public class EthernetView : AbstractEthernetView {
         private Gtk.Revealer top_revealer;
 
-        public EtherInterface (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
-            this.init (device);
+        public EthernetView (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
+            init (device);
 
             info_box.halign = Gtk.Align.CENTER;
 
-            this.icon_name = "network-wired";
+            icon_name = "network-wired";
 
             top_revealer = new Gtk.Revealer ();
             top_revealer.valign = Gtk.Align.START;
             top_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
             top_revealer.add (info_box);
 
-            bottom_box.pack_start (new SettingsButton.from_device (device), false, false, 0);
-
-            add (top_revealer);
-            add (bottom_revealer);
+            var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+            button_box.pack_end (new SettingsButton.from_device (device), false, false, 0);
+
+            bottom_box.add (button_box);
+
+            container.add (top_revealer);
+            container.add (bottom_revealer);
             show_all ();
             
             update ();

=== removed directory 'src/Widgets/Hotspot'
=== removed file 'src/Widgets/Hotspot/HotspotDialog.vala'
--- src/Widgets/Hotspot/HotspotDialog.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/Hotspot/HotspotDialog.vala	1970-01-01 00:00:00 +0000
@@ -1,227 +0,0 @@
-/*-
- * Copyright (c) 2015-2016 elementary LLC.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Adam Bieńkowski <[e-mail]>
- */
-
-namespace Network.Widgets {
-    public class HotspotDialog : Gtk.Dialog {
-        private const string NEW_ID = "0";
-        private Gtk.Entry ssid_entry;
-        private Gtk.Entry key_entry;
-
-        private Gtk.Label ssid_label;
-        private Gtk.Label key_label;
-
-        private Gtk.ComboBoxText conn_combo;
-
-        private Gtk.CheckButton check_btn;
-        private Gtk.Label dumb;
-
-        private Gtk.Button create_btn;
-
-        private HashTable<string, NM.Connection> conn_hash;
-        private unowned List<NM.Connection> available;
-
-        public HotspotDialog (NM.AccessPoint? active, List<NM.Connection> _available) {
-            this.available = _available;
-            this.deletable = false;
-            this.resizable = false;
-            this.border_width = 6;
-
-            conn_hash = new HashTable<string, NM.Connection> (str_hash, str_equal);
-
-            var content_area = this.get_content_area ();
-            content_area.halign = content_area.valign = Gtk.Align.CENTER;
-
-            var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-
-            vbox.margin_left = vbox.margin_right = 6;
-
-            string? ssid_str = null;
-            if (active != null) {
-                ssid_str = NM.Utils.ssid_to_utf8 (active.get_ssid ());
-            } else {
-                ssid_str = _("current");
-            }
-
-            var title = new Gtk.Label ("<span weight='bold' size='larger'>" + _("Wireless Hotspot") + "</span>");
-            title.use_markup = true;
-            title.halign = Gtk.Align.START;
-
-            var image = new Gtk.Image.from_icon_name ("network-wireless-hotspot", Gtk.IconSize.DIALOG);
-            image.valign = Gtk.Align.START;
-            main_box.add (image);
-
-            var info_label = new Gtk.Label (_("Enabling Wireless Hotspot will disconnect from %s network.").printf (ssid_str) + "\n" +
-            _("You will not be able to connect to a wireless network while Hotspot is active."));
-            info_label.halign = Gtk.Align.START;
-            info_label.margin_top = 6;
-            info_label.use_markup = true;
-
-            var grid = new Gtk.Grid ();
-            grid.hexpand = true;
-            grid.row_spacing = 6;
-            grid.column_spacing = 12;
-            grid.vexpand_set = true;
-
-            ssid_entry = new Gtk.Entry ();
-            ssid_entry.hexpand = true;
-            ssid_entry.text = get_ssid_for_hotspot ();
-
-            key_entry = new Gtk.Entry ();
-            key_entry.hexpand = true;
-            key_entry.visibility = false;
-            key_entry.secondary_icon_tooltip_text = _("Password needs to be at least 8 characters long.");
-
-            check_btn = new Gtk.CheckButton.with_label (_("Show Password"));
-            check_btn.toggled.connect (() => {
-                key_entry.visibility = check_btn.active;
-            });
-
-            ssid_entry.changed.connect (update);
-            key_entry.changed.connect (update);
-
-            ssid_label = new Gtk.Label (_("Network Name:"));
-            ssid_label.halign = Gtk.Align.END;
-
-            key_label = new Gtk.Label (_("Password:"));      
-            key_label.halign = Gtk.Align.END;
-
-            conn_combo = new Gtk.ComboBoxText ();
-            conn_combo.append (NEW_ID, _("New…"));
-            int i = 1;
-            foreach (var connection in available) {
-                var setting_wireless = connection.get_setting_wireless ();
-                conn_combo.append (i.to_string (), NM.Utils.ssid_to_utf8 (setting_wireless.get_ssid ()));
-                conn_hash.insert (i.to_string (), connection);
-                i++;
-            }
-
-            conn_combo.active_id = NEW_ID;
-            conn_combo.changed.connect (update);
-
-            var conn_label = new Gtk.Label (_("Connection:"));
-            conn_label.halign = Gtk.Align.END;
-
-            grid.attach (conn_label, 0, 0, 1, 1);
-            grid.attach_next_to (conn_combo, conn_label, Gtk.PositionType.RIGHT, 1, 1);
-
-            dumb = new Gtk.Label ("");
-
-            grid.attach_next_to (ssid_label, conn_label, Gtk.PositionType.BOTTOM, 1, 1);
-            grid.attach_next_to (ssid_entry, ssid_label, Gtk.PositionType.RIGHT, 1, 1);
-            grid.attach_next_to (key_label, ssid_label, Gtk.PositionType.BOTTOM, 1, 1);
-            grid.attach_next_to (key_entry, key_label, Gtk.PositionType.RIGHT, 1, 1);
-            grid.attach_next_to (dumb, key_label, Gtk.PositionType.BOTTOM, 1, 1);
-            grid.attach_next_to (check_btn, dumb, Gtk.PositionType.RIGHT, 1, 1);
-
-            var cancel_btn = new Gtk.Button.with_label (_("Cancel"));
-            create_btn = new Gtk.Button.with_label (_("Enable Hotspot"));
-            if (active != null) {
-                create_btn.label = _("Switch to Hotspot");
-            }
-
-            create_btn.get_style_context ().add_class ("suggested-action");
-
-            this.add_action_widget (cancel_btn, 0);
-            this.add_action_widget (create_btn, 1);
-
-            vbox.add (title);
-            vbox.add (info_label);
-            vbox.add (grid);
-
-            update ();
-
-            main_box.add (vbox);
-            content_area.add (main_box);
-            this.show_all ();
-        }
-
-        public ByteArray get_ssid () {
-            var byte_array = new ByteArray ();
-            byte_array.append (ssid_entry.get_text ().data);
-            return byte_array;
-        }
-
-        public string get_key () {
-            return key_entry.get_text ();
-        }
-
-        public NM.Connection? get_selected_connection () {
-            return conn_hash[conn_combo.get_active_id ()];
-        }
-
-        private string get_ssid_for_hotspot () {
-            string hostname = "";
-            try {
-                Process.spawn_command_line_sync ("hostname", out hostname, null, null);
-            } catch (SpawnError e) {
-                warning ("%s\n", e.message);
-            }
-
-            return hostname.strip ().replace ("\n", "");
-        }
-
-        private void update () {
-            bool sensitive = (conn_combo.get_active_id () == NEW_ID);
-            ssid_label.sensitive = sensitive;
-            key_label.sensitive = sensitive;
-
-            ssid_entry.sensitive = sensitive;
-            key_entry.sensitive = sensitive;
-
-            check_btn.sensitive = sensitive;
-            dumb.sensitive = sensitive;
-
-            string? secret = null;
-            if (get_selected_connection () != null) {
-                var setting_wireless_security = get_selected_connection ().get_setting_wireless_security ();
-
-                string key_mgmt = setting_wireless_security.get_key_mgmt ();
-                if (key_mgmt == "none") {
-                    secret = setting_wireless_security.get_wep_key (0);
-                } else if (key_mgmt == "wpa-psk" ||
-                            key_mgmt == "wpa-none") {
-                    secret = setting_wireless_security.get_psk ();
-                }
-
-                if (secret == null) {
-                    var connection = get_selected_connection ();
-                    Utils.Hotspot.update_secrets (((NM.RemoteConnection) connection), update);
-                }
-            }
-
-            if (conn_combo.get_active_id () != NEW_ID) {
-                ssid_entry.text = NM.Utils.ssid_to_utf8 (get_selected_connection ().get_setting_wireless ().get_ssid ());
-                if (secret == null) {
-                    secret = "";
-                }
-
-                key_entry.text = secret;
-            }
-
-            create_btn.sensitive = ((ssid_entry.get_text () != "" && key_entry.get_text ().to_utf8 ().length >= 8) || !sensitive);
-
-            if (key_entry.get_text ().to_utf8 ().length < 8 && key_entry.get_text () != "") {
-                key_entry.set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "process-error-symbolic");
-            } else {
-                key_entry.set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "");
-            }
-        }
-    }
-}
\ No newline at end of file

=== renamed file 'src/Widgets/HotspotInterface.vala' => 'src/Widgets/HotspotView.vala'
--- src/Widgets/HotspotInterface.vala	2016-07-29 19:49:28 +0000
+++ src/Widgets/HotspotView.vala	2016-11-20 19:56:12 +0000
@@ -18,21 +18,21 @@
  */
 
  namespace Network.Widgets {
-    public class HotspotInterface : Network.AbstractHotspotInterface {
-
-        private NM.RemoteSettings nm_settings;
+    public class HotspotView : AbstractHotspotView {
         private Gtk.Revealer hotspot_revealer;
         private Gtk.Button hotspot_settings_btn;
         private Gtk.Label ssid_label;
         private Gtk.Label key_label;
         private bool switch_updating = false;
 
-        public HotspotInterface (WifiInterface _root_iface) {
-            root_iface = _root_iface;
-            nm_settings = _root_iface.get_nm_settings ();
-            this.init (root_iface.device);
-
-            this.icon_name = "network-wireless-hotspot";
+        public HotspotView (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
+            this.client = client;
+            this.settings = settings;
+            this.device = device;
+
+            init (device);
+
+            icon_name = "network-wireless-hotspot";
 
             hotspot_revealer = new Gtk.Revealer ();
             hotspot_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
@@ -57,19 +57,19 @@
             button_box.pack_end (hotspot_settings_btn, false, false, 0);
             bottom_revealer.add (button_box);
 
-            nm_settings.connections_read.connect (update);
+            settings.connections_read.connect (update);
             device.state_changed.connect (update);
 
             update ();
 
-            this.add (hotspot_revealer);
-            this.add (bottom_revealer);
-            this.show_all ();
+            container.add (hotspot_revealer);
+            container.add (bottom_revealer);
+            show_all ();
         }
 
         protected override void update () {
             if (hotspot_settings_btn != null) {
-                hotspot_settings_btn.sensitive = Utils.Hotspot.get_device_is_hotspot (root_iface.wifi_device, root_iface.nm_settings);
+                hotspot_settings_btn.sensitive = Utils.Hotspot.get_device_is_hotspot (wifi_device, settings);
             }
 
             update_hotspot_info ();
@@ -79,7 +79,7 @@
 
         protected override void update_switch () {
             switch_updating = true;
-            control_switch.active = state == Network.State.CONNECTED_WIFI;
+            control_switch.active = state == Network.Utils.State.CONNECTED_WIFI;
             switch_updating = false;
         }
 
@@ -89,42 +89,43 @@
                 return;
             }
 
-            var wifi_device = (NM.DeviceWifi)device;
-            if (!control_switch.active && Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings)) {
+            if (!control_switch.active) {
                 Utils.Hotspot.deactivate_hotspot (wifi_device);
             } else {
-                var hotspot_dialog = new HotspotDialog (wifi_device.get_active_access_point (), get_hotspot_connections ());
-                hotspot_dialog.response.connect ((response) => {
-                    if (response == 1) {
-                        Utils.Hotspot.activate_hotspot (wifi_device,
-                                            hotspot_dialog.get_ssid (),
-                                            hotspot_dialog.get_key (),
-                                            hotspot_dialog.get_selected_connection ());
-
-                    } else {
-                        switch_updating = true;
-                        control_switch.active = false;
-                    }              
-                });
+                var hotspot_dialog = new HotspotDialog (wifi_device.get_active_access_point (), Utils.Hotspot.get_hotspot_connections (settings));
+                hotspot_dialog.response.connect (on_hotspot_dialog_response);
 
                 hotspot_dialog.run ();
                 hotspot_dialog.destroy ();
             }
         }
 
+        private void on_hotspot_dialog_response (Gtk.Dialog dialog, int response) {
+            var hotspot_dialog = (HotspotDialog)dialog;
+            if (response == 1) {
+                Utils.Hotspot.activate_hotspot (wifi_device,
+                                    hotspot_dialog.get_ssid (),
+                                    hotspot_dialog.get_key (),
+                                    hotspot_dialog.get_selected_connection ());
+
+            } else {
+                switch_updating = true;
+                control_switch.active = false;
+            }                
+        }
+
         private void update_hotspot_info () {
-            var wifi_device = (NM.DeviceWifi)device;
-            bool hotspot_mode = Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings);
+            bool hotspot_mode = Utils.Hotspot.get_device_is_hotspot (wifi_device, settings);
 
-            var mode = Utils.CustomMode.HOTSPOT_DISABLED;
+            var mode = CustomMode.HOTSPOT_DISABLED;
             if (hotspot_mode) {
-                mode = Utils.CustomMode.HOTSPOT_ENABLED;
+                mode = CustomMode.HOTSPOT_ENABLED;
             }
 
             hotspot_revealer.set_reveal_child (hotspot_mode);
 
             if (hotspot_mode) {
-                var connection = nm_settings.get_connection_by_path (wifi_device.get_active_connection ().get_connection ());
+                var connection = settings.get_connection_by_path (wifi_device.get_active_connection ().get_connection ());
 
                 var setting_wireless = connection.get_setting_wireless ();
                 ssid_label.label = _("Network Name (SSID): %s").printf (NM.Utils.ssid_to_utf8 (setting_wireless.get_ssid ()));
@@ -134,11 +135,11 @@
                 string key_mgmt = setting_wireless_security.get_key_mgmt ();
                 string? secret = null;
                 string security = "";
+                
                 if (key_mgmt == "none") {
                     secret = setting_wireless_security.get_wep_key (0);
                     security = _("(WEP)");
-                } else if (key_mgmt == "wpa-psk" ||
-                            key_mgmt == "wpa-none") {
+                } else if (key_mgmt == "wpa-psk" || key_mgmt == "wpa-none") {
                     security = _("(WPA)");
                     secret = setting_wireless_security.get_psk ();
                 }
@@ -151,18 +152,5 @@
                 key_label.label = _("Password %s: %s").printf (security, secret);  
             }
         }
-
-        private List<NM.Connection> get_hotspot_connections () {
-            var list = new List<NM.Connection> ();
-            var connections = nm_settings.list_connections ();
-
-            foreach (var connection in connections) {
-                if (Utils.Hotspot.get_connection_is_hotspot (connection)) {
-                    list.append (connection);
-                }
-            }
-
-            return list;
-        }
     }
 }

=== modified file 'src/Widgets/InfoBox.vala'
--- src/Widgets/InfoBox.vala	2016-07-19 08:28:38 +0000
+++ src/Widgets/InfoBox.vala	2016-11-20 19:56:12 +0000
@@ -142,23 +142,23 @@
         }
 
         public void update_activity (string sent_bytes, string received_bytes) {
-            sent.label = sent_bytes ?? UNKNOWN_STR;
-            received.label = received_bytes ?? UNKNOWN_STR;
+            sent.label = sent_bytes ?? Network.Utils.UNKNOWN_STR;
+            received.label = received_bytes ?? Network.Utils.UNKNOWN_STR;
         }
 
         public void update_status () {
             // Refresh DHCP4 info
             var dhcp4 = device.get_dhcp4_config ();
             if (dhcp4 != null) {
-                ip4address.label =  (dhcp4.get_one_option ("ip_address") ?? UNKNOWN_STR);
-                mask.label =  (dhcp4.get_one_option ("subnet_mask") ?? UNKNOWN_STR);
-                router.label =  (dhcp4.get_one_option ("routers") ?? UNKNOWN_STR);
-                broadcast.label =  (dhcp4.get_one_option ("broadcast_address") ?? UNKNOWN_STR);
+                ip4address.label =  (dhcp4.get_one_option ("ip_address") ?? Network.Utils.UNKNOWN_STR);
+                mask.label =  (dhcp4.get_one_option ("subnet_mask") ?? Network.Utils.UNKNOWN_STR);
+                router.label =  (dhcp4.get_one_option ("routers") ?? Network.Utils.UNKNOWN_STR);
+                broadcast.label =  (dhcp4.get_one_option ("broadcast_address") ?? Network.Utils.UNKNOWN_STR);
             } else {
-                ip4address.label = UNKNOWN_STR;
-                mask.label =  UNKNOWN_STR;
-                router.label = UNKNOWN_STR;
-                broadcast.label = UNKNOWN_STR;
+                ip4address.label = Network.Utils.UNKNOWN_STR;
+                mask.label =  Network.Utils.UNKNOWN_STR;
+                router.label = Network.Utils.UNKNOWN_STR;
+                broadcast.label = Network.Utils.UNKNOWN_STR;
             }
 
             var ip6 = device.get_ip6_config ();

=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2016-08-09 12:41:03 +0000
+++ src/Widgets/Page.vala	2016-11-20 19:56:12 +0000
@@ -19,8 +19,9 @@
  */
 
 namespace Network.Widgets {
-    public class Page : Gtk.Grid {
-        public NM.Device device;
+    public class View : AbstractView {
+        protected Gtk.Grid container;
+
         public InfoBox info_box;
         public Gtk.Switch control_switch;
         public Gtk.Grid control_box;
@@ -38,28 +39,18 @@
             }
         }
 
-        private string _title;
-        public string title {
-            get {
-                return _title;
-            }
-
-            set {
-                _title = value;
-                device_label.label = value;
-            }
-        }
-
         private Gtk.Image device_img;
         protected Gtk.Label device_label;
 
         protected Gtk.Revealer bottom_revealer;
         protected Gtk.Box bottom_box;
 
-        public Page () {
+        construct {
             margin = 24;
-            orientation = Gtk.Orientation.VERTICAL;
-            row_spacing = 24;
+
+            container = new Gtk.Grid ();            
+            container.orientation = Gtk.Orientation.VERTICAL;
+            container.row_spacing = 24;
 
             bottom_revealer = new Gtk.Revealer ();
             bottom_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_UP;
@@ -68,6 +59,7 @@
             bottom_box.pack_start (new SettingsButton (), false, false, 0);
 
             bottom_revealer.add (bottom_box);
+            add (container);            
         }
 
         public void init (NM.Device? _device) {
@@ -76,12 +68,16 @@
             device_img = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
             device_img.pixel_size = 48;
 
-            device_label = new Gtk.Label (null);
+            device_label = new Gtk.Label (display_title);
             device_label.ellipsize = Pango.EllipsizeMode.MIDDLE;
             device_label.get_style_context ().add_class ("h2");
             device_label.hexpand = true;
             device_label.xalign = 0;
 
+            notify["display-title"].connect (() => {
+                device_label.label = display_title;
+            });
+
             control_switch = new Gtk.Switch ();
             control_switch.valign = Gtk.Align.CENTER;
             update_switch ();
@@ -94,7 +90,7 @@
                 info_box.vexpand = true;
                 info_box.info_changed.connect (update);
 
-                title = Utils.type_to_string (device.get_device_type ());       
+                display_title = Network.Utils.device_type_to_string (device.get_device_type ());       
             }
 
             control_box = new Gtk.Grid ();
@@ -103,7 +99,7 @@
             control_box.add (device_label);
             control_box.add (control_switch);
 
-            add (control_box);
+            container.add (control_box);
             show_all ();
         }
 
@@ -139,8 +135,8 @@
         }
 
         public void get_activity_information (string iface, out string sent_bytes, out string received_bytes) {
-            sent_bytes = UNKNOWN_STR;
-            received_bytes = UNKNOWN_STR;
+            sent_bytes = Network.Utils.UNKNOWN_STR;
+            received_bytes = Network.Utils.UNKNOWN_STR;
 
             string tx_bytes_path = "/sys/class/net/" + iface + "/statistics/tx_bytes";
             string rx_bytes_path = "/sys/class/net/" + iface + "/statistics/rx_bytes";

=== renamed file 'src/Widgets/Proxy/ProxyPage.vala' => 'src/Widgets/Proxy/ProxyView.vala'
--- src/Widgets/Proxy/ProxyPage.vala	2016-07-29 21:08:04 +0000
+++ src/Widgets/Proxy/ProxyView.vala	2016-11-20 19:56:12 +0000
@@ -18,21 +18,21 @@
  */
 
 namespace Network.Widgets {
-    public class ProxyPage : Page {
+    public class ProxyView : View {
         public Gtk.Stack stack;
         public signal void update_status_label (string mode);
 
         private DeviceItem owner;
 
-        public ProxyPage (DeviceItem _owner) {
-            owner = _owner;
+        public ProxyView (DeviceItem owner) {
+            this.owner = owner;
 
             init (null);
-            title = _("Proxy");
+            display_title = _("Proxy");
             icon_name = "preferences-system-network";
 
-            column_spacing = 12;
-            row_spacing = 12;
+            container.column_spacing = 12;
+            container.row_spacing = 12;
             margin = 24;
             margin_bottom = 12;
 
@@ -53,8 +53,8 @@
             proxy_settings.changed.connect (update_mode);
             update_mode ();
 
-            add (stackswitcher);
-            add (stack);
+            container.add (stackswitcher);
+            container.add (stack);
 
             show_all ();
 
@@ -71,22 +71,22 @@
         }
 
         private void update_mode () {
-            var mode = Utils.CustomMode.INVALID;
+            var mode = CustomMode.INVALID;
             switch (proxy_settings.mode) {
                 case "none":
-                    mode = Utils.CustomMode.PROXY_NONE;
+                    mode = CustomMode.PROXY_NONE;
                     control_switch.active = false;
                     break;
                 case "manual":
-                    mode = Utils.CustomMode.PROXY_MANUAL;
+                    mode = CustomMode.PROXY_MANUAL;
                     control_switch.active = true;
                     break;
                 case "auto":
-                    mode = Utils.CustomMode.PROXY_AUTO;
+                    mode = CustomMode.PROXY_AUTO;
                     control_switch.active = true;
                     break;
                 default:
-                    mode = Utils.CustomMode.INVALID;
+                    mode = CustomMode.INVALID;
                     break;
             }
 

=== renamed file 'src/Widgets/VPNPage.vala' => 'src/Widgets/VPNView.vala'
--- src/Widgets/VPNPage.vala	2016-08-09 12:41:03 +0000
+++ src/Widgets/VPNView.vala	2016-11-20 19:56:12 +0000
@@ -17,10 +17,8 @@
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
-using Network.Widgets;
-
-namespace Network {
-    public class VPNPage : WidgetNMInterface {
+namespace Network.Widgets {
+    public class VPNView : View {
         private DeviceItem owner;
         private NM.VPNConnection? active_connection = null;
         private VPNMenuItem? active_vpn_item = null;
@@ -37,14 +35,14 @@
         private Gtk.Revealer top_revealer;
         private Gtk.Popover popover;
 
-        public VPNPage (DeviceItem _owner) {
-            owner = _owner;
-
-            this.init (null);
-            this.title = _("Virtual Private Network");
-            this.icon_name = "network-vpn";
-
-            row_spacing = 0;
+        public VPNView (DeviceItem owner) {
+            this.owner = owner;
+
+            init (null);
+            display_title = _("Virtual Private Network");
+            icon_name = "network-vpn";
+
+            container.row_spacing = 0;
             control_box.margin_bottom = 12;
 
             vpn_info_box = new VPNInfoBox ();
@@ -68,23 +66,12 @@
             no_connections_box.visible = true;
             no_connections_box.valign = Gtk.Align.CENTER;
 
-            var no_connections_label = new Gtk.Label (_("No VPN Connections"));
-            no_connections_label.valign = Gtk.Align.CENTER;
-            no_connections_label.wrap = true;
-            no_connections_label.wrap_mode = Pango.WrapMode.WORD_CHAR;
-            no_connections_label.max_width_chars = 30;
-            no_connections_label.justify = Gtk.Justification.CENTER;
-            no_connections_label.get_style_context ().add_class ("h2");
+            var no_connections_label = new PlaceholderLabel (_("No VPN Connections"), true);
 
-            var second_label = new Gtk.Label (_("Add a new VPN connection to begin."));
-            second_label.valign = Gtk.Align.CENTER;
-            second_label.wrap = true;
-            second_label.wrap_mode = Pango.WrapMode.WORD_CHAR;
-            second_label.max_width_chars = 30;
-            second_label.justify = Gtk.Justification.CENTER;
+            var add_connections_label = new PlaceholderLabel (_("Add a new VPN connection to begin."), false);
 
             no_connections_box.add (no_connections_label);
-            no_connections_box.add (second_label);
+            no_connections_box.add (add_connections_label);
             no_connections_box.show_all ();
 
             vpn_list = new Gtk.ListBox ();
@@ -100,8 +87,7 @@
             add_button.tooltip_text = _("Add VPN Connection…");
             add_button.clicked.connect (() => {
                 add_button.sensitive = false;
-                var command = new Granite.Services.SimpleCommand ("/usr/bin",
-                                                    "nm-connection-editor --create --type=vpn");
+                var command = new Granite.Services.SimpleCommand ("/usr/bin", "nm-connection-editor --create --type=vpn");
                 command.done.connect ((exit) => {
                     if (exit != 0) {
                         var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, "%s", _("Failed to run Connection Editor."));
@@ -137,12 +123,10 @@
             control_switch.no_show_all = true;
             control_switch.visible = false;
 
-            bottom_revealer.set_reveal_child (true);
-
-            this.add (top_revealer);
-            this.add (main_frame);
-            this.add (bottom_revealer);
-            this.show_all ();
+            container.add (top_revealer);
+            container.add (main_frame);
+            container.add (bottom_revealer);
+            show_all ();
 
             client.notify["active-connections"].connect (update_active_connection);
             update ();
@@ -157,25 +141,25 @@
                 switch (active_connection.get_vpn_state ()) {
                     case NM.VPNConnectionState.UNKNOWN:
                     case NM.VPNConnectionState.DISCONNECTED:
-                        state = State.DISCONNECTED;
+                        state = Network.Utils.State.DISCONNECTED;
                         break;
                     case NM.VPNConnectionState.PREPARE:
                     case NM.VPNConnectionState.IP_CONFIG_GET:
                     case NM.VPNConnectionState.CONNECT:
-                        state = State.CONNECTING_VPN;
+                        state = Network.Utils.State.CONNECTING_VPN;
                         item = get_item_by_uuid (active_connection.get_uuid ());
                         break;
                     case NM.VPNConnectionState.FAILED:
-                        state = State.FAILED_VPN;
+                        state = Network.Utils.State.FAILED_VPN;
                         break;
                     case NM.VPNConnectionState.ACTIVATED:
-                        state = State.CONNECTED_VPN;
+                        state = Network.Utils.State.CONNECTED_VPN;
                         item = get_item_by_uuid (active_connection.get_uuid ());
                         sensitive = true;
                         break;
                 }
             } else {
-                state = State.DISCONNECTED;
+                state = Network.Utils.State.DISCONNECTED;
             }
 
             if (disconnect_btn != null) {
@@ -254,7 +238,7 @@
                 connected_frame.show_all ();
             }
 
-            owner.switch_status (Utils.CustomMode.INVALID, state);
+            owner.switch_status (CustomMode.INVALID, state);
             update_switch ();
         }
 
@@ -268,11 +252,11 @@
 
         public void add_connection (NM.RemoteConnection connection) {
             var item = new VPNMenuItem (connection, get_previous_menu_item ());
-            item.user_action.connect (vpn_activate_cb);
+            item.activated.connect (vpn_activate_cb);
 
             vpn_list.add (item);
             update ();
-            this.show_all ();
+            show_all ();
         }
 
         public void remove_connection (NM.RemoteConnection connection) {
@@ -282,6 +266,7 @@
 
         private VPNMenuItem? get_item_by_uuid (string uuid) {
             VPNMenuItem? item = null;
+            
             foreach (var child in vpn_list.get_children ()) {
                 var _item = (VPNMenuItem)child;
                 if (_item.connection != null && _item.connection.get_uuid () == uuid && item == null) {
@@ -294,6 +279,7 @@
 
         private VPNMenuItem? get_previous_menu_item () {
             var children = vpn_list.get_children ();
+
             if (children.length () == 0) {
                 return blank_item;
             }
@@ -314,6 +300,7 @@
 
         private void vpn_activate_cb (VPNMenuItem item) {
             active_vpn_item = item;
+
             foreach (var child in vpn_list.get_children ()) {
                 ((VPNMenuItem)child).hide_icons ();
             }

=== added file 'src/Widgets/View.vala'
--- src/Widgets/View.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/View.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,159 @@
+/*-
+ * Copyright (c) 2015-2016 elementary LLC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ *              xapantu
+ */
+
+namespace Network.Widgets {
+    public class View : AbstractView {
+        protected Gtk.Grid container;
+
+        public InfoBox info_box;
+        public Gtk.Switch control_switch;
+        public Gtk.Grid control_box;
+        public signal void show_error ();
+
+        private string _icon_name;
+        public string icon_name {
+            get {
+                return _icon_name;
+            }
+
+            set {
+                _icon_name = value;
+                device_img.icon_name = value;
+            }
+        }
+
+        private Gtk.Image device_img;
+        protected Gtk.Label device_label;
+
+        protected Gtk.Revealer bottom_revealer;
+        protected Gtk.Box bottom_box;
+
+        construct {
+            margin = 24;
+
+            container = new Gtk.Grid ();            
+            container.orientation = Gtk.Orientation.VERTICAL;
+            container.row_spacing = 24;
+
+            bottom_revealer = new Gtk.Revealer ();
+            bottom_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_UP;
+            bottom_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 12);
+
+            bottom_revealer.add (bottom_box);
+            add (container);            
+        }
+
+        public void init (NM.Device? _device) {
+            this.device = _device;
+
+            device_img = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
+            device_img.pixel_size = 48;
+
+            device_label = new Gtk.Label (display_title);
+            device_label.ellipsize = Pango.EllipsizeMode.MIDDLE;
+            device_label.get_style_context ().add_class ("h2");
+            device_label.hexpand = true;
+            device_label.xalign = 0;
+
+            notify["display-title"].connect (() => {
+                device_label.label = display_title;
+            });
+
+            control_switch = new Gtk.Switch ();
+            control_switch.valign = Gtk.Align.CENTER;
+            update_switch ();
+
+            control_switch.notify["active"].connect (control_switch_activated);
+
+            if (device != null) {
+                this.info_box = new InfoBox.from_device (device);
+                info_box.margin_end = 16;
+                info_box.vexpand = true;
+                info_box.info_changed.connect (update);
+
+                display_title = Network.Utils.device_type_to_string (device.get_device_type ());       
+            }
+
+            control_box = new Gtk.Grid ();
+            control_box.column_spacing = 12;
+            control_box.add (device_img);
+            control_box.add (device_label);
+            control_box.add (control_switch);
+
+            container.add (control_box);
+            show_all ();
+        }
+
+        public override void update () {
+            if (info_box != null) {
+                string sent_bytes, received_bytes;
+                this.get_activity_information (device.get_iface (), out sent_bytes, out received_bytes);
+                info_box.update_activity (sent_bytes, received_bytes);       
+            }
+
+            update_switch ();
+
+            bottom_revealer.set_reveal_child (control_switch.active);
+        }
+
+        protected virtual void update_switch () {
+            control_switch.active = device.get_state () != NM.DeviceState.DISCONNECTED && device.get_state () != NM.DeviceState.DEACTIVATING;
+        }
+
+        protected virtual void control_switch_activated () {
+            if (!control_switch.active && device.get_state () == NM.DeviceState.ACTIVATED) {
+                device.disconnect (null);
+            } else if (control_switch.active && device.get_state () == NM.DeviceState.DISCONNECTED) {
+                var connection = new NM.Connection ();
+                var remote_array = device.get_available_connections ();
+                if (remote_array == null) {
+                    this.show_error ();
+                } else {
+                    connection.path = remote_array.get (0).get_path ();
+                    client.activate_connection (connection, device, null, null);
+                }
+            }
+        }
+
+        public void get_activity_information (string iface, out string sent_bytes, out string received_bytes) {
+            sent_bytes = Network.Utils.UNKNOWN_STR;
+            received_bytes = Network.Utils.UNKNOWN_STR;
+
+            string tx_bytes_path = "/sys/class/net/" + iface + "/statistics/tx_bytes";
+            string rx_bytes_path = "/sys/class/net/" + iface + "/statistics/rx_bytes";
+
+            if (!File.new_for_path (tx_bytes_path).query_exists () || !File.new_for_path (rx_bytes_path).query_exists ()) {
+                return;
+            }
+
+            try {
+                string tx_bytes, rx_bytes;
+
+                FileUtils.get_contents (tx_bytes_path, out tx_bytes);
+                FileUtils.get_contents (rx_bytes_path, out rx_bytes);
+
+                sent_bytes = format_size (uint64.parse (tx_bytes));
+                received_bytes = format_size (uint64.parse (rx_bytes));
+            } catch (FileError e) {
+                error ("%s\n", e.message);
+            }
+        }
+    }
+}

=== renamed file 'src/Widgets/WifiInterface.vala' => 'src/Widgets/WiFiView.vala'
--- src/Widgets/WifiInterface.vala	2016-08-09 12:41:03 +0000
+++ src/Widgets/WiFiView.vala	2016-11-20 19:56:12 +0000
@@ -17,10 +17,8 @@
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
-using Network.Widgets;
-
-namespace Network {
-    public class WifiInterface : AbstractWifiInterface {
+namespace Network.Widgets {
+    public class WiFiView : AbstractWiFiView {
         protected Gtk.Frame connected_frame;
         protected Gtk.Stack list_stack;
         protected Gtk.ScrolledWindow scrolled;
@@ -33,8 +31,12 @@
         protected Gtk.ToggleButton info_btn;
         protected Gtk.Popover popover;
 
-        public WifiInterface (NM.Client nm_client, NM.RemoteSettings settings, NM.Device device) {
-            this.init (device);
+        public WiFiView (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
+            this.client = client;
+            this.settings = settings;
+            this.device = device;
+
+            init (device);
 
             info_box.margin = 12;
 
@@ -51,11 +53,9 @@
             top_revealer = new Gtk.Revealer ();
             top_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
             top_revealer.add (connected_frame);
- 
-            init_wifi_interface (nm_client, settings, device);
 
-            this.icon_name = "network-wireless";
-            row_spacing = 0;
+            icon_name = "network-wireless";
+            container.row_spacing = 0;
 
             control_box.margin_bottom = 12;
 
@@ -71,8 +71,8 @@
             main_frame.vexpand = true;          
             main_frame.override_background_color (0, { 255, 255, 255, 255 });
 
-            var hotspot_mode = construct_placeholder_label (_("This device is in Hotspot Mode"), true);
-            var hotspot_mode_desc = construct_placeholder_label (_("Turn off the Hotspot Mode to connect to other Access Points."), false);
+            var hotspot_mode = new PlaceholderLabel (_("This device is in Hotspot Mode"), true);
+            var hotspot_mode_desc = new PlaceholderLabel (_("Turn off the Hotspot Mode to connect to other Access Points."), false);
             hotspot_mode_box.add (hotspot_mode);
             hotspot_mode_box.add (hotspot_mode_desc);
 
@@ -83,27 +83,31 @@
             scrolled = new Gtk.ScrolledWindow (null, null);
             scrolled.add (wifi_list);
 
-            list_stack.add (hotspot_mode_box);
+            list_stack.add_named (hotspot_mode_box, "hotspot");
             list_stack.add (scrolled);
             list_stack.visible_child = scrolled;
 
             main_frame.add (list_stack);
 
+            var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+
             hidden_btn = new Gtk.Button.with_label (_("Connect to Hidden Network…"));
-            hidden_btn.clicked.connect (connect_to_hidden);
-
-            bottom_box.pack_start (hidden_btn, false, false, 0);
-
-            this.add (top_revealer);
-            this.add (main_frame);
-            this.add (bottom_revealer);
-            this.show_all ();   
-
-            update ();
+            hidden_btn.clicked.connect (() => Utils.WiFi.connect_to_hidden_access_point (client, settings));
+
+            button_box.pack_start (hidden_btn, false, false, 0);
+
+            bottom_box.add (button_box);
+
+            container.add (top_revealer);
+            container.add (main_frame);
+            container.add (bottom_revealer);
+            show_all ();   
+
+            populate ();
         }
 
         public NM.RemoteSettings get_nm_settings () {
-            return nm_settings;
+            return settings;
         }
 
         public override void update () {
@@ -121,14 +125,14 @@
             }
 
             if (hidden_btn != null) {
-                hidden_btn.sensitive = (state != State.WIRED_UNPLUGGED);
+                hidden_btn.sensitive = (state != Network.Utils.State.WIRED_UNPLUGGED);
             }
 
             var old_active = active_wifi_item;
 
             base.update ();
 
-            bool is_hotspot = Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings);
+            bool is_hotspot = Utils.Hotspot.get_device_is_hotspot (wifi_device, settings);
 
             top_revealer.set_reveal_child (wifi_device.get_active_access_point () != null && !is_hotspot);
 
@@ -215,11 +219,11 @@
             }
         }
 
-        protected override void wifi_activate_cb (WifiMenuItem row) {
+        protected override void activate_wifi_item (WifiMenuItem row) {
             if (device != null) {  
                 /* Do not activate connection if it is already activated */
                 if (wifi_device.get_active_access_point () != row.ap) {
-                    var connections = nm_settings.list_connections ();
+                    var connections = settings.list_connections ();
                     var device_connections = wifi_device.filter_connections (connections);
                     var ap_connections = row.ap.filter_connections (device_connections);
 
@@ -232,34 +236,12 @@
                     var setting_wireless = new NM.SettingWireless ();
                     if (setting_wireless.add_seen_bssid (row.ap.get_bssid ())) {
                         if (row.is_secured) {
-                            var connection = new NM.Connection ();
-                            var s_con = new NM.SettingConnection ();
-                            s_con.@set (NM.SettingConnection.UUID, NM.Utils.uuid_generate ());
-                            connection.add_setting (s_con);
-
-                            var s_wifi = new NM.SettingWireless ();
-                            s_wifi.@set (NM.SettingWireless.SSID, row.ap.get_ssid ());
-                            connection.add_setting (s_wifi);
-
-                            var s_wsec = new NM.SettingWirelessSecurity ();
-                            s_wsec.@set (NM.SettingWirelessSecurity.KEY_MGMT, "wpa-psk");
-                            connection.add_setting (s_wsec);
-
-                            var wifi_dialog = new NMAWifiDialog (client,
-                                                            nm_settings,
-                                                            connection,
-                                                            wifi_device,
-                                                            row.ap,
-                                                            false);
-
-                            set_wifi_dialog_cb (wifi_dialog);
-                            wifi_dialog.run ();
-                            wifi_dialog.destroy ();
+                            Utils.WiFi.activate_secured_access_point (client, settings, wifi_device, row.ap);
                         } else {
                             client.add_and_activate_connection (new NM.Connection (),
                                                                 wifi_device,
                                                                 row.ap.get_path (),
-                                                                finish_connection_cb);
+                                                                Utils.finish_connection_cb);
                         }
                     }
                 }
@@ -267,7 +249,10 @@
                 /* Do an update at the next iteration of the main loop, so as every
                  * signal is flushed (for instance signals responsible for radio button
                  * checked) */
-                Idle.add(() => { update (); return false; });
+                Idle.add (() => {
+                    update ();
+                    return false;
+                });
             }
         }
 
@@ -280,68 +265,5 @@
 
             return null;
         }
-
-        private void finish_connection_cb (NM.Client? cb_client,
-                                        NM.ActiveConnection? cb_connection,
-                                        string? new_connection_path,
-                                        Error? error) {
-            if (error != null && error.code != 0) {
-                warning ("%s\n", error.message);
-            }
-        }
-
-        private void connect_to_hidden () {
-            var hidden_dialog = new NMAWifiDialog.for_other (client, nm_settings);
-            set_wifi_dialog_cb (hidden_dialog);
-            hidden_dialog.run ();
-            hidden_dialog.destroy ();
-        }
-
-        private void set_wifi_dialog_cb (NMAWifiDialog wifi_dialog) {
-            wifi_dialog.response.connect ((response) => {
-                if (response == Gtk.ResponseType.OK) {
-                    NM.Connection? fuzzy = null;
-                    NM.Device dialog_device;
-                    NM.AccessPoint? dialog_ap = null;
-                    var dialog_connection = wifi_dialog.get_connection (out dialog_device, out dialog_ap);
-
-                    foreach (var possible in nm_settings.list_connections ()) {
-                        if (dialog_connection.compare (possible, NM.SettingCompareFlags.FUZZY | NM.SettingCompareFlags.IGNORE_ID)) {
-                            fuzzy = possible;
-                        }
-                    }
-
-                    string? path = null;
-                    if (dialog_ap != null) {
-                        path = dialog_ap.get_path ();
-                    }
-
-                    if (fuzzy != null) {
-                        client.activate_connection (fuzzy, wifi_device, path, null);
-                    } else {
-                        var connection_setting = dialog_connection.get_setting (typeof (NM.Setting));;
-
-                        string? mode = null;
-                        var setting_wireless = (NM.SettingWireless) dialog_connection.get_setting (typeof (NM.SettingWireless));
-                        if (setting_wireless != null) {
-                            mode = setting_wireless.get_mode ();
-                        }
-
-                        if (mode == "adhoc") {
-                            if (connection_setting == null) {
-                                connection_setting = new NM.SettingConnection ();
-                            }
-
-                            dialog_connection.add_setting (connection_setting);
-                        }
-
-                        client.add_and_activate_connection (dialog_connection,
-                                                            dialog_device,
-                                                            path,
-                                                            finish_connection_cb);
-                    }
-                }
-            });
-        }
     }
 }

=== removed directory 'src/common'
=== removed file 'src/common/Utils.vala'
--- src/common/Utils.vala	2016-07-21 22:42:00 +0000
+++ src/common/Utils.vala	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public enum Network.State {
-    DISCONNECTED,
-    WIRED_UNPLUGGED,
-    CONNECTED_WIRED,
-    CONNECTED_VPN,
-    CONNECTED_WIFI,
-    CONNECTED_WIFI_WEAK,
-    CONNECTED_WIFI_OK,
-    CONNECTED_WIFI_GOOD,
-    CONNECTED_WIFI_EXCELLENT,
-    CONNECTING_WIFI,
-    CONNECTING_WIRED,
-    CONNECTING_VPN,
-    FAILED_WIRED,
-    FAILED_WIFI,
-    FAILED_VPN
-}
-
-namespace Network.Common.Utils {
-    public string network_state_to_string (Network.State state) {
-        switch(state) {
-        case Network.State.DISCONNECTED:
-            return _("Disconnected");
-        case Network.State.CONNECTED_WIFI:
-        case Network.State.CONNECTED_WIFI_WEAK:
-        case Network.State.CONNECTED_WIFI_OK:
-        case Network.State.CONNECTED_WIFI_GOOD:
-        case Network.State.CONNECTED_WIFI_EXCELLENT:
-        case Network.State.CONNECTED_WIRED:
-        case Network.State.CONNECTED_VPN:
-            return _("Connected");
-        case Network.State.FAILED_WIRED:
-        case Network.State.FAILED_WIFI:
-        case Network.State.FAILED_VPN:
-            return _("Failed");
-        case Network.State.CONNECTING_WIFI:
-        case Network.State.CONNECTING_WIRED:
-        case Network.State.CONNECTING_VPN:
-            return _("Connecting");
-        case Network.State.WIRED_UNPLUGGED:
-            return _("Cable unplugged");
-        }
-        return UNKNOWN_STR;
-    }
-}
-

=== removed directory 'src/common/Widgets'
=== removed file 'src/common/Widgets/AbstractEtherInterface.vala'
--- src/common/Widgets/AbstractEtherInterface.vala	2016-02-12 14:44:32 +0000
+++ src/common/Widgets/AbstractEtherInterface.vala	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class Network.AbstractEtherInterface : Network.WidgetNMInterface {
-
-	public override void update_name (int count) {
-		var name = device.get_description ();
-
-		/* At least for docker related interfaces, which can be fairly common */
-		if (name.has_prefix ("veth")) {
-			display_title = _("Virtual network: %s").printf(name);
-		}
-		else {
-			if (count <= 1) {
-				display_title = _("Ethernet");
-			}
-			else {
-				display_title = name;
-			}
-		}
-	}
-
-	public override void update () {
-		base.update ();
-
-		switch (device.state) {
-			case NM.DeviceState.UNKNOWN:
-			case NM.DeviceState.UNMANAGED:
-			case NM.DeviceState.FAILED:
-				state = State.FAILED_WIRED;
-				break;
-
-			/* physically not connected */
-			case NM.DeviceState.UNAVAILABLE:
-				state = State.WIRED_UNPLUGGED;
-				break;
-
-			/* virtually not working */
-			case NM.DeviceState.DISCONNECTED:
-				state = State.DISCONNECTED;
-				break;
-
-			case NM.DeviceState.DEACTIVATING:
-				state = State.FAILED_WIRED;
-				break;
-
-			/* configuration */
-			case NM.DeviceState.PREPARE:
-			case NM.DeviceState.CONFIG:
-			case NM.DeviceState.NEED_AUTH:
-			case NM.DeviceState.IP_CONFIG:
-			case NM.DeviceState.IP_CHECK:
-			case NM.DeviceState.SECONDARIES:
-				state = State.CONNECTING_WIRED;
-				break;
-
-			/* working */
-			case NM.DeviceState.ACTIVATED:
-				state = State.CONNECTED_WIRED;
-				break;
-		}
-	}
-}

=== removed file 'src/common/Widgets/AbstractHotspotInterface.vala'
--- src/common/Widgets/AbstractHotspotInterface.vala	2016-02-12 14:44:32 +0000
+++ src/common/Widgets/AbstractHotspotInterface.vala	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class Network.AbstractHotspotInterface : Network.WidgetNMInterface {
-	protected AbstractWifiInterface root_iface;
-
-	public override void update_name (int count) {
-		if (count <= 1) {
-			display_title = _("Hotspot");
-		}
-		else {
-			display_title = _("Hotspot %s").printf (device.get_description ());
-		}
-	}
-
-	public override void update () {
-#if PLUG_NETWORK
-		if (Utils.Hotspot.get_device_is_hotspot (root_iface.wifi_device, root_iface.nm_settings)) {
-			state = State.CONNECTED_WIFI;
-		}
-		else {
-			state = State.DISCONNECTED;
-		}
-#endif
-	}
-}

=== removed file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2016-07-24 22:04:55 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	1970-01-01 00:00:00 +0000
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class Network.AbstractWifiInterface : Network.WidgetNMInterface {
-	protected RFKillManager rfkill;
-	public NM.DeviceWifi? wifi_device;
-	protected NM.AccessPoint? active_ap;
-	
-	protected Gtk.ListBox wifi_list;
-
-	protected NM.Client nm_client;
-	public NM.RemoteSettings nm_settings;
-	
-	protected WifiMenuItem? active_wifi_item { get; set; }
-	protected WifiMenuItem? blank_item = null;
-	protected Gtk.Stack placeholder;
-
-	protected bool locked;
-	protected bool software_locked;
-	protected bool hardware_locked;
-	
-	uint timeout_scan = 0;
-
-	public void init_wifi_interface (NM.Client nm_client, NM.RemoteSettings nm_settings, NM.Device? _device) {
-		this.nm_client = nm_client;
-		this.nm_settings = nm_settings;
-		device = _device;
-		wifi_device = (NM.DeviceWifi)device;
-		blank_item = new WifiMenuItem.blank ();
-		active_wifi_item = null;
-		
-		var no_aps_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-		no_aps_box.visible = true;
-		no_aps_box.valign = Gtk.Align.CENTER; 
-
-		var no_aps = construct_placeholder_label (_("No Access Points Available"), true);
-
-		no_aps_box.add (no_aps);
-#if PLUG_NETWORK
-		var no_aps_desc = construct_placeholder_label (_("There are no wireless access points within range."), false);
-		no_aps_box.add (no_aps_desc);
-#endif
-
-		var wireless_off_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-		wireless_off_box.visible = true;
-		wireless_off_box.valign = Gtk.Align.CENTER;		
-
-#if PLUG_NETWORK
-		var wireless_off = construct_placeholder_label (_("Wireless Is Disabled"), true);
-		var wireless_off_desc = construct_placeholder_label (_("Enable wireless to discover nearby wireless access points."), false);
-		wireless_off_box.add (wireless_off);
-		wireless_off_box.add (wireless_off_desc);
-#endif
-
-		var spinner = new Gtk.Spinner ();
-		spinner.visible = true;
-		spinner.halign = spinner.valign = Gtk.Align.CENTER;
-		spinner.start ();
-		
-		var scanning_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
-		var scanning = construct_placeholder_label (_("Scanning for Access Points..."), true);
-		
-		scanning_box.add (scanning);
-		scanning_box.add (spinner);
-		scanning_box.visible = true;
-		scanning_box.valign = Gtk.Align.CENTER;		
-		
-		placeholder.add_named (no_aps_box, "no-aps");
-		placeholder.add_named (wireless_off_box, "wireless-off");
-		placeholder.add_named (scanning_box, "scanning");
-		placeholder.visible_child_name = "no-aps";
-
-		/* Monitor killswitch status */
-		rfkill = new RFKillManager ();
-		rfkill.open ();
-		rfkill.device_added.connect (update);
-		rfkill.device_changed.connect (update);
-		rfkill.device_deleted.connect (update);
-		
-		nm_settings.connections_read.connect (update);
-
-		wifi_device.notify["active-access-point"].connect (update);
-		wifi_device.access_point_added.connect (access_point_added_cb);
-		wifi_device.access_point_removed.connect (access_point_removed_cb);
-		wifi_device.state_changed.connect (update);
-		
-		var aps = wifi_device.get_access_points ();
-		if (aps != null && aps.length > 0) {
-			aps.foreach(access_point_added_cb);
-		}
-
-		update();
-	}
-
-	construct {
-		placeholder = new Gtk.Stack ();
-		placeholder.visible = true;
-
-		wifi_list = new Gtk.ListBox ();
-		wifi_list.set_sort_func (sort_func);
-		wifi_list.set_placeholder (placeholder);
-	}
-
-	public override void update_name (int count) {
-		if (count <= 1) {
-			display_title = _("Wireless");
-		} else {
-			display_title = device.get_description ();
-		}
-	}
-
-	protected Gtk.Label construct_placeholder_label (string text, bool title) {
-		var label = new Gtk.Label (text);
-		label.visible = true;
-		label.use_markup = true;
-		label.wrap = true;
-		label.wrap_mode = Pango.WrapMode.WORD_CHAR;
-		label.max_width_chars = 30;
-		label.justify = Gtk.Justification.CENTER;
-
-		if (title) {
-#if PLUG_NETWORK
-			label.get_style_context ().add_class ("h2");
-#endif
-		}
-
-		return label;
-	}
-
-	void access_point_added_cb (Object ap_) {
-		NM.AccessPoint ap = (NM.AccessPoint)ap_;
-		WifiMenuItem? previous_wifi_item = blank_item;
-
-		bool found = false;
-
-		foreach(var w in wifi_list.get_children()) {
-			var menu_item = (WifiMenuItem) w;
-
-			if(NM.Utils.same_ssid (ap.get_ssid (), menu_item.ssid, true)) {
-				found = true;
-				menu_item.add_ap(ap);
-				break;
-			}
-
-			previous_wifi_item = menu_item;
-		}
-
-		/* Sometimes network manager sends a (fake?) AP without a valid ssid. */
-		if(!found && ap.get_ssid() != null) {
-			WifiMenuItem item = new WifiMenuItem(ap, previous_wifi_item);
-
-			previous_wifi_item = item;
-			item.set_visible(true);
-			item.user_action.connect (wifi_activate_cb);
-
-			wifi_list.add (item);
-			wifi_list.show_all ();
-
-			update ();
-		}
-	}
-
-	void update_active_ap () {
-		debug("Update active AP");
-		
-		active_ap = wifi_device.get_active_access_point ();
-		
-		if (active_wifi_item != null) {
-			if(active_wifi_item.state == Network.State.CONNECTING_WIFI) {
-				active_wifi_item.state = Network.State.DISCONNECTED;
-			}
-			active_wifi_item = null;
-		}
-
-		if(active_ap == null) {
-			debug("No active AP");
-			blank_item.set_active (true);
-		} else {
-			debug("Active ap: %s", NM.Utils.ssid_to_utf8(active_ap.get_ssid()));
-			
-			bool found = false;
-			foreach(var w in wifi_list.get_children()) {
-				var menu_item = (WifiMenuItem) w;
-
-				if(NM.Utils.same_ssid (active_ap.get_ssid (), menu_item.ssid, true)) {
-					found = true;
-					menu_item.set_active (true);
-					active_wifi_item = menu_item;
-					active_wifi_item.state = state;
-				}
-			}
-
-			/* This can happen at start, when the access point list is populated. */
-			if (!found) {
-				debug ("Active AP not added");
-			}
-		}
-	}
-	
-	void access_point_removed_cb (Object ap_) {
-		NM.AccessPoint ap = (NM.AccessPoint)ap_;
-
-		WifiMenuItem found_item = null;
-
-		foreach(var w in wifi_list.get_children()) {
-			var menu_item = (WifiMenuItem) w;
-
-			assert(menu_item != null);
-
-			if(NM.Utils.same_ssid (ap.get_ssid (), menu_item.ssid, true)) {
-				found_item = menu_item;
-				break;
-			}
-		}
-
-		if(found_item == null) {
-			critical("Couldn't remove an access point which has not been added.");
-		} else {
-			if(!found_item.remove_ap(ap)) {
-				found_item.destroy ();
-			}
-		}
-		
-		update ();
-	}
-
-	Network.State strength_to_state (uint8 strength) {
-		if(strength < 30)
-			return Network.State.CONNECTED_WIFI_WEAK;
-		else if(strength < 55)
-			return Network.State.CONNECTED_WIFI_OK;
-		else if(strength < 80)
-			return Network.State.CONNECTED_WIFI_GOOD;
-		else
-			return Network.State.CONNECTED_WIFI_EXCELLENT;
-	}
-
-	public override void update () {
-#if PLUG_NETWORK
-		if (Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings)) {
-			state = State.DISCONNECTED;
-			return;
-		}
-#endif
-
-		switch (wifi_device.state) {
-		case NM.DeviceState.UNKNOWN:
-		case NM.DeviceState.UNMANAGED:
-		case NM.DeviceState.FAILED:
-			state = State.FAILED_WIFI;
-			if(active_wifi_item != null) {
-				active_wifi_item.state = state;
-			}
-			cancel_scan ();
-			break;
-
-		case NM.DeviceState.DEACTIVATING:
-		case NM.DeviceState.UNAVAILABLE:
-			cancel_scan ();
-			placeholder.visible_child_name = "wireless-off";
-			state = State.DISCONNECTED;
-			break;
-		case NM.DeviceState.DISCONNECTED:
-			set_scan_placeholder ();
-			state = State.DISCONNECTED;
-			break;
-
-		case NM.DeviceState.PREPARE:
-		case NM.DeviceState.CONFIG:
-		case NM.DeviceState.NEED_AUTH:
-		case NM.DeviceState.IP_CONFIG:
-		case NM.DeviceState.IP_CHECK:
-		case NM.DeviceState.SECONDARIES:
-			set_scan_placeholder ();
-			state = State.CONNECTING_WIFI;
-			break;
-		
-		case NM.DeviceState.ACTIVATED:
-			set_scan_placeholder ();
-			
-			/* That can happen if active_ap has not been added yet, at startup. */
-			if (active_ap != null) {
-				state = strength_to_state(active_ap.get_strength());
-			} else {
-				state = State.CONNECTED_WIFI_WEAK;
-			}
-			break;
-		}
-
-		debug("New network state: %s", state.to_string ());
-		
-		/* Wifi */
-		software_locked = false;
-		hardware_locked = false;
-		foreach (var device in rfkill.get_devices ()) {
-			if (device.device_type != RFKillDeviceType.WLAN)
-				continue;
-
-			if (device.software_lock)
-				software_locked = true;
-			if (device.hardware_lock)
-				hardware_locked = true;
-		}
-
-		locked = hardware_locked || software_locked;
-
-		update_active_ap ();
-
-		base.update ();
-	}
-
-	void cancel_scan () {
-		if (timeout_scan > 0) {
-			Source.remove (timeout_scan);
-			timeout_scan = 0;
-		}
-	}
-
-	void set_scan_placeholder () {
-		// this state is the previous state (because this method is called before putting the new state)
-		if (state == State.DISCONNECTED) {
-			placeholder.visible_child_name = "scanning";
-			cancel_scan ();
-			wifi_device.request_scan_simple (null);
-			timeout_scan = Timeout.add(5000, () => {
-#if PLUG_NETWORK
-				if (Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings)) {
-					return false;
-				}
-#endif
-
-				timeout_scan = 0;
-				placeholder.visible_child_name = "no-aps";
-				return false;
-			});
-		}
-	}
-
-	protected abstract void wifi_activate_cb (WifiMenuItem i);
-
-	private int sort_func (Gtk.ListBoxRow r1, Gtk.ListBoxRow r2) {
-		if (r1 == null || r2 == null) {
-			return 0;
-		}
-
-		var w1 = (WifiMenuItem)r1;
-		var w2 = (WifiMenuItem)r2;
-
-		if (w1.ap.get_strength () > w2.ap.get_strength ()) {
-			return -1;
-		} else if (w1.ap.get_strength () < w2.ap.get_strength ()) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-}

=== removed file 'src/common/Widgets/NMVisualizer.vala'
--- src/common/Widgets/NMVisualizer.vala	2016-07-24 22:04:55 +0000
+++ src/common/Widgets/NMVisualizer.vala	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class Network.Widgets.NMVisualizer : Gtk.Box {
-	protected NM.Client nm_client;
-	protected NM.RemoteSettings nm_settings;
-
-	protected GLib.List<WidgetNMInterface>? network_interface;
-
-	public Network.State state { private set; get; default = Network.State.CONNECTING_WIRED; }
-
-	construct {
-		network_interface = new GLib.List<WidgetNMInterface>();
-
-		build_ui ();
-		
-		/* Monitor network manager */
-		nm_client = new NM.Client ();
-		nm_settings = new NM.RemoteSettings (null);
-		nm_settings.new_connection.connect (new_connection_cb);
-
-		nm_client.device_added.connect (device_added_cb);
-		nm_client.device_removed.connect (device_removed_cb);
-		
-		var devices = nm_client.get_devices ();
-		for (var i = 0; i < devices.length; i++) {
-			device_added_cb (devices.get (i));
-		}
-		
-		show_all();
-	}
-
-	protected abstract void build_ui ();
-	protected abstract void add_interface (WidgetNMInterface widget_interface);
-	protected abstract void remove_interface (WidgetNMInterface widget_interface);
-	protected abstract void add_connection (NM.RemoteConnection connection);
-	protected abstract void remove_connection (NM.RemoteConnection connection);
-
-	void device_removed_cb (NM.Device device) {
-		foreach (var widget_interface in network_interface) {
-			if (widget_interface.is_device (device)) {
-				network_interface.remove (widget_interface);
-		
-				// Implementation call
-				remove_interface (widget_interface);
-				break;
-			}
-		}
-		
-		update_interfaces_names ();
-	}
-
-	void update_interfaces_names () {
-		var count_type = new Gee.HashMap<string, int?> ();
-		foreach (var iface in network_interface) {
-			var type = iface.get_type ().name ();
-			if (count_type.has_key (type)) {
-				count_type[type] = count_type[type] + 1;
-			} else {
-				count_type[type] = 1;
-			}
-		}
-
-		foreach (var iface in network_interface) {
-			var type = iface.get_type ().name ();
-			iface.update_name (count_type [type]);
-		}
-	}
-
-	void new_connection_cb (Object obj) {
-		var connection = (NM.RemoteConnection)obj;
-		connection.removed.connect (() => {
-			remove_connection (connection);
-		});
-
-		add_connection (connection);
-	}
-
-	private void device_added_cb (NM.Device device) {
-		if (device.get_iface ().has_prefix ("vmnet") ||
-			device.get_iface ().has_prefix ("lo")) {
-			return;
-		}
-
-		WidgetNMInterface? widget_interface = null;
-#if PLUG_NETWORK
-		WidgetNMInterface? hotspot_interface = null;
-#endif
-
-		if (device is NM.DeviceWifi) {
-			widget_interface = new WifiInterface (nm_client, nm_settings, device);
-#if PLUG_NETWORK
-			hotspot_interface = new HotspotInterface ((WifiInterface)widget_interface);
-#endif
-
-			debug ("Wifi interface added");
-		} else if (device is NM.DeviceEthernet) {
-			widget_interface = new EtherInterface (nm_client, nm_settings, device);
-			debug ("Ethernet interface added");
-		} else {
-			debug ("Unknown device: %s\n", device.get_device_type().to_string());
-		}
-
-		if (widget_interface != null) {
-			// Implementation call
-			network_interface.append (widget_interface);
-			add_interface(widget_interface);
-			widget_interface.notify["state"].connect(update_state);
-
-		}
-
-#if PLUG_NETWORK
-		if (hotspot_interface != null) {
-			// Implementation call
-			network_interface.append (hotspot_interface);
-			add_interface (hotspot_interface);
-			hotspot_interface.notify["state"].connect(update_state);
-		}
-#endif
-			
-		update_interfaces_names ();
-		update_all ();
-		show_all ();
-	}
-
-	void update_all () {
-		foreach (var inter in network_interface) {
-			inter.update ();
-		}
-	}
-
-	void update_state () {
-		var next_state = Network.State.DISCONNECTED;
-		foreach (var inter in network_interface) {
-			if (inter.state != Network.State.DISCONNECTED) {
-				next_state = inter.state;
-			}
-		}
-
-		state = next_state;
-	}
-}

=== removed file 'src/common/Widgets/VPNMenuItem.vala'
--- src/common/Widgets/VPNMenuItem.vala	2016-07-25 17:50:41 +0000
+++ src/common/Widgets/VPNMenuItem.vala	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class Network.VPNMenuItem : Gtk.ListBoxRow {
-	public signal void user_action();
-	public NM.RemoteConnection? connection;
-
-	public Network.State state { get; set; default = Network.State.DISCONNECTED; }
-
-	Gtk.RadioButton radio_button;
-	Gtk.Spinner spinner;
-	Gtk.Image error_img;
-	Gtk.Button remove_button;
-
-	public VPNMenuItem (NM.RemoteConnection _connection, VPNMenuItem? previous = null) {
-		connection = _connection;
-
-		var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-		main_box.margin_start = main_box.margin_end = 6;
-		radio_button = new Gtk.RadioButton(null);
-		if (previous != null) radio_button.set_group (previous.get_group ());
-
-		radio_button.button_release_event.connect ( (b, ev) => {
-			user_action();
-			return false;
-		});
-
-		error_img = new Gtk.Image.from_icon_name ("process-error-symbolic", Gtk.IconSize.MENU);
-		error_img.set_tooltip_text (_("This Virtual Private Network could not be connected to."));
-		
-		spinner = new Gtk.Spinner();
-		spinner.visible = false;
-		spinner.no_show_all = !spinner.visible;
-
-		remove_button = new Gtk.Button.from_icon_name ("user-trash-symbolic", Gtk.IconSize.MENU);
-		remove_button.get_style_context ().add_class ("flat");
-		remove_button.clicked.connect (() => {
-			connection.delete (null);
-		});
-
-		main_box.pack_start (radio_button, true, true);
-		main_box.pack_start (spinner, false, false);
-		main_box.pack_start (error_img, false, false);
-		main_box.pack_start (remove_button, false, false);
-
-		notify["state"].connect (update);
-		radio_button.notify["active"].connect (update);
-		this.add (main_box);
-		this.get_style_context ().add_class ("menuitem");
-
-		connection.changed.connect (update);
-		update ();
-	}
-
-	/**
-	 * Only used for an item which is not displayed: hacky way to have no radio button selected.
-	 **/
-	public VPNMenuItem.blank () {
-		radio_button = new Gtk.RadioButton(null);
-	}
-
-	unowned SList get_group () {
-		return radio_button.get_group();
-	}
-
-	public void set_active (bool active) {
-		radio_button.set_active (active);
-	}	
-
-	private void update () {
-		radio_button.label = connection.get_id ();
-
-		switch (state) {
-		case State.FAILED_VPN:
-			show_item(error_img);
-			break;
-		case State.CONNECTING_VPN:
-			show_item(spinner);
-			break;
-		default:
-			hide_icons ();
-			break;
-		}
-	}
-
-	public void hide_icons (bool show_remove_button = true) {
-#if PLUG_NETWORK	
-		hide_item (error_img);
-		hide_item (spinner);
-
-		if (!show_remove_button) {
-			hide_item (remove_button);
-		}
-#endif		
-	}
-
-	void show_item(Gtk.Widget w) {
-		w.visible = true;
-		w.no_show_all = !w.visible;
-	}
-
-	void hide_item(Gtk.Widget w) {
-		w.visible = false;
-		w.no_show_all = !w.visible;
-		w.hide();
-	}	
-}
\ No newline at end of file

=== removed file 'src/common/Widgets/WidgetNMInterface.vala'
--- src/common/Widgets/WidgetNMInterface.vala	2015-11-18 10:28:07 +0000
+++ src/common/Widgets/WidgetNMInterface.vala	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#if INDICATOR_NETWORK
-public abstract class Network.WidgetNMInterface : Gtk.Box {
-	protected NM.Device? device;
-#else
-public abstract class Network.WidgetNMInterface : Network.Widgets.Page {
-#endif
-	public Network.State state { get; protected set; default = Network.State.DISCONNECTED; }
-
-	public string display_title { get; protected set; default = _("Unknown device"); }
-
-#if PLUG_NETWORK
-	construct {
-		notify["display-title"].connect ( () => {
-			device_label.label = display_title;
-		});
-	}
-#endif
-
-#if INDICATOR_NETWORK
-	public Wingpanel.Widgets.Separator? sep = null;
-
-	public signal void show_dialog (Gtk.Widget w);
-	public signal void need_settings ();
-#endif
-
-	public bool is_device (NM.Device device) {
-		return device == this.device;
-	}
-	
-#if PLUG_NETWORK
-	public override void update () {
-		base.update ();
-#else
-	public virtual void update () {
-#endif
-	}
-
-	public virtual void update_name (int count) {
-		display_title = _("Unknown type: %s ").printf (device.get_description ());
-	}
-}

=== removed file 'src/common/Widgets/WifiMenuItem.vala'
--- src/common/Widgets/WifiMenuItem.vala	2016-07-24 22:04:55 +0000
+++ src/common/Widgets/WifiMenuItem.vala	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class Network.WifiMenuItem : Gtk.ListBoxRow {
-	private List<NM.AccessPoint> _ap;
-	public signal void user_action();
-	public GLib.ByteArray ssid {
-		get {
-			return _tmp_ap.get_ssid();
-		}
-	}
-
-	public Network.State state { get; set; default = Network.State.DISCONNECTED; }
-
-	public uint8 strength {
-		get {
-			uint8 strength = 0;
-			foreach(var ap in _ap) {
-				strength = uint8.max(strength, ap.get_strength());
-			}
-			return strength;
-		}
-	}
-
-	public bool is_secured {
-		get {
-			return ap.get_wpa_flags () != [e-mail] || ap.get_rsn_flags () != [e-mail];
-		}
-	}
-
-	private bool show_icons = true;
-
-	public NM.AccessPoint ap { get { return _tmp_ap; } }
-	NM.AccessPoint _tmp_ap;
-
-	Gtk.RadioButton radio_button;
-	Gtk.Image img_strength;
-	Gtk.Image lock_img;
-	Gtk.Image error_img;
-	Gtk.Spinner spinner;
-
-	public WifiMenuItem (NM.AccessPoint ap, WifiMenuItem? previous = null) {
-		var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-		radio_button = new Gtk.RadioButton(null);
-		radio_button.margin_start = 6;
-		if (previous != null) radio_button.set_group (previous.get_group ());
-
-		radio_button.button_release_event.connect ( (b, ev) => {
-			user_action();
-			return false;
-		});
-
-		img_strength = new Gtk.Image();
-		img_strength.margin_end = 6;
-		
-		lock_img = new Gtk.Image.from_icon_name ("channel-secure-symbolic", Gtk.IconSize.MENU);
-		lock_img.margin_start = 6;
-		
-		/* TODO: investigate this, it has not been tested yet. */
-		error_img = new Gtk.Image.from_icon_name ("process-error-symbolic", Gtk.IconSize.MENU);
-		error_img.margin_start = 6;
-
-		error_img.set_tooltip_text (_("This wireless network could not be connected to."));
-		
-		main_box.pack_start(radio_button, true, true);
-		spinner = new Gtk.Spinner();
-		spinner.start();
-		spinner.visible = false;
-		spinner.no_show_all = !spinner.visible;
-		main_box.pack_start(spinner, false, false);
-		main_box.pack_start(error_img, false, false);
-		main_box.pack_start(lock_img, false, false);
-		main_box.pack_start(img_strength, false, false);
-		
-		_ap = new List<NM.AccessPoint>();
-
-		/* Adding the access point triggers update */
-		add_ap(ap);
-
-		notify["state"].connect (update);
-		radio_button.notify["active"].connect (update);
-		this.add (main_box);
-		this.get_style_context ().add_class ("menuitem");
-
-		update ();
-	}
-
-	/**
-	 * Only used for an item which is not displayed: hacky way to have no radio button selected.
-	 **/
-	public WifiMenuItem.blank () {
-		radio_button = new Gtk.RadioButton(null);
-	}
-
-	void update_tmp_ap () {
-		uint8 strength = 0;
-		foreach(var ap in _ap) {
-			_tmp_ap = strength > ap.get_strength () ? _tmp_ap : ap;
-			strength = uint8.max (strength, ap.get_strength ());
-		}
-	}
-
-	public void set_active (bool active) {
-		radio_button.set_active (active);
-	}
-
-	unowned SList get_group () {
-		return radio_button.get_group();
-	}
-
-	void set_lock_img_tooltip (NM.@80211ApSecurityFlags flags) {
-		if((flags & [e-mail]_WEP40) != 0) {
-			lock_img.set_tooltip_text(_("This network uses 40/64-bit WEP encryption."));
-		} else if((flags & [e-mail]_WEP104) != 0) {
-			lock_img.set_tooltip_text(_("This network uses 104/128-bit WEP encryption."));
-		} else if((flags & [e-mail]_MGMT_PSK) != 0)  {
-			lock_img.set_tooltip_text(_("This network uses WPA encryption."));
-		} else {
-			lock_img.set_tooltip_text(_("This network uses encryption."));
-		}
-	}
-
-	private void update () {
-		radio_button.label = NM.Utils.ssid_to_utf8 (ap.get_ssid ());
-
-#if PLUG_NETWORK
-		if (show_icons) {
-#endif
-			img_strength.set_from_icon_name("network-wireless-signal-" + strength_to_string(strength) + "-symbolic", Gtk.IconSize.MENU);
-			img_strength.show_all();
-
-			lock_img.visible = is_secured;
-			set_lock_img_tooltip(ap.get_wpa_flags ());
-			lock_img.no_show_all = !lock_img.visible;
-
-			hide_item(error_img);
-			hide_item(spinner);
-#if PLUG_NETWORK
-		}
-#endif
-		switch (state) {
-		case State.FAILED_WIFI:
-			show_item(error_img);
-			break;
-		case State.CONNECTING_WIFI:
-			show_item(spinner);
-			if(!radio_button.active) {
-				critical("An access point is being connected but not active.");
-			}
-			break;
-		}
-	}
-
-	public void hide_icons () {
-#if PLUG_NETWORK	
-		show_icons = false;
-		hide_item (error_img);
-		hide_item (lock_img);
-		hide_item (img_strength);
-#endif		
-	}
-
-	void show_item(Gtk.Widget w) {
-		w.visible = true;
-		w.no_show_all = !w.visible;
-	}
-
-	void hide_item(Gtk.Widget w) {
-		w.visible = false;
-		w.no_show_all = !w.visible;
-		w.hide();
-	}
-
-	public void add_ap(NM.AccessPoint ap) {
-		_ap.append(ap);
-		update_tmp_ap();
-
-		update();
-	}
-
-	string strength_to_string(uint8 strength) {
-		if(strength < 30)
-			return "weak";
-		else if(strength < 55)
-			return "ok";
-		else if(strength < 80)
-			return "good";
-		else
-			return "excellent";
-	}
-
-	public bool remove_ap(NM.AccessPoint ap) {
-		_ap.remove(ap);
-
-		update_tmp_ap();
-
-		return _ap.length() > 0;
-	}
-}
-

=== removed file 'src/common/rfkill.vala'
--- src/common/rfkill.vala	2015-10-09 19:12:42 +0000
+++ src/common/rfkill.vala	1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd.
- * Author: Robert Ancell <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
- * license.
- */
-
-public enum RFKillDeviceType {
-    ALL = 0,
-    WLAN,
-    BLUETOOTH,
-    UWB,
-    WIMAX,
-    WMAN
-}
-
-public class RFKillDevice {
-    public signal void changed ();
-
-    public bool software_lock {
-        get { return _software_lock; }
-        set {
-            var event = RFKillEvent ();
-            event.idx = idx;
-            event.op = RFKillOperation.CHANGE;
-            event.soft = value ? 1 : 0;
-            if (Posix.write (manager.fd, &event, 8) != 8)
-                return;
-        }
-    }
-
-    public bool hardware_lock { get { return _hardware_lock; } }
-
-    public RFKillDeviceType device_type { get { return _device_type; } }
-
-    internal RFKillManager manager;
-    internal uint32 idx;
-    internal RFKillDeviceType _device_type;
-    internal bool _software_lock;
-    internal bool _hardware_lock;
-
-    internal RFKillDevice (RFKillManager manager, uint32 idx, RFKillDeviceType device_type, bool software_lock, bool hardware_lock) {
-        this.manager = manager;
-        this.idx = idx;
-        _device_type = device_type;
-        _software_lock = software_lock;
-        _hardware_lock = hardware_lock;
-    }
-}
-
-public class RFKillManager : Object {
-    public signal void device_added (RFKillDevice device);
-    public signal void device_changed (RFKillDevice device);
-    public signal void device_deleted (RFKillDevice device);
-
-    public RFKillManager () {
-        _devices = new List<RFKillDevice> ();
-    }
-
-    public void open () {
-        fd = Posix.open ("/dev/rfkill", Posix.O_RDWR);
-        Posix.fcntl (fd, Posix.F_SETFL, Posix.O_NONBLOCK);
-
-        /* Read initial state */
-        while (read_event ());
-
-        /* Monitor for events */
-        var channel = new IOChannel.unix_new (fd);
-        channel.add_watch (IOCondition.IN | IOCondition.HUP | IOCondition.ERR, () => { return read_event (); });
-    }
-
-    public List<RFKillDevice> get_devices () {
-        var devices = new List<RFKillDevice> ();
-        foreach (var device in _devices)
-            devices.append (device);
-        return devices;
-    }
-
-    public void set_software_lock (RFKillDeviceType type, bool lock_enabled) {
-        var event = RFKillEvent ();
-        event.type = type;
-        event.op = RFKillOperation.CHANGE_ALL;
-        event.soft = lock_enabled ? 1 : 0;
-        if (Posix.write (fd, &event, 8) != 8)
-            return;
-    }
-
-    internal int fd = -1;
-    private List<RFKillDevice> _devices;
-
-    private bool read_event () {
-        var event = RFKillEvent ();
-        if (Posix.read (fd, &event, 8) != 8)
-            return false;
-
-        switch (event.op) {
-        case RFKillOperation.ADD:
-            var device = new RFKillDevice (this, event.idx, (RFKillDeviceType) event.type, event.soft != 0, event.hard != 0);
-            _devices.append (device);
-            device_added (device);
-            break;
-        case RFKillOperation.DELETE:
-            var device = get_device (event.idx);
-            if (device != null) {
-                _devices.remove (device);
-                device_deleted (device);
-            }
-            break;
-        case RFKillOperation.CHANGE:
-            var device = get_device (event.idx);
-            if (device != null) {
-                device._software_lock = event.soft != 0;
-                device._hardware_lock = event.hard != 0;
-                device.changed ();
-                device_changed (device);
-            }
-            break;
-        }
-        return true;
-    }
-
-    private RFKillDevice? get_device (uint32 idx) {
-        foreach (var device in _devices) {
-            if (device.idx == idx)
-                return device;
-        }
-
-        return null;
-    }
-}
-
-private struct RFKillEvent {
-    uint32 idx;
-    uint8 type;
-    uint8 op;
-    uint8 soft;
-    uint8 hard;
-}
-
-private enum RFKillOperation {
-    ADD = 0,
-    DELETE,
-    CHANGE,
-    CHANGE_ALL
-}

=== added directory 'src/shared'
=== added directory 'src/shared/Abstract'
=== added file 'src/shared/Abstract/AbstractEthernetView.vala'
--- src/shared/Abstract/AbstractEthernetView.vala	1970-01-01 00:00:00 +0000
+++ src/shared/Abstract/AbstractEthernetView.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class Network.Widgets.AbstractEthernetView : Network.Widgets.View {
+    public override void update_name (int count) {
+        var name = device.get_description ();
+
+        /* At least for docker related interfaces, which can be fairly common */
+        if (name.has_prefix ("veth")) {
+            display_title = _("Virtual network: %s").printf (name);
+        } else {
+            if (count <= 1) {
+                display_title = _("Ethernet");
+            } else {
+                display_title = name;
+            }
+        }
+    }
+
+    public override void update () {
+        base.update ();
+
+        switch (device.state) {
+            case NM.DeviceState.UNKNOWN:
+            case NM.DeviceState.UNMANAGED:
+            case NM.DeviceState.FAILED:
+            case NM.DeviceState.DEACTIVATING:
+                state = Network.Utils.State.FAILED_WIRED;
+                break;
+
+            /* Physically not connected */
+            case NM.DeviceState.UNAVAILABLE:
+                state = Network.Utils.State.WIRED_UNPLUGGED;
+                break;
+
+            /* Virtually not working */
+            case NM.DeviceState.DISCONNECTED:
+                state = Network.Utils.State.DISCONNECTED;
+                break;
+
+            /* Configuration */
+            case NM.DeviceState.PREPARE:
+            case NM.DeviceState.CONFIG:
+            case NM.DeviceState.NEED_AUTH:
+            case NM.DeviceState.IP_CONFIG:
+            case NM.DeviceState.IP_CHECK:
+            case NM.DeviceState.SECONDARIES:
+                state = Network.Utils.State.CONNECTING_WIRED;
+                break;
+
+            /* Working */
+            case NM.DeviceState.ACTIVATED:
+                state = Network.Utils.State.CONNECTED_WIRED;
+                break;
+        }
+    }
+}

=== added file 'src/shared/Abstract/AbstractHotspotView.vala'
--- src/shared/Abstract/AbstractHotspotView.vala	1970-01-01 00:00:00 +0000
+++ src/shared/Abstract/AbstractHotspotView.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class Network.Widgets.AbstractHotspotView : Network.Widgets.View {
+    public NM.RemoteSettings settings;
+
+    protected NM.Client client;
+    protected NM.DeviceWifi wifi_device { 
+        get {
+            return (NM.DeviceWifi)device;
+        }
+    }
+
+    public override void update_name (int count) {
+        if (count <= 1) {
+            display_title = _("Hotspot");
+        } else {
+            display_title = _("Hotspot %s").printf (device.get_description ());
+        }
+    }
+
+    public override void update () {
+#if PLUG_NETWORK
+        if (Utils.Hotspot.get_device_is_hotspot (wifi_device, settings)) {
+            state = Network.Utils.State.CONNECTED_WIFI;
+        } else {
+            state = Network.Utils.State.DISCONNECTED;
+        }
+#endif
+    }
+}

=== added file 'src/shared/Abstract/AbstractView.vala'
--- src/shared/Abstract/AbstractView.vala	1970-01-01 00:00:00 +0000
+++ src/shared/Abstract/AbstractView.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class Network.Widgets.AbstractView : Gtk.Bin {
+    public Network.Utils.State state { get; protected set; default = Network.Utils.State.DISCONNECTED; }
+    public string display_title { get; protected set; default = _("Unknown device"); }
+
+    protected NM.Device? device;
+
+    public NM.Device? get_device () {
+        return device;
+    }
+
+    public virtual void update () {
+    }
+
+    public virtual void update_name (int count) {
+        display_title = _("Unknown type: %s").printf (device.get_description ());
+    }
+}

=== added file 'src/shared/Abstract/AbstractWiFiView.vala'
--- src/shared/Abstract/AbstractWiFiView.vala	1970-01-01 00:00:00 +0000
+++ src/shared/Abstract/AbstractWiFiView.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class Network.Widgets.AbstractWiFiView : Network.Widgets.View {
+    public NM.RemoteSettings settings;
+
+    protected RFKillManager rfkill;
+    protected NM.AccessPoint? active_ap;
+    
+    protected Gtk.ListBox wifi_list;
+
+    protected NM.DeviceWifi wifi_device { 
+        get {
+            return (NM.DeviceWifi)device;
+        }
+    }
+
+    protected NM.Client client;
+    protected WifiMenuItem? active_wifi_item;
+    protected WifiMenuItem? blank_item = null;
+    protected Gtk.Stack placeholder;
+
+    protected bool software_locked;
+    
+    private uint timeout_scan = 0;
+
+    private const int WEAK_STRENGH = 30;
+    private const int OK_STRENGH = 55;
+    private const int GOOD_STRENGH = 80;
+
+    construct {
+        placeholder = new Gtk.Stack ();
+        placeholder.visible = true;
+
+        wifi_list = new Gtk.ListBox ();
+        wifi_list.set_sort_func (sort_func);
+        wifi_list.set_placeholder (placeholder);
+
+        blank_item = new WifiMenuItem.blank ();
+        active_wifi_item = null;
+        
+        var no_aps_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+        no_aps_box.visible = true;
+        no_aps_box.valign = Gtk.Align.CENTER; 
+
+        var no_aps = new PlaceholderLabel (_("No Access Points Available"), true);
+
+        no_aps_box.add (no_aps);
+#if PLUG_NETWORK
+        var no_aps_desc = new PlaceholderLabel (_("There are no wireless access points within range."), false);
+        no_aps_box.add (no_aps_desc);
+#endif
+
+        var wireless_off_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+        wireless_off_box.visible = true;
+        wireless_off_box.valign = Gtk.Align.CENTER;     
+
+#if PLUG_NETWORK
+        var wireless_off = new PlaceholderLabel (_("Wireless Is Disabled"), true);
+        var wireless_off_desc = new PlaceholderLabel (_("Enable wireless to discover nearby wireless access points."), false);
+        wireless_off_box.add (wireless_off);
+        wireless_off_box.add (wireless_off_desc);
+#endif
+
+        var spinner = new Gtk.Spinner ();
+        spinner.visible = true;
+        spinner.halign = spinner.valign = Gtk.Align.CENTER;
+        spinner.start ();
+        
+        var scanning_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
+        var scanning = new PlaceholderLabel (_("Scanning for Access Points…"), true);
+        
+        scanning_box.add (scanning);
+        scanning_box.add (spinner);
+        scanning_box.visible = true;
+        scanning_box.valign = Gtk.Align.CENTER;     
+        
+        placeholder.add_named (no_aps_box, "no-aps");
+        placeholder.add_named (wireless_off_box, "wireless-off");
+        placeholder.add_named (scanning_box, "scanning");
+        placeholder.visible_child_name = "no-aps";
+
+        /* Monitor killswitch status */
+        rfkill = new RFKillManager ();
+        rfkill.open ();
+        rfkill.device_added.connect (update);
+        rfkill.device_changed.connect (update);
+        rfkill.device_deleted.connect (update);
+    }
+
+    protected abstract void activate_wifi_item (WifiMenuItem item);
+
+    protected void populate () {
+        settings.connections_read.connect (update);
+
+        wifi_device.notify["active-access-point"].connect (update);
+        wifi_device.access_point_added.connect (add_access_point_internal);
+        wifi_device.access_point_removed.connect (remove_access_point_internal);
+        wifi_device.state_changed.connect (update);
+        
+        var aps = wifi_device.get_access_points ();
+        if (aps.length > 0) {
+            aps.foreach (add_access_point_internal);
+        }
+
+        update ();
+    }   
+
+    public override void update_name (int count) {
+        if (count <= 1) {
+            display_title = _("Wireless");
+        } else {
+            display_title = device.get_description ();
+        }
+    }
+
+    private void add_access_point_internal (Object obj) {
+        NM.AccessPoint ap = (NM.AccessPoint)obj;
+        WifiMenuItem? previous_wifi_item = blank_item;
+
+        bool found = false;
+
+        foreach (var child in wifi_list.get_children ()) {
+            var menu_item = (WifiMenuItem)child;
+            if (menu_item == null) {
+                continue;
+            }
+
+            if (NM.Utils.same_ssid (ap.get_ssid (), menu_item.ssid, true)) {
+                found = true;
+                menu_item.ap = ap;
+                break;
+            }
+
+            previous_wifi_item = menu_item;
+        }
+
+        /* Sometimes network manager sends a (fake?) AP without a valid ssid. */
+        if (!found && ap.get_ssid () != null) {
+            WifiMenuItem item = new WifiMenuItem (ap, previous_wifi_item);
+
+            previous_wifi_item = item;
+            item.activated.connect (activate_wifi_item);
+
+            wifi_list.add (item);
+            wifi_list.show_all ();
+
+            update ();
+        }
+    }
+
+    private void update_active_ap () {
+        active_ap = wifi_device.get_active_access_point ();
+        
+        if (active_wifi_item != null) {
+            if (active_wifi_item.state == Network.Utils.State.CONNECTING_WIFI) {
+                active_wifi_item.state = Network.Utils.State.DISCONNECTED;
+            }
+
+            active_wifi_item = null;
+        }
+
+        if (active_ap == null) {
+            blank_item.set_active (true);
+        } else {
+            bool found = false;
+            foreach (var child in wifi_list.get_children ()) {
+                var menu_item = (WifiMenuItem)child;
+                if (menu_item == null) {
+                    continue;
+                }
+
+                if (NM.Utils.same_ssid (active_ap.get_ssid (), menu_item.ssid, true)) {
+                    found = true;
+                    menu_item.set_active (true);
+                    active_wifi_item = menu_item;
+                    active_wifi_item.state = state;
+                }
+            }
+        }
+    }
+    
+    private void remove_access_point_internal (Object obj) {
+        NM.AccessPoint ap = (NM.AccessPoint)obj;
+
+        WifiMenuItem? found_item = null;
+
+        foreach (var child in wifi_list.get_children ()) {
+            var menu_item = (WifiMenuItem)child;
+            if (menu_item == null) {
+                continue;
+            }
+
+            if (NM.Utils.same_ssid (ap.get_ssid (), menu_item.ssid, true)) {
+                found_item = menu_item;
+                break;
+            }
+        }
+
+        if (found_item != null) {
+            found_item.ap = null;
+            found_item.destroy ();
+        }
+        
+        update ();
+    }
+
+    protected Network.Utils.State strength_to_state (uint8 strength) {
+        if (strength < WEAK_STRENGH) {
+            return Network.Utils.State.CONNECTED_WIFI_WEAK;
+        } else if (strength < OK_STRENGH) {
+            return Network.Utils.State.CONNECTED_WIFI_OK;
+        } else if (strength < GOOD_STRENGH) {
+            return Network.Utils.State.CONNECTED_WIFI_GOOD;
+        }
+
+        return Network.Utils.State.CONNECTED_WIFI_EXCELLENT;
+    }
+
+    public override void update () {
+#if PLUG_NETWORK
+        if (Utils.Hotspot.get_device_is_hotspot (wifi_device, settings)) {
+            state = Network.Utils.State.DISCONNECTED;
+            return;
+        }
+#endif
+
+        switch (wifi_device.state) {
+            case NM.DeviceState.UNKNOWN:
+            case NM.DeviceState.UNMANAGED:
+            case NM.DeviceState.FAILED:
+                state = Network.Utils.State.FAILED_WIFI;
+                if(active_wifi_item != null) {
+                    active_wifi_item.state = state;
+                }
+
+                cancel_scan ();
+                break;
+            case NM.DeviceState.DEACTIVATING:
+            case NM.DeviceState.UNAVAILABLE:
+                cancel_scan ();
+                placeholder.visible_child_name = "wireless-off";
+                state = Network.Utils.State.DISCONNECTED;
+                break;
+            case NM.DeviceState.DISCONNECTED:
+                request_scan ();
+                state = Network.Utils.State.DISCONNECTED;
+                break;
+            case NM.DeviceState.PREPARE:
+            case NM.DeviceState.CONFIG:
+            case NM.DeviceState.NEED_AUTH:
+            case NM.DeviceState.IP_CONFIG:
+            case NM.DeviceState.IP_CHECK:
+            case NM.DeviceState.SECONDARIES:
+                request_scan ();
+                state = Network.Utils.State.CONNECTING_WIFI;
+                break;
+            case NM.DeviceState.ACTIVATED:
+                request_scan ();
+                
+                /* That can happen if active_ap has not been added yet, at startup. */
+                if (active_ap != null) {
+                    state = strength_to_state (active_ap.get_strength ());
+                } else {
+                    state = Network.Utils.State.CONNECTED_WIFI_WEAK;
+                }
+                
+                break;
+        }
+
+        software_locked = false;
+        foreach (var device in rfkill.get_devices ()) {
+            if (device.device_type != RFKillDeviceType.WLAN) {
+                continue;
+            }
+
+            if (!software_locked && device.software_lock) {
+                software_locked = true;
+                break;
+            }
+        }
+
+        update_active_ap ();
+        base.update ();
+    }
+
+    private void cancel_scan () {
+        if (timeout_scan > 0) {
+            Source.remove (timeout_scan);
+            timeout_scan = 0;
+        }
+    }
+
+    private void request_scan () {
+        // this state is the previous state (because this method is called before putting the new state)
+        if (state != Network.Utils.State.DISCONNECTED) {
+            return;
+        }
+
+        placeholder.visible_child_name = "scanning";
+        cancel_scan ();
+        wifi_device.request_scan_simple (null);
+        timeout_scan = Timeout.add (5000, () => {
+#if PLUG_NETWORK
+            if (Utils.Hotspot.get_device_is_hotspot (wifi_device, settings)) {
+                return false;
+            }
+#endif
+            timeout_scan = 0;
+            placeholder.visible_child_name = "no-aps";
+            return false;
+        });
+    }
+
+    private int sort_func (Gtk.ListBoxRow r1, Gtk.ListBoxRow r2) {
+        if (r1 == null || r2 == null) {
+            return 0;
+        }
+
+        var w1 = (WifiMenuItem)r1;
+        var w2 = (WifiMenuItem)r2;
+
+        if (w1.ap.get_strength () > w2.ap.get_strength ()) {
+            return -1;
+        } else if (w1.ap.get_strength () < w2.ap.get_strength ()) {
+            return 1;
+        }
+
+        return 0;
+    }
+}

=== added file 'src/shared/HotspotDialog.vala'
--- src/shared/HotspotDialog.vala	1970-01-01 00:00:00 +0000
+++ src/shared/HotspotDialog.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,226 @@
+/*-
+ * Copyright (c) 2015-2016 elementary LLC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+namespace Network.Widgets {
+    public class HotspotDialog : Gtk.Dialog {
+        private const string NEW_ID = "0";
+        private Gtk.Entry ssid_entry;
+        private Gtk.Entry key_entry;
+
+        private Gtk.Label ssid_label;
+        private Gtk.Label key_label;
+
+        private Gtk.ComboBoxText conn_combo;
+
+        private Gtk.CheckButton check_btn;
+        private Gtk.Label dumb;
+
+        private Gtk.Button create_btn;
+
+        private HashTable<string, NM.Connection> conn_hash;
+        private unowned List<NM.Connection> available;
+
+        public HotspotDialog (NM.AccessPoint? active, List<NM.Connection> _available) {
+            this.available = _available;
+            this.deletable = false;
+            this.resizable = false;
+            this.border_width = 6;
+
+            conn_hash = new HashTable<string, NM.Connection> (str_hash, str_equal);
+
+            var content_area = this.get_content_area ();
+            content_area.halign = content_area.valign = Gtk.Align.CENTER;
+
+            var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+            var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+
+            vbox.margin_left = vbox.margin_right = 6;
+
+            string? ssid_str = null;
+            if (active != null) {
+                ssid_str = NM.Utils.ssid_to_utf8 (active.get_ssid ());
+            } else {
+                ssid_str = _("current");
+            }
+
+            var title = new Gtk.Label ("<span weight='bold' size='larger'>" + _("Wireless Hotspot") + "</span>");
+            title.use_markup = true;
+            title.halign = Gtk.Align.START;
+
+            var image = new Gtk.Image.from_icon_name ("network-wireless-hotspot", Gtk.IconSize.DIALOG);
+            image.valign = Gtk.Align.START;
+            main_box.add (image);
+
+            var info_label = new Gtk.Label (_("Enabling Wireless Hotspot will disconnect from %s network.").printf (ssid_str) + "\n" +
+            _("You will not be able to connect to a wireless network while Hotspot is active."));
+            info_label.halign = Gtk.Align.START;
+            info_label.margin_top = 6;
+            info_label.use_markup = true;
+
+            var grid = new Gtk.Grid ();
+            grid.hexpand = true;
+            grid.row_spacing = 6;
+            grid.column_spacing = 12;
+            grid.vexpand_set = true;
+
+            ssid_entry = new Gtk.Entry ();
+            ssid_entry.hexpand = true;
+            ssid_entry.text = get_ssid_for_hotspot ();
+
+            key_entry = new Gtk.Entry ();
+            key_entry.hexpand = true;
+            key_entry.visibility = false;
+            key_entry.secondary_icon_tooltip_text = _("Password needs to be at least 8 characters long.");
+
+            check_btn = new Gtk.CheckButton.with_label (_("Show Password"));
+            check_btn.toggled.connect (() => {
+                key_entry.visibility = check_btn.active;
+            });
+
+            ssid_entry.changed.connect (update);
+            key_entry.changed.connect (update);
+
+            ssid_label = new Gtk.Label (_("Network Name:"));
+            ssid_label.halign = Gtk.Align.END;
+
+            key_label = new Gtk.Label (_("Password:"));      
+            key_label.halign = Gtk.Align.END;
+
+            conn_combo = new Gtk.ComboBoxText ();
+            conn_combo.append (NEW_ID, _("New…"));
+            int i = 1;
+            foreach (var connection in available) {
+                var setting_wireless = connection.get_setting_wireless ();
+                conn_combo.append (i.to_string (), NM.Utils.ssid_to_utf8 (setting_wireless.get_ssid ()));
+                conn_hash.insert (i.to_string (), connection);
+                i++;
+            }
+
+            conn_combo.active_id = NEW_ID;
+            conn_combo.changed.connect (update);
+
+            var conn_label = new Gtk.Label (_("Connection:"));
+            conn_label.halign = Gtk.Align.END;
+
+            grid.attach (conn_label, 0, 0, 1, 1);
+            grid.attach_next_to (conn_combo, conn_label, Gtk.PositionType.RIGHT, 1, 1);
+
+            dumb = new Gtk.Label ("");
+
+            grid.attach_next_to (ssid_label, conn_label, Gtk.PositionType.BOTTOM, 1, 1);
+            grid.attach_next_to (ssid_entry, ssid_label, Gtk.PositionType.RIGHT, 1, 1);
+            grid.attach_next_to (key_label, ssid_label, Gtk.PositionType.BOTTOM, 1, 1);
+            grid.attach_next_to (key_entry, key_label, Gtk.PositionType.RIGHT, 1, 1);
+            grid.attach_next_to (dumb, key_label, Gtk.PositionType.BOTTOM, 1, 1);
+            grid.attach_next_to (check_btn, dumb, Gtk.PositionType.RIGHT, 1, 1);
+
+            var cancel_btn = new Gtk.Button.with_label (_("Cancel"));
+            create_btn = new Gtk.Button.with_label (_("Enable Hotspot"));
+            if (active != null) {
+                create_btn.label = _("Switch to Hotspot");
+            }
+
+            create_btn.get_style_context ().add_class ("suggested-action");
+
+            this.add_action_widget (cancel_btn, 0);
+            this.add_action_widget (create_btn, 1);
+
+            vbox.add (title);
+            vbox.add (info_label);
+            vbox.add (grid);
+
+            update ();
+
+            main_box.add (vbox);
+            content_area.add (main_box);
+            this.show_all ();
+        }
+
+        public ByteArray get_ssid () {
+            var byte_array = new ByteArray ();
+            byte_array.append (ssid_entry.get_text ().data);
+            return byte_array;
+        }
+
+        public string get_key () {
+            return key_entry.get_text ();
+        }
+
+        public NM.Connection? get_selected_connection () {
+            return conn_hash[conn_combo.get_active_id ()];
+        }
+
+        private string get_ssid_for_hotspot () {
+            string hostname = "";
+            try {
+                Process.spawn_command_line_sync ("hostname", out hostname, null, null);
+            } catch (SpawnError e) {
+                warning ("%s\n", e.message);
+            }
+
+            return hostname.strip ().replace ("\n", "");
+        }
+
+        private void update () {
+            bool sensitive = (conn_combo.get_active_id () == NEW_ID);
+            ssid_label.sensitive = sensitive;
+            key_label.sensitive = sensitive;
+
+            ssid_entry.sensitive = sensitive;
+            key_entry.sensitive = sensitive;
+
+            check_btn.sensitive = sensitive;
+            dumb.sensitive = sensitive;
+
+            string? secret = null;
+            if (get_selected_connection () != null) {
+                var setting_wireless_security = get_selected_connection ().get_setting_wireless_security ();
+
+                string key_mgmt = setting_wireless_security.get_key_mgmt ();
+                if (key_mgmt == "none") {
+                    secret = setting_wireless_security.get_wep_key (0);
+                } else if (key_mgmt == "wpa-psk" || key_mgmt == "wpa-none") {
+                    secret = setting_wireless_security.get_psk ();
+                }
+
+                if (secret == null) {
+                    var connection = get_selected_connection ();
+                    Utils.Hotspot.update_secrets (((NM.RemoteConnection) connection), update);
+                }
+            }
+
+            if (conn_combo.get_active_id () != NEW_ID) {
+                ssid_entry.text = NM.Utils.ssid_to_utf8 (get_selected_connection ().get_setting_wireless ().get_ssid ());
+                if (secret == null) {
+                    secret = "";
+                }
+
+                key_entry.text = secret;
+            }
+
+            create_btn.sensitive = ((ssid_entry.get_text () != "" && key_entry.get_text ().to_utf8 ().length >= 8) || !sensitive);
+
+            if (key_entry.get_text ().to_utf8 ().length < 8 && key_entry.get_text () != "") {
+                key_entry.set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "process-error-symbolic");
+            } else {
+                key_entry.set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "");
+            }
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/shared/PlaceholderLabel.vala'
--- src/shared/PlaceholderLabel.vala	1970-01-01 00:00:00 +0000
+++ src/shared/PlaceholderLabel.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class Network.Widgets.PlaceholderLabel : Gtk.Label {
+    public PlaceholderLabel (string text, bool title) {
+        label = text;
+        visible = true;
+        use_markup = true;
+        wrap = true;
+        wrap_mode = Pango.WrapMode.WORD_CHAR;
+        max_width_chars = 30;
+        justify = Gtk.Justification.CENTER;
+
+#if PLUG_NETWORK
+        if (title) {
+            get_style_context ().add_class ("h2");
+        }
+#endif
+    }
+}
\ No newline at end of file

=== added file 'src/shared/RFKill.vala'
--- src/shared/RFKill.vala	1970-01-01 00:00:00 +0000
+++ src/shared/RFKill.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ * Copyright (C) 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * 
+ * Author: Robert Ancell <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
+ * license.
+ */
+
+namespace Network {
+    public enum RFKillDeviceType {
+        ALL = 0,
+        WLAN,
+        BLUETOOTH,
+        UWB,
+        WIMAX,
+        WMAN
+    }
+
+    private struct RFKillEvent {
+        uint32 idx;
+        uint8 type;
+        uint8 op;
+        uint8 soft;
+        uint8 hard;
+    }
+
+    private enum RFKillOperation {
+        ADD = 0,
+        DELETE,
+        CHANGE,
+        CHANGE_ALL
+    }
+
+    public class RFKillDevice : Object {
+        public signal void changed ();
+
+        private bool _software_lock;
+        public bool software_lock {
+            get { return _software_lock; }
+            set {
+                var event = RFKillEvent ();
+                event.idx = idx;
+                event.op = RFKillOperation.CHANGE;
+                event.soft = value ? 1 : 0;
+
+                _software_lock = value;
+                Posix.write (manager.fd, &event, 8);
+            }
+        }
+
+        public bool hardware_lock;
+        public RFKillDeviceType device_type;
+        public uint32 idx;
+
+        private RFKillManager manager;
+
+        public RFKillDevice (RFKillManager manager, uint32 idx, RFKillDeviceType device_type, bool software_lock, bool hardware_lock) {
+            this.manager = manager;
+            this.idx = idx;
+            this.device_type = device_type;
+            this.software_lock = software_lock;
+            this.hardware_lock = hardware_lock;
+        }
+    }
+
+    public class RFKillManager : Object {
+        public signal void device_added (RFKillDevice device);
+        public signal void device_changed (RFKillDevice device);
+        public signal void device_deleted (RFKillDevice device);
+
+        public int fd = -1;
+        private List<RFKillDevice> devices;
+
+        public RFKillManager () {
+            devices = new List<RFKillDevice> ();
+        }
+
+        public void open () {
+            fd = Posix.open ("/dev/rfkill", Posix.O_RDWR);
+            Posix.fcntl (fd, Posix.F_SETFL, Posix.O_NONBLOCK);
+
+            /* Read initial state */
+            while (read_event ());
+
+            /* Monitor for events */
+            var channel = new IOChannel.unix_new (fd);
+            channel.add_watch (IOCondition.IN | IOCondition.HUP | IOCondition.ERR, () => { return read_event (); });
+        }
+
+        public unowned List<RFKillDevice> get_devices () {
+            return devices;
+        }
+
+        public void set_software_lock (RFKillDeviceType type, bool lock_enabled) {
+            var event = RFKillEvent ();
+            event.type = type;
+            event.op = RFKillOperation.CHANGE_ALL;
+            event.soft = lock_enabled ? 1 : 0;
+            Posix.write (fd, &event, 8);
+        }
+
+        private bool read_event () {
+            var event = RFKillEvent ();
+            if (Posix.read (fd, &event, 8) != 8) {
+                return false;
+            }
+
+            switch (event.op) {
+                case RFKillOperation.ADD:
+                    var device = new RFKillDevice (this, event.idx, (RFKillDeviceType)event.type, event.soft != 0, event.hard != 0);
+                    devices.append (device);
+                    device_added (device);
+                    break;
+                case RFKillOperation.DELETE:
+                    var device = get_device_from_index (event.idx);
+                    if (device != null) {
+                        devices.remove (device);
+                        device_deleted (device);
+                    }
+
+                    break;
+                case RFKillOperation.CHANGE:
+                    var device = get_device_from_index (event.idx);
+                    if (device != null) {
+                        device.software_lock = event.soft != 0;
+                        device.hardware_lock = event.hard != 0;
+                        device.changed ();
+                        device_changed (device);
+                    }
+
+                    break;
+            }
+
+            return true;
+        }
+
+        private RFKillDevice? get_device_from_index (uint32 idx) {
+            foreach (var device in devices) {
+                if (device.idx == idx) {
+                    return device;
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/shared/Utils.vala'
--- src/shared/Utils.vala	1970-01-01 00:00:00 +0000
+++ src/shared/Utils.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,385 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Network.Utils {
+    public const string UNKNOWN_STR = N_("Unknown");
+
+    namespace Hotspot {
+        public delegate void UpdateSecretCallback ();
+
+        public static void activate_hotspot (NM.DeviceWifi wifi_device,
+                                            ByteArray ssid,
+                                            string key,
+                                            NM.Connection? selected) {
+            if (selected != null) {
+                client.activate_connection (selected, wifi_device, null, null);
+                return;
+            }
+
+            var hotspot_c = new NM.Connection ();
+
+            var setting_connection = new NM.SettingConnection ();
+            setting_connection.set (NM.SettingConnection.TYPE, "802-11-wireless");
+            setting_connection.set (NM.SettingConnection.ID, "Hotspot");
+            setting_connection.autoconnect = false;
+            hotspot_c.add_setting (setting_connection);
+
+            var setting_wireless = new NM.SettingWireless ();
+
+            string? mode = null;
+            var caps = wifi_device.get_capabilities ();
+            if ((caps & NM.DeviceWifiCapabilities.AP) != 0) {
+                mode = NM.SettingWireless.MODE_AP;
+            } else {
+                mode = NM.SettingWireless.MODE_ADHOC;
+            }
+
+            setting_wireless.mode = mode;
+            setting_wireless.security = "802-11-wireless-security";
+
+            hotspot_c.add_setting (setting_wireless);
+
+            var ip4_setting = new NM.SettingIP4Config ();
+            ip4_setting.method = "shared";
+            hotspot_c.add_setting (ip4_setting);
+
+            setting_wireless.set (NM.SettingWireless.SSID, ssid);
+
+            var setting_wireless_security = new NM.SettingWirelessSecurity ();
+
+            if (mode == NM.SettingWireless.MODE_AP) {
+                if ((caps & NM.DeviceWifiCapabilities.RSN) != 0) {
+                    set_wpa_key (setting_wireless_security, key);
+                    setting_wireless_security.add_proto ("rsn");
+                    setting_wireless_security.add_pairwise ("ccmp");
+                    setting_wireless_security.add_group ("ccmp");
+                } else if ((caps & NM.DeviceWifiCapabilities.WPA) != 0) {
+                    set_wpa_key (setting_wireless_security, key);
+                    setting_wireless_security.add_proto ("wpa");
+                    setting_wireless_security.add_pairwise ("tkip");
+                    setting_wireless_security.add_group ("tkip");                       
+                } else {
+                    set_wep_key (setting_wireless_security, key);
+                }
+            } else {
+                set_wep_key (setting_wireless_security, key);
+            }
+
+            hotspot_c.add_setting (setting_wireless_security);
+            client.add_and_activate_connection (hotspot_c,
+                                                wifi_device,
+                                                null,
+                                                finish_connection_cb);
+        }
+
+        public static void update_secrets (NM.RemoteConnection connection, UpdateSecretCallback callback) {
+            connection.get_secrets (connection.get_setting_wireless ().get_security (), ((_connection, secrets, error) => {
+                var setting_wireless = _connection.get_setting_wireless ();
+                try {
+                    _connection.update_secrets (setting_wireless.get_security (), secrets);
+                } catch (Error e) {
+                    warning ("%s\n", e.message);
+                    return;
+                }         
+
+                callback ();
+            }));
+        }
+
+        public static void deactivate_hotspot (NM.DeviceWifi wifi_device) {
+            client.get_active_connections ().foreach ((active_connection) => {
+                var devices = active_connection.get_devices ();
+                if (devices != null && devices.get (0) == wifi_device) {
+                    client.deactivate_connection (active_connection);
+                }
+            });        
+        }
+
+        private static void set_wpa_key (NM.SettingWirelessSecurity setting, string key) {
+            setting.key_mgmt = "wpa-psk";
+            setting.psk = key;
+        }
+
+        private static void set_wep_key (NM.SettingWirelessSecurity setting, string key) {
+            setting.key_mgmt = "none";
+            setting.wep_key0 = key;
+            setting.wep_key_type = NM.WepKeyType.PASSPHRASE;
+        }
+
+        public static bool get_device_is_hotspot (NM.DeviceWifi wifi_device, NM.RemoteSettings nm_settings) {
+            if (wifi_device.get_active_connection () != null) {
+                var connection = nm_settings.get_connection_by_path (wifi_device.get_active_connection ().get_connection ());
+                if (connection != null) {
+                    var ip4_setting = connection.get_setting_ip4_config ();
+                    return (ip4_setting != null && ip4_setting.get_method () == "shared");
+                }
+            }
+
+            return false;
+        }
+
+        public static List<NM.Connection> get_hotspot_connections (NM.RemoteSettings settings) {
+            var list = new List<NM.Connection> ();
+            var connections = settings.list_connections ();
+
+            foreach (var connection in connections) {
+                if (Utils.Hotspot.get_connection_is_hotspot (connection)) {
+                    list.append (connection);
+                }
+            }
+
+            return list;
+        }
+
+        public static bool get_connection_is_hotspot (NM.Connection connection) {
+            var setting_connection = connection.get_setting_connection ();
+            if (setting_connection.get_connection_type () != "802-11-wireless") {
+                return false;
+            }
+
+            var setting_wireless = connection.get_setting_wireless ();
+            if (setting_wireless.get_mode () != "adhoc" && setting_wireless.get_mode () != "ap") {
+                return false;
+            }
+
+            if (setting_wireless.get_security () != "802-11-wireless-security") {
+                return false;
+            }
+
+            var ip4_config = connection.get_setting_ip4_config ();
+            if (ip4_config.get_method () != "shared") {
+                return false;
+            }
+
+            return true;
+        }
+
+        private static void finish_connection_cb (NM.Client? cb_client,
+                                        NM.ActiveConnection? cb_connection,
+                                        string? new_connection_path,
+                                        Error? error) {
+            if (error != null && error.code != 0) {
+                warning ("%s\n", error.message);
+            }        
+        }
+    }
+
+    namespace WiFi {
+        public static void activate_secured_access_point (NM.Client client,
+                                                    NM.RemoteSettings settings,
+                                                    NM.Device wifi_device,
+                                                    NM.AccessPoint ap) {
+            var connection = new NM.Connection ();
+            var s_con = new NM.SettingConnection ();
+            s_con.set (NM.SettingConnection.UUID, NM.Utils.uuid_generate ());
+            connection.add_setting (s_con);
+
+            var s_wifi = new NM.SettingWireless ();
+            s_wifi.set (NM.SettingWireless.SSID, ap.get_ssid ());
+            connection.add_setting (s_wifi);
+
+            var s_wsec = new NM.SettingWirelessSecurity ();
+            s_wsec.set (NM.SettingWirelessSecurity.KEY_MGMT, "wpa-psk");
+            connection.add_setting (s_wsec);
+
+            var wifi_dialog = new NMAWifiDialog (client,
+                                            settings,
+                                            connection,
+                                            wifi_device,
+                                            ap,
+                                            false);
+
+            wifi_dialog.response.connect ((response) => wifi_dialog_response_cb (wifi_dialog, response, client, settings));
+
+            wifi_dialog.run ();
+            wifi_dialog.destroy ();            
+        }
+
+        public static void connect_to_hidden_access_point (NM.Client client, NM.RemoteSettings settings) {
+            var hidden_dialog = new NMAWifiDialog.for_other (client, settings);
+            hidden_dialog.response.connect ((response) => wifi_dialog_response_cb (hidden_dialog, response, client, settings));
+            hidden_dialog.run ();
+            hidden_dialog.destroy ();
+        }
+
+        private static void wifi_dialog_response_cb (NMAWifiDialog dialog, int response, NM.Client client, NM.RemoteSettings settings) {
+            if (response != Gtk.ResponseType.OK) {
+                return;
+            }
+
+            NM.Connection? fuzzy = null;
+            NM.Device device;
+            NM.AccessPoint ap;
+            var connection = dialog.get_connection (out device, out ap);
+
+            foreach (var possible in settings.list_connections ()) {
+                if (connection.compare (possible, NM.SettingCompareFlags.FUZZY | NM.SettingCompareFlags.IGNORE_ID)) {
+                    fuzzy = possible;
+                }
+            }
+
+            if (fuzzy != null) {
+                client.activate_connection (fuzzy, device, ap.get_path (), null);
+            } else {
+                var connection_setting = connection.get_setting (typeof (NM.Setting));;
+
+                string mode = "";
+                var setting_wireless = (NM.SettingWireless) connection.get_setting (typeof (NM.SettingWireless));
+                if (setting_wireless != null) {
+                    mode = setting_wireless.get_mode ();
+                }
+
+                if (mode == "adhoc") {
+                    if (connection_setting == null) {
+                        connection_setting = new NM.SettingConnection ();
+                    }
+
+                    connection.add_setting (connection_setting);
+                }
+
+                client.add_and_activate_connection (connection,
+                                                    device,
+                                                    ap.get_path (),
+                                                    Utils.finish_connection_cb);
+            }
+        }    
+    }
+
+    public enum State {
+        DISCONNECTED,
+        WIRED_UNPLUGGED,
+        CONNECTED_WIRED,
+        CONNECTED_VPN,
+        CONNECTED_WIFI,
+        CONNECTED_WIFI_WEAK,
+        CONNECTED_WIFI_OK,
+        CONNECTED_WIFI_GOOD,
+        CONNECTED_WIFI_EXCELLENT,
+        CONNECTING_WIFI,
+        CONNECTING_WIRED,
+        CONNECTING_VPN,
+        FAILED_WIRED,
+        FAILED_WIFI,
+        FAILED_VPN;
+
+        public string to_localized_string () {
+            switch (this) {
+                case Network.Utils.State.DISCONNECTED:
+                    return _("Disconnected");
+                case Network.Utils.State.CONNECTED_WIFI:
+                case Network.Utils.State.CONNECTED_WIFI_WEAK:
+                case Network.Utils.State.CONNECTED_WIFI_OK:
+                case Network.Utils.State.CONNECTED_WIFI_GOOD:
+                case Network.Utils.State.CONNECTED_WIFI_EXCELLENT:
+                case Network.Utils.State.CONNECTED_WIRED:
+                case Network.Utils.State.CONNECTED_VPN:
+                    return _("Connected");
+                case Network.Utils.State.FAILED_WIRED:
+                case Network.Utils.State.FAILED_WIFI:
+                case Network.Utils.State.FAILED_VPN:
+                    return _("Failed");
+                case Network.Utils.State.CONNECTING_WIFI:
+                case Network.Utils.State.CONNECTING_WIRED:
+                case Network.Utils.State.CONNECTING_VPN:
+                    return _("Connecting");
+                case Network.Utils.State.WIRED_UNPLUGGED:
+                    return _("Cable unplugged");
+            }
+
+            return UNKNOWN_STR;
+        }
+    }
+
+    public static void set_widget_visible (Gtk.Widget widget, bool visible) {
+        widget.no_show_all = !visible;
+        widget.visible = visible;
+    }
+
+    public static string device_state_to_string (NM.DeviceState state) {
+        switch (state) {
+            case NM.DeviceState.ACTIVATED:
+                return _("Connected");
+            case NM.DeviceState.DISCONNECTED:
+                return _("Disconnected");  
+            case NM.DeviceState.UNMANAGED:
+                return _("Unmanaged");
+            case NM.DeviceState.PREPARE:
+                return _("In preparation");
+            case NM.DeviceState.CONFIG:
+                return _("Connecting…");
+            case NM.DeviceState.NEED_AUTH:
+                return _("Requires more information");
+            case NM.DeviceState.IP_CONFIG:
+                return _("Requesting adresses...");
+            case NM.DeviceState.IP_CHECK:
+                return _("Checking connection...");
+            case NM.DeviceState.SECONDARIES:
+                return _("Waiting for connection...");
+            case NM.DeviceState.DEACTIVATING:
+                return _("Disconnecting...");
+            case NM.DeviceState.FAILED:
+                return _("Failed to connect");
+            case NM.DeviceState.UNKNOWN:
+            default:
+                return UNKNOWN_STR;
+        }
+    }
+
+    public static string device_type_to_string (NM.DeviceType type) {
+        switch (type) {
+            case NM.DeviceType.ETHERNET:
+                return _("Ethernet");
+            case NM.DeviceType.WIFI:
+                return _("Wi-Fi");  
+            case NM.DeviceType.UNUSED1:
+                return _("Not used");
+            case NM.DeviceType.UNUSED2:
+                return _("Not used");
+            case NM.DeviceType.BT:
+                return _("Bluetooth");
+            case NM.DeviceType.OLPC_MESH:
+                return _("OLPC XO");
+            case NM.DeviceType.WIMAX:
+                return _("WiMAX Broadband");
+            case NM.DeviceType.MODEM:
+                return _("Modem");
+            case NM.DeviceType.INFINIBAND:
+                return _("InfiniBand device");
+            case NM.DeviceType.BOND:
+                return _("Bond master");
+            case NM.DeviceType.VLAN:
+                return _("VLAN Interface");
+            case NM.DeviceType.ADSL:
+                return _("ADSL Modem");
+            case NM.DeviceType.BRIDGE:
+                return _("Bridge master");
+            case NM.DeviceType.UNKNOWN:
+            default:
+                return UNKNOWN_STR;
+        }
+    }   
+
+    public static void finish_connection_cb (NM.Client? cb_client,
+                                    NM.ActiveConnection? cb_connection,
+                                    string? new_connection_path,
+                                    Error? error) {
+        if (error != null && error.code != 0) {
+            warning ("%s\n", error.message);
+        }
+    }     
+}
+

=== added file 'src/shared/VPNMenuItem.vala'
--- src/shared/VPNMenuItem.vala	1970-01-01 00:00:00 +0000
+++ src/shared/VPNMenuItem.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class Network.VPNMenuItem : Gtk.ListBoxRow {
+    public signal void activated ();
+    public NM.RemoteConnection? connection;
+
+    public Network.Utils.State state { get; set; default = Network.Utils.State.DISCONNECTED; }
+
+    private Gtk.RadioButton radio_button;
+    private Gtk.Spinner spinner;
+    private Gtk.Image error_img;
+    private Gtk.Button remove_button;
+
+    public VPNMenuItem (NM.RemoteConnection connection, VPNMenuItem? previous = null) {
+        this.connection = connection;
+
+        var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        main_box.margin_start = main_box.margin_end = 6;
+        radio_button = new Gtk.RadioButton (null);
+        if (previous != null) {
+            radio_button.set_group (previous.get_group ());
+        }
+
+        radio_button.button_release_event.connect (() => {
+            activated ();
+            return false;
+        });
+
+        error_img = new Gtk.Image.from_icon_name ("process-error-symbolic", Gtk.IconSize.MENU);
+        error_img.set_tooltip_text (_("This Virtual Private Network could not be connected to."));
+        
+        spinner = new Gtk.Spinner();
+        spinner.visible = false;
+        spinner.no_show_all = !spinner.visible;
+
+        remove_button = new Gtk.Button.from_icon_name ("user-trash-symbolic", Gtk.IconSize.MENU);
+        remove_button.get_style_context ().add_class ("flat");
+        remove_button.clicked.connect (() => {
+            connection.delete (null);
+        });
+
+        main_box.pack_start (radio_button, true, true);
+        main_box.pack_start (spinner, false, false);
+        main_box.pack_start (error_img, false, false);
+        main_box.pack_start (remove_button, false, false);
+
+        notify["state"].connect (update);
+        radio_button.notify["active"].connect (update);
+        this.add (main_box);
+        this.get_style_context ().add_class ("menuitem");
+
+        connection.changed.connect (update);
+        update ();
+    }
+
+    /**
+     * Only used for an item which is not displayed: hacky way to have no radio button selected.
+     **/
+    public VPNMenuItem.blank () {
+        radio_button = new Gtk.RadioButton (null);
+    }
+
+    unowned SList get_group () {
+        return radio_button.get_group ();
+    }
+
+    public void set_active (bool active) {
+        radio_button.set_active (active);
+    }   
+
+    private void update () {
+        radio_button.label = connection.get_id ();
+
+        switch (state) {
+            case Network.Utils.State.FAILED_VPN:
+                Network.Utils.set_widget_visible (error_img, true);
+                break;
+            case Network.Utils.State.CONNECTING_VPN:
+                Network.Utils.set_widget_visible (spinner, true);
+                break;
+            default:
+                hide_icons ();
+                break;
+        }
+    }
+
+    public void hide_icons (bool show_remove_button = true) {
+#if PLUG_NETWORK    
+        Network.Utils.set_widget_visible (error_img, false);
+        Network.Utils.set_widget_visible (spinner, false);
+
+        if (!show_remove_button) {
+            Network.Utils.set_widget_visible (remove_button, false);
+        }
+#endif      
+    }
+}
\ No newline at end of file

=== added file 'src/shared/ViewManager.vala'
--- src/shared/ViewManager.vala	1970-01-01 00:00:00 +0000
+++ src/shared/ViewManager.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class Network.ViewManager : Gtk.Bin {
+    protected NM.Client client;
+    protected NM.RemoteSettings settings;
+
+    protected GLib.List<Widgets.AbstractView> view_list;
+
+    public Network.Utils.State state;
+
+    construct {
+        view_list = new GLib.List<Widgets.AbstractView> ();
+
+        /* Monitor network manager */
+        client = new NM.Client ();
+        settings = new NM.RemoteSettings (null);
+    }
+
+    /*
+     * Objects implementing this class need to call this method after
+     * the UI initialization is done
+     */
+    protected void populate () {
+        client.device_added.connect (add_device_internal);
+        client.device_removed.connect (remove_device_internal);
+
+        settings.new_connection.connect (new_connection_cb);
+
+        var devices = client.get_devices ();
+        for (var i = 0; i < devices.length; i++) {
+            add_device_internal (devices.get (i));
+        }
+    }
+
+    /* Objects using this interface need to implement these methods */
+    protected abstract void add_view (Widgets.AbstractView widget_interface);
+    protected abstract void remove_view (Widgets.AbstractView widget_interface);
+    protected abstract void add_connection (NM.RemoteConnection connection);
+    protected abstract void remove_connection (NM.RemoteConnection connection);
+
+    private void add_device_internal (NM.Device device) {
+        if (device.get_iface ().has_prefix ("vmnet") ||
+            device.get_iface ().has_prefix ("lo")) {
+            return;
+        }
+
+        Widgets.AbstractView? view = null;
+
+        if (device is NM.DeviceWifi) {
+            view = new Widgets.WiFiView (client, settings, device);
+#if PLUG_NETWORK
+            var hotspot_view = new Widgets.HotspotView (client, settings, device);
+            view_list.append (hotspot_view);
+            add_view (hotspot_view);
+            hotspot_view.notify["state"].connect (update_state);            
+#endif
+        } else if (device is NM.DeviceEthernet) {
+            view = new Widgets.EthernetView (client, settings, device);
+        } else {
+            debug ("Unknown device: %s\n", device.get_device_type ().to_string ());
+        }
+
+        if (view != null) {
+            view_list.append (view);
+            add_view (view);
+            view.notify["state"].connect (update_state);
+        }
+            
+        update_interfaces_names ();
+        update_all ();
+        show_all ();
+    }
+
+    private void remove_device_internal (NM.Device device) {
+        foreach (var widget_iface in view_list) {
+            if (widget_iface.get_device () == device) {
+                view_list.remove (widget_iface);
+                remove_view (widget_iface);
+                break;
+            }
+        }
+        
+        update_interfaces_names ();
+    }
+
+    private void update_interfaces_names () {
+        var count_type = new Gee.HashMap<string, int?> ();
+        foreach (var view in view_list) {
+            var type = view.get_type ().name ();
+
+            if (count_type.has_key (type)) {
+                count_type[type] = count_type[type] + 1;
+            } else {
+                count_type[type] = 1;
+            }
+        }
+
+        foreach (var iface in view_list) {
+            var type = iface.get_type ().name ();
+            iface.update_name (count_type [type]);
+        }
+    }
+
+    private void new_connection_cb (Object obj) {
+        var connection = (NM.RemoteConnection)obj;
+        connection.removed.connect (() => {
+            remove_connection (connection);
+        });
+
+        add_connection (connection);
+    }
+
+    private void update_all () {
+        foreach (var view in view_list) {
+            view.update ();
+        }
+    }
+
+    private void update_state () {
+        var next_state = Network.Utils.State.DISCONNECTED;
+        foreach (var view in view_list) {
+            if (view.state != Network.Utils.State.DISCONNECTED) {
+                next_state = view.state;
+            }
+        }
+
+        state = next_state;
+    }
+}

=== added file 'src/shared/WifiMenuItem.vala'
--- src/shared/WifiMenuItem.vala	1970-01-01 00:00:00 +0000
+++ src/shared/WifiMenuItem.vala	2016-11-20 19:56:12 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class Network.WifiMenuItem : Gtk.ListBoxRow {
+    public signal void activated ();
+    public Network.Utils.State state { get; set; default = Network.Utils.State.DISCONNECTED; }
+
+    public GLib.ByteArray ssid {
+        get {
+            return ap.get_ssid ();
+        }
+    }
+
+    public uint8 strength {
+        get {
+            return ap.get_strength ();
+        }
+    }
+
+    public bool is_secured {
+        get {
+            return ap.get_wpa_flags () != [e-mail] || ap.get_rsn_flags () != [e-mail];
+        }
+    }
+
+    public NM.AccessPoint? ap;
+
+    private bool show_icons = true;
+
+    private Gtk.RadioButton radio_button;
+    private Gtk.Image strength_img;
+    private Gtk.Image lock_img;
+    private Gtk.Image error_img;
+    private Gtk.Spinner spinner;
+
+    public WifiMenuItem (NM.AccessPoint ap, WifiMenuItem? previous = null) {
+        this.ap = ap;
+
+        var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        radio_button = new Gtk.RadioButton (null);
+        radio_button.margin_start = 6;
+        if (previous != null) {
+            radio_button.set_group (previous.get_group ());
+        }
+
+        radio_button.button_release_event.connect (() => {
+            activated ();
+            return false;
+        });
+
+        strength_img = new Gtk.Image();
+        strength_img.margin_end = 6;
+        
+        lock_img = new Gtk.Image.from_icon_name ("channel-secure-symbolic", Gtk.IconSize.MENU);
+        lock_img.margin_start = 6;
+        
+        /* TODO: investigate this, it has not been tested yet. */
+        error_img = new Gtk.Image.from_icon_name ("process-error-symbolic", Gtk.IconSize.MENU);
+        error_img.margin_start = 6;
+
+        error_img.set_tooltip_text (_("This wireless network could not be connected to."));
+        
+        main_box.pack_start (radio_button, true, true);
+
+        spinner = new Gtk.Spinner();
+        spinner.start ();
+
+        Network.Utils.set_widget_visible (spinner, false);
+
+        main_box.pack_start (spinner, false, false);
+        main_box.pack_start (error_img, false, false);