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

[Adam Bieńkowski]

* Added new Hotspot Mode functionality.
* Code refactor.
* Code cleanup.
* Relay only on the children of the ListBox not on "items" variable.
* Sort items instead of hardcoding them.
* Set headers based on the ItemType.
* Update links and licenses.

This branch introduces new Hotspot Mode functionality. Hotspot item will show in the sidebar only if the Wifi device is not in unmanaged, unknown or unavaliable mode. I also kept the common folder without changes affecting indicator-network.

Every change is described in the commit message.

[lp:~donadigo/switchboard-plug-networking/hotspot]

176. By Adam Bieńkowski on 2015-11-07

Fix not creating InfoBox from argument

177. By Adam Bieńkowski on 2015-11-07

Remove one line

178. By Adam Bieńkowski on 2015-11-07

Add licenses

179. By Adam Bieńkowski on 2015-11-07

Update links and licenses

[Cody Garver (codygarver)]

Your email address is missing the closing ">"

[Adam Bieńkowski (donadigo)]

Ahh, good catch, thanks ;)

[Danielle Foré (danrabbit)]

Hm, I think while you are using Wireless to create a Hotspot that the Wireless connection should show as "disabled" instead of "connected". While it's true that we are using this device and the device itself is not disabled, we are using it for the purpose of creating a hotspot so the ability to use it to connect to another wireless network is, in effect, "disabled".

[lp:~donadigo/switchboard-plug-networking/hotspot]

180. By Adam Bieńkowski on 2015-11-07

Rebuild UI of WifiInterface; added missing > in licenses; show disconnected when in hotspot mode

181. By Adam Bieńkowski on 2015-11-07

Don't use CssProvider

[Danielle Foré (danrabbit)]

Hey right on. Like the alert messaging when it's in hotspot mode. Looks good :)

review: Approve (ux)

[xapantu (xapantu)]

Why is Utils a class in src/Utils.vala ?

review: Needs Information

[xapantu (xapantu)]

Superseded by the other hotspot branch.

Unmerged revisions

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-01 23:06:00 +0000
+++ src/CMakeLists.txt	2015-11-07 23:35:34 +0000
@@ -27,6 +27,8 @@
     Widgets/InfoBox.vala
     Widgets/Footer.vala
     Widgets/InfoScreen.vala
+    Widgets/Hotspot/HotspotDialog.vala
+    Widgets/Hotspot/HotspotPage.vala
     common/Utils.vala
     common/Widgets/WifiMenuItem.vala
     common/Widgets/AbstractWifiInterface.vala
 
=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-10-30 20:42:55 +0000
+++ src/Plug.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 /* Main client instance */
@@ -64,7 +64,6 @@
             }
 
             content.remove (widget_interface);
-
             show_all ();
         }
 
 
=== modified file 'src/Settings/ProxySettings.vala'
--- src/Settings/ProxySettings.vala	2015-10-09 19:12:42 +0000
+++ src/Settings/ProxySettings.vala	2015-11-07 23:35:34 +0000
@@ -1,3 +1,25 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
 namespace Network {
     public class ProxySettings : Granite.Services.Settings {
         public string autoconfig_url { get; set; }
 
=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-10-22 16:46:13 +0000
+++ src/Utils.vala	2015-11-07 23:35:34 +0000
@@ -1,81 +1,262 @@
-namespace Network.Utils {
-    public enum ItemType {
-        DEVICE = 0,
-        PROXY,
-        INVALID
-    }
-
-    public Gtk.Button get_advanced_button_from_device (NM.Device? device, string title = _("Advanced Settings…")) {
-        var details_btn = new Gtk.Button.with_label (title);
-        details_btn.clicked.connect (() => {
-            new Granite.Services.SimpleCommand ("/usr/bin",
-                                                "nm-connection-editor --edit=" + device.get_active_connection ().get_uuid ()).run ();
-        }); 
-
-        return details_btn;
-    }
-    
-    public 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");
-        }
-    }
-
-    public 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");
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+namespace Network {
+    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 Gtk.Button get_advanced_button_from_device (NM.Device? device, string title = _("Advanced Settings…")) {
+            var details_btn = new Gtk.Button.with_label (title);
+            details_btn.clicked.connect (() => {
+                new Granite.Services.SimpleCommand ("/usr/bin",
+                                                    "nm-connection-editor --edit=" + device.get_active_connection ().get_uuid ()).run ();
+            }); 
+
+            return details_btn;
+        }
+        
+        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");
+            }
+        }
+
+        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");
+            }
         }
     }
 }
 
