Merge lp:~tintou/wingpanel-indicator-network/with-hidden-network into lp:~wingpanel-devs/wingpanel-indicator-network/trunk

[Corentin Noël]

Add Hidden network dialog

[Danielle Foré (danrabbit)]

Hm even though it's probably technically correct, it looks like of weird to have the "Connect to Hidden" above the separator. Can we put it below? :p

Other than that, works for me :)

[lp:~tintou/wingpanel-indicator-network/with-hidden-network]

144. By Corentin Noël on 2016-04-22

Added Hidden networks

=== removed directory 'data'
=== modified file 'po/network-indicator.pot'
--- po/network-indicator.pot	2016-02-07 02:10:06 +0000
+++ po/network-indicator.pot	2016-04-22 00:57:40 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-06 20:09-0600\n"
+"POT-Creation-Date: 2016-04-22 02:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,14 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../src/Widgets/PopoverWidget.vala:52
+msgid "Network Settings…"
+msgstr ""
+
+#: ../src/Widgets/PopoverWidget.vala:55
+msgid "Connect to Hidden Network…"
+msgstr ""
+
 #: ../src/Indicator.vala:25
 msgid "Network"
 msgstr ""
@@ -25,10 +33,6 @@
 msgid "Network indicator"
 msgstr ""
 
-#: ../src/Widgets/PopoverWidget.vala:42
-msgid "Network Settings…"
-msgstr ""
-
 #: ../src/common/Widgets/AbstractHotspotInterface.vala:23
 msgid "Hotspot"
 msgstr ""
@@ -37,14 +41,6 @@
 msgid "Hotspot %s"
 msgstr ""
 
-#: ../src/common/Widgets/WidgetNMInterface.vala:26
-msgid "Unknown device"
-msgstr ""
-
-#: ../src/common/Widgets/WidgetNMInterface.vala:56
-msgid "Unknown type: %s "
-msgstr ""
-
 #: ../src/common/Widgets/AbstractWifiInterface.vala:50
 msgid "No Access Points Available"
 msgstr ""
@@ -62,11 +58,19 @@
 msgstr ""
 
 #: ../src/common/Widgets/AbstractWifiInterface.vala:75
-msgid "Scanning for Access Points..."
+msgid "Scanning for Access Points…"
 msgstr ""
 
 #: ../src/common/Widgets/AbstractWifiInterface.vala:120
-msgid "Wi-Fi"
+msgid "Wireless"
+msgstr ""
+
+#: ../src/common/Widgets/AbstractEtherInterface.vala:25
+msgid "Virtual network: %s"
+msgstr ""
+
+#: ../src/common/Widgets/AbstractEtherInterface.vala:29
+msgid "Wired"
 msgstr ""
 
 #: ../src/common/Widgets/WifiMenuItem.vala:77
@@ -89,12 +93,12 @@
 msgid "This network uses encryption."
 msgstr ""
 
-#: ../src/common/Widgets/AbstractEtherInterface.vala:25
-msgid "Virtual network: %s"
+#: ../src/common/Widgets/WidgetNMInterface.vala:26
+msgid "Unknown device"
 msgstr ""
 
-#: ../src/common/Widgets/AbstractEtherInterface.vala:29
-msgid "Wired"
+#: ../src/common/Widgets/WidgetNMInterface.vala:56
+msgid "Unknown type: %s "
 msgstr ""
 
 #: ../src/common/Utils.vala:37

=== modified file 'src/Widgets/PopoverWidget.vala'
--- src/Widgets/PopoverWidget.vala	2015-11-03 22:06:54 +0000
+++ src/Widgets/PopoverWidget.vala	2016-04-22 00:57:40 +0000
@@ -17,10 +17,14 @@
 
 public class Network.Widgets.PopoverWidget : Network.Widgets.NMVisualizer {
 	Gtk.Box main_box;
+	Gtk.Box other_box;
+	Gtk.Box wifi_box;
+	Gtk.Box settings_box;
 	
 	private const string SETTINGS_EXEC = "/usr/bin/switchboard -o pantheon-network";
 
 	private Wingpanel.Widgets.Button show_settings_button;
+	private Wingpanel.Widgets.Button hidden_item;
 
 	public signal void settings_shown ();
 
@@ -35,12 +39,22 @@
 	protected override void build_ui () {
 		
 		main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+		other_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+		wifi_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+		settings_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+		main_box.add (other_box);
+		main_box.add (wifi_box);
+		main_box.add (settings_box);
 
 		add (main_box);
 
 		if(!is_dm ()) {
 			show_settings_button = new Wingpanel.Widgets.Button (_("Network Settings…"));
-			main_box.pack_end (show_settings_button);
+			settings_box.pack_end (show_settings_button);
+
+			hidden_item = new Wingpanel.Widgets.Button (_("Connect to Hidden Network…"));
+			hidden_item.no_show_all = true;
+			settings_box.pack_start (hidden_item);
 		}
 	}
 	
@@ -53,17 +67,43 @@
 	}
 
 	protected override void add_interface (WidgetNMInterface widget_interface) {
+		Gtk.Box container_box = other_box;
+		if (widget_interface is Network.WifiInterface) {
+			container_box = wifi_box;
+			hidden_item.no_show_all = false;
+			hidden_item.show_all ();
+			((Network.WifiInterface) widget_interface).notify["hidden-sensitivity"].connect (() => {
+				bool hidden_sensitivity = false;
+				wifi_box.get_children ().foreach ((child) => {
+					if (child is Network.WifiInterface) {
+						hidden_sensitivity = hidden_sensitivity || ((Network.WifiInterface) child).hidden_sensitivity;
+					}
+
+					hidden_item.sensitive = hidden_sensitivity;
+				});
+			});
+		}
+	
 		if (!is_dm () || main_box.get_children ().length () > 0) {
 			widget_interface.sep = new Wingpanel.Widgets.Separator ();
-			main_box.pack_end (widget_interface.sep);
+			container_box.pack_end (widget_interface.sep);
 		}
-		main_box.pack_end (widget_interface);
+		container_box.pack_end (widget_interface);
 
 		widget_interface.need_settings.connect (show_settings);
 	}
