Merge lp:~donadigo/switchboard-plug-networking/wifimenuitem-to-listboxrow into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Port WifiMenuItem to ListBoxRow.

This branch simplifies the way WifiMenuItem is created and shown. Instead of inheriting from Gtk.Box and packing it into a new ListBoxRow it directly inherits from ListBoxRow and there is no need to call get_child and get_parent anymore.

=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2015-08-04 19:34:32 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2015-08-05 15:09:47 +0000
@@ -134,7 +134,7 @@
 		bool found = false;
 
 		foreach(var w in wifi_list.get_children()) {
-			var menu_item = (WifiMenuItem) ((Gtk.Bin)w).get_child();
+			var menu_item = ((WifiMenuItem) w);
 
 			if(NM.Utils.same_ssid (ap.get_ssid (), menu_item.ssid, true)) {
 				found = true;
@@ -149,16 +149,11 @@
 		if(!found && ap.get_ssid() != null) {
 			WifiMenuItem item = new WifiMenuItem(ap, previous_wifi_item);
 
-			var row = new Gtk.ListBoxRow ();
-
-			row.add (item);
-			row.get_style_context ().add_class ("menuitem");
-
 			previous_wifi_item = item;
 			item.set_visible(true);
 			item.user_action.connect(wifi_activate_cb);
 
-			wifi_list.add (row);
+			wifi_list.add (item);
 
 			wifi_list.show_all ();
 
@@ -187,7 +182,7 @@
 			
 			bool found = false;
 			foreach(var w in wifi_list.get_children()) {
-				var menu_item = (WifiMenuItem) ((Gtk.Bin)w).get_child();
+				var menu_item = ((WifiMenuItem) w);
 
 				if(NM.Utils.same_ssid (active_ap.get_ssid (), menu_item.ssid, true)) {
 					found = true;
@@ -210,7 +205,7 @@
 		WifiMenuItem found_item = null;
 
 		foreach(var w in wifi_list.get_children()) {
-			var menu_item = (WifiMenuItem) ((Gtk.Bin)w).get_child();
+			var menu_item = ((WifiMenuItem) w);
 
 			assert(menu_item != null);
 
@@ -224,7 +219,7 @@
 			critical("Couldn't remove an access point which has not been added.");
 		} else {
 			if(!found_item.remove_ap(ap)) {
-				found_item.get_parent().destroy ();
+				found_item.destroy ();
 			}
 		}
 		
@@ -330,8 +325,8 @@
 			return 0;
 		}
 
-		var w1 = (WifiMenuItem)r1.get_child ();
-		var w2 = (WifiMenuItem)r2.get_child ();
+		var w1 = ((WifiMenuItem)r1);
+		var w2 = ((WifiMenuItem)r2);
 
 		if (w1.ap.get_strength () > w2.ap.get_strength ()) {
 			return -1;
 
=== modified file 'src/common/Widgets/WifiMenuItem.vala'
--- src/common/Widgets/WifiMenuItem.vala	2015-08-02 12:30:11 +0000
+++ src/common/Widgets/WifiMenuItem.vala	2015-08-05 15:09:47 +0000
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Network.WifiMenuItem : Gtk.Box {
+public class Network.WifiMenuItem : Gtk.ListBoxRow {
 	private List<NM.AccessPoint> _ap;
 	public signal void user_action();
 	public GLib.ByteArray ssid {
@@ -52,7 +52,7 @@
 	Gtk.Spinner spinner;
 
 	public WifiMenuItem (NM.AccessPoint ap, WifiMenuItem? previous = null) {
-
+		var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
 		radio_button = new Gtk.RadioButton(null);
 		radio_button.margin_start = 6;
 		if (previous != null) radio_button.set_group (previous.get_group ());
@@ -74,15 +74,15 @@
 
 		error_img.set_tooltip_text (_("This wireless network could not be connected to."));
 		
-		pack_start(radio_button, true, true);
+		main_box.pack_start(radio_button, true, true);
 		spinner = new Gtk.Spinner();
 		spinner.start();
 		spinner.visible = false;
 		spinner.no_show_all = !spinner.visible;
-		pack_start(spinner, false, false);
-		pack_start(error_img, false, false);
-		pack_start(lock_img, false, false);
-		pack_start(img_strength, false, false);
+		main_box.pack_start(spinner, false, false);
+		main_box.pack_start(error_img, false, false);
+		main_box.pack_start(lock_img, false, false);
+		main_box.pack_start(img_strength, false, false);
 		
 		_ap = new List<NM.AccessPoint>();
 
@@ -91,6 +91,8 @@
 
 		notify["state"].connect (update);
 		radio_button.notify["active"].connect (update);
+		this.add (main_box);
+		this.get_style_context ().add_class ("menuitem");
 	}
 
 	/**