=== modified file 'src/Widgets/Device/DeviceItem.vala'
--- src/Widgets/Device/DeviceItem.vala	2015-10-20 20:34:36 +0000
+++ src/Widgets/Device/DeviceItem.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,12 +17,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 namespace Network.Widgets {
     public class DeviceItem : Gtk.ListBoxRow {
         public NM.Device? device = null;
+        private NM.RemoteSettings? nm_settings = null;
         public Gtk.Box? page = null;
         public Utils.ItemType type;
 
@@ -30,7 +31,7 @@
         private Gtk.Image row_image;
         private Gtk.Image status_image;
 
-        private string title;
+        public string title;
         private string subtitle;
         private string icon_name;
 
@@ -63,10 +64,15 @@
             this.icon_name = _icon_name;
 
             create_ui (icon_name);
-            switch_status (device.get_state ());
-
-            device.state_changed.connect ( () => {
-                switch_status (device.get_state ());
+            switch_status (Utils.CustomMode.INVALID, device.get_state ());
+
+            nm_settings = new NM.RemoteSettings (null);
+            nm_settings.connections_read.connect (() => {
+                switch_status (Utils.CustomMode.INVALID, device.get_state ());
+            });
+
+            device.state_changed.connect (() => {
+                switch_status (Utils.CustomMode.INVALID, device.get_state ());
             });
         }
 
@@ -120,8 +126,15 @@
             return icon_name;
         }
 
-        public void switch_status (NM.DeviceState? state = null, string proxy_mode = "") {
+        public void switch_status (Utils.CustomMode custom_mode, NM.DeviceState? state = null) {
             if (state != null) {
+                if (device != null
+                    && nm_settings != null
+                    && device is NM.DeviceWifi
+                    && Utils.Hotspot.get_device_is_hotspot ((NM.DeviceWifi)device, nm_settings)) {
+                    state = NM.DeviceState.DISCONNECTED;
+                }
+
                 switch (state) {
                     case NM.DeviceState.ACTIVATED:
                         status_image.icon_name = "user-available";
@@ -148,20 +161,25 @@
                 row_description.label = Utils.state_to_string (state);
             }
 
-            if (proxy_mode != "") {
-                switch (proxy_mode) {
-                    case "none":
+            if (custom_mode != Utils.CustomMode.INVALID) {
+                switch (custom_mode) {
+                    case Utils.CustomMode.PROXY_NONE:
+                    case Utils.CustomMode.HOTSPOT_DISABLED:
                         row_description.label = _("Disabled");
                         status_image.icon_name = "user-offline";
                         break;
-                    case "manual":
+                    case Utils.CustomMode.PROXY_MANUAL:
                         row_description.label = _("Enabled (manual mode)");
                         status_image.icon_name = "user-available";
                         break;
-                    case "auto":
+                    case Utils.CustomMode.PROXY_AUTO:
                         row_description.label = _("Enabled (auto mode)");
                         status_image.icon_name = "user-available";
                         break;
+                    case Utils.CustomMode.HOTSPOT_ENABLED:
+                        row_description.label = _("Enabled");
+                        status_image.icon_name = "user-available";
+                        break;
                }
            }
 
 
=== modified file 'src/Widgets/Device/DevicePage.vala'
--- src/Widgets/Device/DevicePage.vala	2015-10-08 19:04:34 +0000
+++ src/Widgets/Device/DevicePage.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,14 +17,14 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 namespace Network.Widgets {
     public class DevicePage : Network.WidgetNMInterface {
 
         public DevicePage (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
-            info_box = new info_box.from_device (device);
+            info_box = new InfoBox.from_device (device);
             this.init (device, info_box);
 
             bottom_revealer.transition_type = Gtk.RevealerTransitionType.NONE;
@@ -45,7 +45,7 @@
         }
 
         public DevicePage.from_owner (DeviceItem? owner) {
-            info_box = new info_box.from_owner (owner);
+            info_box = new InfoBox.from_owner (owner);
             this.init (owner.get_item_device (), info_box);
 
             this.icon_name = owner.get_item_icon_name ();
 
=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2015-10-22 17:08:56 +0000
+++ src/Widgets/DeviceList.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,59 +17,54 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 namespace Network.Widgets {
     public class DeviceList : Gtk.ListBox {
         public signal void show_no_devices (bool show);
-        
-        public NM.Client client;
-
-        private List<DeviceItem> items;
-        private DeviceItem item;
-
-        private Gtk.Label settings_l;
+
+        private Gtk.Label virtual_l;
         private Gtk.Label devices_l;
         private DeviceItem proxy;
 
         private int wireless_item = 0;
 
         public DeviceList () {
+            virtual_l = new Gtk.Label (_("Virtual"));
+            virtual_l.get_style_context ().add_class ("h4");
+            virtual_l.halign = Gtk.Align.START;
+
+            devices_l = new Gtk.Label (_("Devices"));
+            devices_l.get_style_context ().add_class ("h4");
+            devices_l.halign = Gtk.Align.START;
+
             this.selection_mode = Gtk.SelectionMode.SINGLE;
             this.activate_on_single_click = true;  
             this.set_header_func (update_headers);
-
-            items = new List<DeviceItem> ();
-
-            settings_l = new Gtk.Label (_("Virtual"));
-            settings_l.get_style_context ().add_class ("h4");
-            settings_l.halign = Gtk.Align.START;
-
-            devices_l = new Gtk.Label (_("Devices"));
-            devices_l.get_style_context ().add_class ("h4");
-            devices_l.halign = Gtk.Align.START;
-
-            bool show = (items.length () > 0);
+            this.set_sort_func (sort_items);
+
+            bool show = (get_children ().length () > 0);
             this.show_no_devices (!show);
             this.add_proxy ();
         }
 
         public void add_device_to_list (WidgetNMInterface iface) {
+            DeviceItem item;
+            if (!iface.device.get_managed ()) {
+                warning ("Unmanaged device, probably something that has just been added.");
+            }
+
             if (iface.device.get_device_type () == NM.DeviceType.WIFI) {
                 string title = _("Wireless");
                 if (wireless_item > 0) {
-                    title += SUFFIX + wireless_item.to_string ();
+                    title = _("Wireless %s".printf (wireless_item.to_string ()));
                 }
 
                 item = new DeviceItem.from_interface (iface, "network-wireless", title);
+                add_hotspot (iface, wireless_item);
                 wireless_item++;
             } else {
-
-                if (!iface.device.get_managed ()) {
-                    warning ("Unmanaged device, probably something that has just been added.");
-                }
-
                 if (iface.device.get_iface ().has_prefix ("usb")) {
                     item = new DeviceItem.from_interface (iface, "drive-removable-media");
                 } else {
@@ -77,16 +72,15 @@
                 }
             }
 
-            items.append (item);
-            insert (item, (int) items.length () - 1);
+            add (item);
             show_all ();
         }
 
         public void remove_device_from_list (NM.Device device) {
-            foreach (var list_item in items) {
+            foreach (Gtk.Widget _list_item in get_children ()) {
+                var list_item = (DeviceItem)_list_item;
                 if (list_item.device == device) {
                     remove_row_from_list (list_item);
-                    break;
                 }
             }
         }
@@ -96,14 +90,39 @@
                 wireless_item--;
             } 
 
-            items.remove (item);
             this.remove (item);
+            show_all ();
+        }
+
+        private void add_hotspot (WidgetNMInterface iface, int wireless_item) {
+            string title = _("Hotspot");
+            if (wireless_item > 0) {
+                title = _("Hotspot %s".printf (wireless_item.to_string ()));
+            }
+
+            var hotspot = new DeviceItem (title, "", "network-wireless-hotspot");
+            hotspot.no_show_all = true;
+            iface.device.state_changed.connect ((state) => {
+                hotspot.visible = (state != NM.DeviceState.UNAVAILABLE
+                        && state != NM.DeviceState.UNMANAGED
+                        && state != NM.DeviceState.UNKNOWN);
+            });
+
+            hotspot.device = iface.device;
+            hotspot.type = Utils.ItemType.VIRTUAL;
+
+            var hotspot_page = new HotspotPage (hotspot, ((WifiInterface)iface));
+            hotspot_page.title = title;
+            hotspot.page = hotspot_page;
+
+            this.add (hotspot);
         }
 
         private void add_proxy () {
             proxy = new DeviceItem (_("Proxy"), "", "preferences-system-network");
-            proxy.page = new Widgets.ProxyPage (proxy);
-            proxy.type = Utils.ItemType.PROXY;
+            proxy.page = new ProxyPage (proxy);
+            proxy.type = Utils.ItemType.VIRTUAL;
+
             this.add (proxy);
         }
         
@@ -111,14 +130,43 @@
             this.get_row_at_index (0).activate ();
         }  
 
+        private int sort_items (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
+            if (((DeviceItem) row1).type == Utils.ItemType.DEVICE) {
+                return -1;
+            } else if (((DeviceItem) row1).type == Utils.ItemType.VIRTUAL) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+
         private void update_headers (Gtk.ListBoxRow row, Gtk.ListBoxRow? before = null) {
-            if (((DeviceItem) row).type != Utils.ItemType.DEVICE) {
-                row.set_header (settings_l);
-            } else if (row == items.nth_data (0)) {
+            if (((DeviceItem) row).type == Utils.ItemType.VIRTUAL) {
+                if (before != null && ((DeviceItem) before).type == Utils.ItemType.VIRTUAL) {
+                    return;
+                } 
+
+                remove_headers_for_type (Utils.ItemType.VIRTUAL);
+                row.set_header (virtual_l);
+            } else if (((DeviceItem) row).type == Utils.ItemType.DEVICE) {
+                if (before != null && ((DeviceItem) before).type == Utils.ItemType.DEVICE) {
+                    return;
+                } 
+
+                remove_headers_for_type (Utils.ItemType.DEVICE);
                 row.set_header (devices_l);
             } else {
                 row.set_header (null);
             }
         }
+
+        private void remove_headers_for_type (Utils.ItemType type) {
+            foreach (Gtk.Widget _item in get_children ()) {
+                var item = (DeviceItem)_item;
+                if (item.type == type) {
+                    item.set_header (null);
+                }
+            }
+        }
     }
 }
 
=== modified file 'src/Widgets/Footer.vala'
--- src/Widgets/Footer.vala	2015-10-08 17:08:13 +0000
+++ src/Widgets/Footer.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 namespace Network {
 
=== added directory 'src/Widgets/Hotspot'
=== added file 'src/Widgets/Hotspot/HotspotDialog.vala'
--- src/Widgets/Hotspot/HotspotDialog.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Hotspot/HotspotDialog.vala	2015-11-07 23:35:34 +0000
@@ -0,0 +1,230 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * 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/Widgets/Hotspot/HotspotPage.vala'
--- src/Widgets/Hotspot/HotspotPage.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Hotspot/HotspotPage.vala	2015-11-07 23:35:34 +0000
@@ -0,0 +1,174 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+ namespace Network.Widgets {
+    public class HotspotPage : Network.WidgetNMInterface {
+        private DeviceItem owner;
+
+        private WifiInterface root_iface;
+        private NM.RemoteSettings nm_settings;
+        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 HotspotPage (DeviceItem _owner, WifiInterface _root_iface) {
+            owner = _owner;
+            root_iface = _root_iface;
+            nm_settings = root_iface.get_nm_settings ();
+            info_box = new InfoBox.from_device (owner.get_item_device ());
+            this.init (owner.get_item_device (), info_box);
+
+            this.icon_name = owner.get_item_icon_name ();
+            this.title = Utils.type_to_string (device.get_device_type ());
+
+            hotspot_revealer = new Gtk.Revealer ();
+            hotspot_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+
+            hotspot_settings_btn = Utils.get_advanced_button_from_device (device, _("Hotspot Settings…"));
+
+            var hinfo_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+
+            ssid_label = new Gtk.Label ("");
+            ssid_label.halign = Gtk.Align.START;
+
+            key_label = new Gtk.Label ("");
+            key_label.halign = Gtk.Align.START;
+
+            hinfo_box.add (ssid_label);
+            hinfo_box.add (key_label);
+            hotspot_revealer.add (hinfo_box);
+
+            bottom_revealer = new Gtk.Revealer ();
+
+            var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+            button_box.pack_end (hotspot_settings_btn, false, false, 0);
+            bottom_revealer.add (button_box);
+
+            nm_settings.connections_read.connect (update);
+            device.state_changed.connect (update);
+
+            update ();
+
+            this.add (hotspot_revealer);
+            this.pack_end (bottom_revealer, false, false);
+            this.show_all ();
+        }
+
+        protected override void update () {
+            if (hotspot_settings_btn != null) {
+                hotspot_settings_btn.sensitive = (Utils.Hotspot.get_device_is_hotspot ((NM.DeviceWifi)device, nm_settings));
+            }
+
+            update_hotspot_info ();
+            base.update ();
+        }
+
+        protected override void update_switch () {
+            switch_updating = true;
+            control_switch.active = (Utils.Hotspot.get_device_is_hotspot ((NM.DeviceWifi)device, nm_settings));
+            switch_updating = false;
+        }
+
+        protected override void control_switch_activated () {
+            if (switch_updating) {
+                switch_updating = false;
+                return;
+            }
+
+            var wifi_device = (NM.DeviceWifi)device;
+            if (!control_switch.active && Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings)) {
+                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 ());
+
+                    }              
+                });
+
+                hotspot_dialog.run ();
+                hotspot_dialog.destroy ();
+            }
+        }
+
+        private void update_hotspot_info () {
+            var wifi_device = (NM.DeviceWifi)device;
+            bool hotspot_mode = Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings);
+
+            var mode = Utils.CustomMode.HOTSPOT_DISABLED;
+            if (hotspot_mode) {
+                mode = Utils.CustomMode.HOTSPOT_ENABLED;
+            }
+
+            owner.switch_status (mode);
+
+            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 setting_wireless = connection.get_setting_wireless ();
+                ssid_label.label = _("Network Name (SSID): %s").printf (NM.Utils.ssid_to_utf8 (setting_wireless.get_ssid ()));
+
+                var setting_wireless_security = connection.get_setting_wireless_security ();
+
+                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") {
+                    security = _("(WPA)");
+                    secret = setting_wireless_security.get_psk ();
+                }
+
+                if (secret == null) {
+                    Utils.Hotspot.update_secrets (connection, update);
+                    return;
+                }
+                
+                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	2015-10-20 20:34:36 +0000
+++ src/Widgets/InfoBox.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 namespace Network.Widgets {  
 
=== modified file 'src/Widgets/InfoScreen.vala'
--- src/Widgets/InfoScreen.vala	2015-07-18 16:56:50 +0000
+++ src/Widgets/InfoScreen.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 namespace Network {
 
=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2015-10-09 19:12:42 +0000
+++ src/Widgets/Page.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
 
=== modified file 'src/Widgets/Proxy/ProxyConfigurationPage.vala'
--- src/Widgets/Proxy/ProxyConfigurationPage.vala	2015-10-09 19:12:42 +0000
+++ src/Widgets/Proxy/ProxyConfigurationPage.vala	2015-11-07 23:35:34 +0000
@@ -1,5 +1,26 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]
+ */
+
 namespace Network.Widgets {
-
     public class ConfigurationPage : Gtk.Box {
         private const string DEFAULT_PROXY = "host:port";
         private bool syntax_error = false;
 
=== modified file 'src/Widgets/Proxy/ProxyExceptionsPage.vala'
--- src/Widgets/Proxy/ProxyExceptionsPage.vala	2015-08-03 00:16:24 +0000
+++ src/Widgets/Proxy/ProxyExceptionsPage.vala	2015-11-07 23:35:34 +0000
@@ -1,3 +1,25 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
 namespace Network.Widgets {
     public class ExecepionsPage : Gtk.Box {
         private Gtk.ListBox ignored_list;
 
=== modified file 'src/Widgets/Proxy/ProxyPage.vala'
--- src/Widgets/Proxy/ProxyPage.vala	2015-10-20 20:34:36 +0000
+++ src/Widgets/Proxy/ProxyPage.vala	2015-11-07 23:35:34 +0000
@@ -1,3 +1,26 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
+ *
+ * This library 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 3 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+
 namespace Network.Widgets {
     public class ProxyPage : Gtk.Box {
         public Gtk.Stack stack;
@@ -34,7 +57,23 @@
         }
 
         public void update_mode () {
-            owner.switch_status (null, proxy_settings.mode);
+            var mode = Utils.CustomMode.INVALID;
+            switch (proxy_settings.mode) {
+                case "none":
+                    mode = Utils.CustomMode.PROXY_NONE;
+                    break;
+                case "manual":
+                    mode = Utils.CustomMode.PROXY_MANUAL;
+                    break;
+                case "auto":
+                    mode = Utils.CustomMode.PROXY_AUTO;
+                    break;
+                default:
+                    mode = Utils.CustomMode.INVALID;
+                    break;
+            }
+
+            owner.switch_status (mode);
         }
     }
 }
 
=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2015-10-09 19:12:42 +0000
+++ src/Widgets/WifiInterface.vala	2015-11-07 23:35:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-plug-networking)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Authored by: Adam Bieńkowski <[e-mail]
+ * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
 using Network.Widgets;
@@ -25,6 +25,9 @@
 namespace Network {
     public class WifiInterface : AbstractWifiInterface {
         protected Gtk.Frame connected_frame;
+        protected Gtk.Stack list_stack;
+        protected Gtk.ScrolledWindow scrolled;
+        protected Gtk.Box hotspot_mode_box;
         protected Gtk.Box? connected_box = null;
         protected Gtk.Revealer top_revealer;
         protected Gtk.Button disconnect_btn;
@@ -32,17 +35,10 @@
         protected Gtk.ToggleButton info_btn;
         protected Gtk.Popover popover;
 
-        public WifiInterface (NM.Client nm_client, NM.RemoteSettings settings, NM.Device device_) {
-            info_box = new InfoBox.from_device (device_);
+        public WifiInterface (NM.Client nm_client, NM.RemoteSettings settings, NM.Device _device) {
+            info_box = new InfoBox.from_device (_device);
             info_box.margin = 12;
-            this.init (device_, info_box);
-
-            var css_provider = new Gtk.CssProvider ();
-            try {
-                css_provider.load_from_data ("GtkFrame {\nbackground: #ffffff;\n}", -1);
-            } catch (Error e) {
-                warning ("%s\n", e.message);
-            }
+            this.init (_device, info_box);
 
             popover = new Gtk.Popover (info_btn);
             popover.position = Gtk.PositionType.BOTTOM;
@@ -52,13 +48,13 @@
             });
 
             connected_frame = new Gtk.Frame (null);
-            connected_frame.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+            connected_frame.override_background_color (0, { 255, 255, 255, 255 });
 
             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_);
+            init_wifi_interface (nm_client, settings, device);
 
             this.icon_name = "network-wireless";
             this.title = _("Wireless");
@@ -66,15 +62,35 @@
 
             control_box.margin_bottom = 12;
 
+            list_stack = new Gtk.Stack ();
+
+            hotspot_mode_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            hotspot_mode_box.visible = true;
+            hotspot_mode_box.valign = Gtk.Align.CENTER;
+
+            var main_frame = new Gtk.Frame (null);
+            main_frame.margin_bottom = 24;
+            main_frame.margin_top = 12;
+            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);
+            hotspot_mode_box.add (hotspot_mode);
+            hotspot_mode_box.add (hotspot_mode_desc);
+
             wifi_list.selection_mode = Gtk.SelectionMode.SINGLE;
-            wifi_list.activate_on_single_click = false; 
+            wifi_list.activate_on_single_click = false;
+            wifi_list.visible = true;
 
-            var scrolled = new Gtk.ScrolledWindow (null, null);
-            scrolled.margin_bottom = 24;
-            scrolled.margin_top = 12;
+            scrolled = new Gtk.ScrolledWindow (null, null);
             scrolled.add (wifi_list);
-            scrolled.vexpand = true;
-            scrolled.shadow_type = Gtk.ShadowType.OUT;
+
+            list_stack.add (hotspot_mode_box);
+            list_stack.add (scrolled);
+            list_stack.visible_child = scrolled;
+
+            main_frame.add (list_stack);
 
             var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
 
@@ -83,14 +99,18 @@
 
             button_box.pack_start (hidden_btn, false, false, 0);
 
-            update ();
-
             bottom_box.add (button_box);
 
             this.add (top_revealer);
-            this.add (scrolled);
+            this.add (main_frame);
             this.add (bottom_revealer);
             this.show_all ();   
+
+            update ();
+        }
+
+        public NM.RemoteSettings get_nm_settings () {
+            return nm_settings;
         }
 
         public override void update () {
@@ -111,7 +131,15 @@
 
             base.update ();
 
-            top_revealer.set_reveal_child (wifi_device.get_active_access_point () != null);
+            bool is_hotspot = Utils.Hotspot.get_device_is_hotspot (wifi_device, nm_settings);
+
+            top_revealer.set_reveal_child (wifi_device.get_active_access_point () != null && !is_hotspot);
+
+            if (is_hotspot) {
+                list_stack.visible_child = hotspot_mode_box;
+            } else {
+                list_stack.visible_child = scrolled;
+            }
 
             if (wifi_device.get_active_access_point () == null && old_active != null) { 
                 old_active.no_show_all = false;
@@ -186,7 +214,7 @@
 
         protected override void control_switch_activated () {
             var active = control_switch.active;
-            if (active != !software_locked) {
+            if (active == software_locked) {
                 rfkill.set_software_lock (RFKillDeviceType.WLAN, !active);
                 client.wireless_set_enabled (active);
             }
 
=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2015-10-22 16:46:13 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2015-11-07 23:35:34 +0000
@@ -39,7 +39,7 @@
 		this.nm_client = nm_client;
 		this.nm_settings = nm_settings;
 		device = _device;
-		wifi_device = device as NM.DeviceWifi;
+		wifi_device = (NM.DeviceWifi)device;
 		blank_item = new WifiMenuItem.blank ();
 		active_wifi_item = null;
 		
@@ -82,7 +82,6 @@
 		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");
@@ -99,7 +98,9 @@
 		rfkill.device_changed.connect (update);
 		rfkill.device_deleted.connect (update);
 		
-		wifi_device.notify["active-access-point"].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);
@@ -112,7 +113,7 @@
 		update();
 	}
 
-	Gtk.Label construct_placeholder_label (string text, bool title) {
+	protected Gtk.Label construct_placeholder_label (string text, bool title) {
 		var label = new Gtk.Label (text);
 		label.visible = true;
 		label.use_markup = true;
@@ -157,7 +158,6 @@
 			item.user_action.connect (wifi_activate_cb);
 
 			wifi_list.add (item);
-
 			wifi_list.show_all ();
 
 			update ();
@@ -241,6 +241,13 @@
 	}
 
 	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:
@@ -275,6 +282,7 @@
 		
 		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());
@@ -298,6 +306,7 @@
 			if (device.hardware_lock)
 				hardware_locked = true;
 		}
+
 		locked = hardware_locked || software_locked;
 
 		update_active_ap ();
@@ -319,6 +328,12 @@
 			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;