Merge lp:~donadigo/switchboard-plug-networking/wifi-list-placeholders into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

Added new placeholders that will adapt to the situation of wifi list:
* When there are no available access points
* When wireless is disabled
* When scanning for access points

Added new placeholders that will adapt to the situation of wifi list:
* When there are no available access points
* When wireless is disabled
* When scanning for access points

[lp:~donadigo/switchboard-plug-networking/wifi-list-placeholders]

125. By Adam Bieńkowski on 2015-08-03

Removed unneded line

126. By Adam Bieńkowski on 2015-08-03

Do not use request_scan_simple

127. By Adam Bieńkowski on 2015-08-03

Arrays are not updated by the gobject notify

128. By Adam Bieńkowski on 2015-08-03

Move wireless-enabled contents to update () function

129. By Adam Bieńkowski on 2015-08-03

Check if list of access points is null

130. By Adam Bieńkowski on 2015-08-03

Fixed condition

[Danielle Foré (danrabbit)]

Hm I think if we're following the regular alert layout, it seems like what we want is more like:

Wireless Is Disabled
Enable wireless to discover nearby wireless access points

No Access Points Available
There are no wireless access points within range

Also, see an inline comment about ellipsis

[lp:~donadigo/switchboard-plug-networking/wifi-list-placeholders]

131. By Adam Bieńkowski on 2015-08-03

Use proper labels and elipsis

[Danielle Foré (danrabbit)]

Secondary text shouldn't be the same style as the title text. Also I forgot periods on the secondary text because it's sentence case xD So it should be:

<h2>Wireless Is Disabled</h2>
Enable wireless to discover nearby wireless access points.

<h2>No Access Points Available</h2>
There are no wireless access points within range.

[lp:~donadigo/switchboard-plug-networking/wifi-list-placeholders]

132. By Adam Bieńkowski on 2015-08-03

New labels style, instead of scanning label use spinner

[Adam Bieńkowski (donadigo)]

As the branch was merged into xapantu's branch I am rejecting.

review: Abstain

Unmerged revisions

=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2015-08-02 12:30:11 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2015-08-03 18:26:29 +0000
@@ -28,6 +28,7 @@
 	
 	protected WifiMenuItem? active_wifi_item = null;
 	protected WifiMenuItem? blank_item = null;
+	protected Gtk.Stack placeholder;
 
 	public void init_wifi_interface (NM.Client nm_client, NM.RemoteSettings nm_settings, NM.Device? _device) {
 		this.nm_client = nm_client;
@@ -36,16 +37,50 @@
 		wifi_device = device as NM.DeviceWifi;
 		blank_item = new WifiMenuItem.blank ();
 		
+		placeholder = new Gtk.Stack ();
+		placeholder.visible = true;
+
+        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);
+        var no_aps_desc = construct_placeholder_label (_("There are no wireless access points within range."), false);
+
+        no_aps_box.add (no_aps);
+        no_aps_box.add (no_aps_desc);
+
+        var wireless_off_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+        wireless_off_box.visible = true;
+        wireless_off_box.valign = Gtk.Align.CENTER;        
+
+		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);
+
+		var spinner = new Gtk.Spinner ();
+        spinner.visible = true;
+        spinner.halign = spinner.valign = Gtk.Align.CENTER;
+        spinner.start ();
+
+		placeholder.add_named (no_aps_box, "no-aps");
+		placeholder.add_named (wireless_off_box, "wireless-off");
+		placeholder.add_named (spinner, "scanning");
+		placeholder.visible_child_name = "no-aps";
+
 		wifi_list = new Gtk.ListBox ();
 		wifi_list.set_sort_func (sort_func);
-		
+		wifi_list.set_placeholder (placeholder);
+
 		/* Monitor killswitch status */
 		rfkill = new RFKillManager ();
 		rfkill.open ();
 		rfkill.device_added.connect (update);
 		rfkill.device_changed.connect (update);
 		rfkill.device_deleted.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);
@@ -57,6 +92,22 @@
 		update();
 	}
 
+    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) {
+            label.get_style_context ().add_class ("h2");
+        }
+
+        return label;
+    }
+
 	void access_point_added_cb (Object ap_) {
 		NM.AccessPoint ap = (NM.AccessPoint)ap_;
 		WifiMenuItem? previous_wifi_item = blank_item;
@@ -159,7 +210,9 @@
 		}
 
 		update_active_ap ();
-
+		if (wifi_device.get_access_points () == null || wifi_device.get_access_points ().length == 0) {
+			placeholder.visible_child_name = "no-aps";
+		}
 	}
 
 	Network.State strength_to_state (uint8 strength) {
@@ -208,6 +261,12 @@
 
 		update_active_ap ();
 
+		if (nm_client.wireless_get_enabled ()) {
+			placeholder.visible_child_name = "scanning";
+		} else {
+			placeholder.visible_child_name = "wireless-off";
+		}
+
 		base.update ();
 	}