Merge lp:~donadigo/switchboard-plug-networking/wifi-connected-on-top into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Fixes bug #1449669.
* Clean the code.

Fixes bug #1449669. Show the currently connected network at the top in SSID list, and some codestyle fixes. The branch can contain bugs so please point them out in the review if any.

[lp:~donadigo/switchboard-plug-networking/wifi-connected-on-top]

134. By Adam Bieńkowski on 2015-08-06

Remove debug line and catch the css error

135. By Adam Bieńkowski on 2015-08-06

Visible not hardcoded

[Danielle Foré (danrabbit)]

Can we set "homogeneous" to true for the button box ;D

Also, can we get the spinner when connecting?

Other than those two things, I like it a lot! It looks nice. Nice animation. Buttons are more in-context. Good job :)

[lp:~donadigo/switchboard-plug-networking/wifi-connected-on-top]

136. By Adam Bieńkowski on 2015-08-06

Button box homogeneous; show spinner when connecting

[Danielle Foré (danrabbit)]

Oops one more small thing. It looks like the entirety of the space isn't given back to the wifi list when there isn't a connection. What I mean is that the space that was reserved for padding in between the connected box and the wifi list should also go away so the wifi list can take advantage of that full empty space.

[lp:~donadigo/switchboard-plug-networking/wifi-connected-on-top]

137. By Adam Bieńkowski on 2015-08-06

Hide revealer widget when it is no longer shown

138. By Adam Bieńkowski on 2015-08-06

Set page spacing to 0 and manually set margins

[Danielle Foré (danrabbit)]

Hey there we go! Lookin good. UX Approve :)

review: Approve (ux)

[lp:~donadigo/switchboard-plug-networking/wifi-connected-on-top]

139. By Adam Bieńkowski on 2015-08-07

Update connected entry on update (); do not reparent widget; instead create new one

140. By Adam Bieńkowski on 2015-08-07

Merge trunk

141. By Adam Bieńkowski on 2015-08-07

Change protected to normal

[Adam Bieńkowski (donadigo)]

The branch was merged into another and is no longer needed.

review: Abstain

Unmerged revisions

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-06-23 17:19:30 +0000
+++ src/Utils.vala	2015-08-07 13:06:03 +0000
@@ -16,8 +16,8 @@
             }
     }
 
-    public new Gtk.Button get_advanced_button_from_device (NM.Device? device) {
-        var details_btn = new Gtk.Button.with_label (_("Advanced Settings…"));
+    public new 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 ();
 
=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2015-08-04 19:59:12 +0000
+++ src/Widgets/Page.vala	2015-08-07 13:06:03 +0000
@@ -25,6 +25,7 @@
         public NM.Device device;
         public InfoBox info_box;
         public Gtk.Switch control_switch;
+        public Gtk.Box control_box;        
         public signal void show_error ();
 
         private string _icon_name;    
@@ -51,7 +52,6 @@
             }
         }
 
-        private Gtk.Box control_box;
         private Gtk.Image device_img;
         private Gtk.Label device_label;
 
 
=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2015-08-06 20:43:28 +0000
+++ src/Widgets/WifiInterface.vala	2015-08-07 13:06:03 +0000
@@ -24,7 +24,12 @@
 
 namespace Network {
     public class WifiInterface : AbstractWifiInterface {
-        
+        protected Gtk.Frame connected_frame;
+        protected Gtk.Box? connected_box = null;
+        protected Gtk.Revealer top_revealer;
+        protected Gtk.Button disconnect_btn;
+        protected Gtk.Button settings_btn;
+
         public WifiInterface (NM.Client client, NM.RemoteSettings settings, NM.Device device_) {
             info_box = new InfoBox.from_device (device_);
             info_box.no_show_all = true;
@@ -34,30 +39,42 @@
 
             this.icon_name = "network-wireless";
             this.title = _("Wi-Fi Network");
-            
+            this.spacing = 0;
+
+            control_box.margin_bottom = 12;
+
             wifi_list.selection_mode = Gtk.SelectionMode.SINGLE;
             wifi_list.activate_on_single_click = false; 
-            
+
+            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);
+            }
+
+            connected_frame = new Gtk.Frame (null);
+            connected_frame.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+            top_revealer = new Gtk.Revealer ();
+            top_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+            top_revealer.add (connected_frame);
+ 
             var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.margin_bottom = 24;
+            scrolled.margin_top = 12;
             scrolled.add (wifi_list);
             scrolled.vexpand = true;
             scrolled.shadow_type = Gtk.ShadowType.OUT;
 
             var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
 
-            var disconnect_btn = new Gtk.Button.with_label (_("Disconnect"));
-            disconnect_btn.sensitive = (device.get_state () == NM.DeviceState.ACTIVATED);
-            disconnect_btn.get_style_context ().add_class ("destructive-action");
-            disconnect_btn.clicked.connect (() => {
-                device.disconnect (null);
-            });
-
             var advanced_btn = Utils.get_advanced_button_from_device (device);
             advanced_btn.sensitive = (device.get_state () == NM.DeviceState.ACTIVATED);
             info_box.info_changed.connect (() => {
                 bool sensitive = (device.get_state () == NM.DeviceState.ACTIVATED);
                 disconnect_btn.sensitive = sensitive;
-                advanced_btn.sensitive = sensitive;
+                settings_btn.sensitive = sensitive;
                 
                 update ();
             });
@@ -69,14 +86,7 @@
                 hidden_dialog.run ();
             });
 