-	
+
 	void connect_signals () {
 		show_settings_button.clicked.connect (show_settings);
+		hidden_item.clicked.connect (() => {
+			bool found = false;
+			wifi_box.get_children ().foreach ((child) => {
+				if (child is Network.WifiInterface && ((Network.WifiInterface) child).hidden_sensitivity && !found) {
+					((Network.WifiInterface) child).connect_to_hidden ();
+					found = true;
+				}
+			});
+		});
 	}
 
 	void show_settings () {

=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2015-10-26 13:05:52 +0000
+++ src/Widgets/WifiInterface.vala	2016-04-22 00:57:40 +0000
@@ -16,6 +16,7 @@
  */
 
 public class Network.WifiInterface : Network.AbstractWifiInterface {
+	public bool hidden_sensitivity { get; set; default = true; }
 	Wingpanel.Widgets.Switch wifi_item;
 	Gtk.Revealer revealer;
 	
@@ -48,7 +49,6 @@
 
 		revealer = new Gtk.Revealer ();
 		revealer.add (scrolled_box);
-
 		pack_start (revealer);
 	}
 
@@ -62,8 +62,10 @@
 
 		if (wifi_device.state == NM.DeviceState.UNAVAILABLE || state == Network.State.FAILED_WIFI) {
 			revealer.reveal_child = false;
+			hidden_sensitivity = false;
 		} else {
 			revealer.reveal_child = true;
+			hidden_sensitivity = true;
 		}
 	}
 	
@@ -115,5 +117,52 @@
 		Idle.add( () => { update (); return false; });
 	}
 
+	public void connect_to_hidden () {
+		var hidden_dialog = new NMAWifiDialog.for_other (nm_client, nm_settings);
+		hidden_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 = hidden_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) {
+					nm_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);
+					}
+
+					nm_client.add_and_activate_connection (dialog_connection, dialog_device, path, null);
+				}
+			}
+		});
+
+		hidden_dialog.run ();
+		hidden_dialog.destroy ();
+	}
 }
 

=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2016-04-09 21:13:41 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2016-04-22 00:57:40 +0000
@@ -72,7 +72,7 @@
 		spinner.start ();
 		
 		var scanning_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
-		var scanning = construct_placeholder_label (_("Scanning for Access Points..."), true);
+		var scanning = construct_placeholder_label (_("Scanning for Access Points…"), true);
 		
 		scanning_box.add (scanning);
 		scanning_box.add (spinner);

=== modified file 'src/libnm-gtk.vapi'
--- src/libnm-gtk.vapi	2015-05-26 00:05:00 +0000
+++ src/libnm-gtk.vapi	2016-04-22 00:57:40 +0000
@@ -1,5 +1,6 @@
 [CCode (cheader_filename = "nm-wifi-dialog.h")]
-class NMAWifiDialog : Gtk.Dialog
-{
-    public NMAWifiDialog (NM.Client client, NM.RemoteSettings settings, NM.Connection connection, NM.Device device, NM.AccessPoint ap, bool secrets_only);
+class NMAWifiDialog : Gtk.Dialog {
+    public NMAWifiDialog (NM.Client client, NM.RemoteSettings settings, NM.Connection 0connection, NM.Device device, NM.AccessPoint ap, bool secrets_only);
+    public NMAWifiDialog.for_other (NM.Client client, NM.RemoteSettings settings);
+    public NM.Connection get_connection (out NM.Device device, out NM.AccessPoint ap);
 }