-            var end_btn_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-            end_btn_box.homogeneous = true;
-            end_btn_box.halign = Gtk.Align.END;
-            end_btn_box.pack_end (disconnect_btn, true, true, 0);
-            end_btn_box.pack_end (advanced_btn, true, true, 0);
-
             button_box.pack_start (hidden_btn, false, false, 0);
-            button_box.pack_end (end_btn_box, false, false, 0);
 
             update ();
 
@@ -84,11 +94,17 @@
             bottom_box.add (button_box);
 
             this.add_switch_title (_("Wireless:"));
+            this.add (top_revealer);
             this.add (scrolled);
             this.add (bottom_revealer);
             this.show_all ();   
         }
 
+        public override void update () {
+            update_connected_entry ();
+            base.update ();
+        }
+
         protected override void update_switch () {
             control_switch.active = !software_locked;
         }
@@ -194,5 +210,51 @@
                 }
             });
         }
+
+        private void update_connected_entry () {
+            top_revealer.set_reveal_child (wifi_device.get_active_access_point () != null);
+            if (active_wifi_item.ap != null && control_switch.get_active ()) {
+                active_wifi_item.no_show_all = false;
+                active_wifi_item.visible = true;
+            }
+
+            if (connected_frame != null && connected_frame.get_child () != null) {
+                connected_frame.get_child ().destroy ();
+            }
+
+            connected_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+
+            if (wifi_device.get_active_access_point () != null) { 
+                active_wifi_item.no_show_all = true;
+                active_wifi_item.visible = false;
+
+                var top_item = new WifiMenuItem (wifi_device.get_active_access_point (), null);
+                top_item.hide_icons ();
+                connected_box.add (top_item);
+
+                disconnect_btn = new Gtk.Button.with_label (_("Disconnect"));
+                disconnect_btn.sensitive = (device.get_state () == NM.DeviceState.ACTIVATED);
+                disconnect_btn.get_style_context ().add_class ("destructive-action");
+                disconnect_btn.clicked.connect (() => {
+                    device.disconnect (null);
+                });
+
+                settings_btn = Utils.get_advanced_button_from_device (wifi_device, _("Settings…"));
+                settings_btn.sensitive = (device.get_state () == NM.DeviceState.ACTIVATED);
+
+                var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+                button_box.homogeneous = true;
+                button_box.margin = 6;
+                button_box.pack_end (disconnect_btn);
+                button_box.pack_end (settings_btn);
+                button_box.show_all ();
+
+                connected_box.pack_end (button_box, false, false, 0);
+                connected_frame.add (connected_box);
+            }
+
+            connected_box.show_all ();
+            connected_frame.show_all ();
+        }
     }
 }
 
=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2015-08-05 16:43:26 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2015-08-07 13:06:03 +0000
@@ -25,7 +25,7 @@
 	protected NM.Client nm_client;
 	protected NM.RemoteSettings nm_settings;
 	
-	protected WifiMenuItem? active_wifi_item = null;
+	protected WifiMenuItem? active_wifi_item { get; set; }
 	protected WifiMenuItem? blank_item = null;
 	protected Gtk.Stack placeholder;
 
@@ -41,6 +41,7 @@
 		device = _device;
 		wifi_device = device as NM.DeviceWifi;
 		blank_item = new WifiMenuItem.blank ();
+		active_wifi_item = null;
 		
 		placeholder = new Gtk.Stack ();
 		placeholder.visible = true;
 
=== modified file 'src/common/Widgets/WifiMenuItem.vala'
--- src/common/Widgets/WifiMenuItem.vala	2015-08-05 15:06:39 +0000
+++ src/common/Widgets/WifiMenuItem.vala	2015-08-07 13:06:03 +0000
@@ -42,6 +42,8 @@
 		}
 	}
 
+	private bool show_icons = true;
+
 	public NM.AccessPoint ap { get { return _tmp_ap; } }
 	NM.AccessPoint _tmp_ap;
 
@@ -133,15 +135,21 @@
 	private void update () {
 		radio_button.label = NM.Utils.ssid_to_utf8 (ap.get_ssid ());
 
-		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
+		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);
@@ -155,6 +163,15 @@
 		}
 	}
 
+	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;