Merge lp:~xapantu/switchboard-plug-networking/several-interfaces into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[xapantu]

[Cody Garver (codygarver)]

Did you forget to `bzr add` the file EtherInterface.vala?

[Adam Bieńkowski (donadigo)]

I couldn't test it because of EtherInterface.vala file is not added to the branch. I've also made some inline comments.

review: Needs Fixing

[lp:~xapantu/switchboard-plug-networking/several-interfaces]

174. By xapantu on 2015-11-07

Add EtherInterface

175. By xapantu on 2015-11-18

Use Unknown devices and make it translatable

[xapantu (xapantu)]

Just pushed fixes for both issues.

[xapantu (xapantu)]

Superseded by the hotspot branch, which needed this one.

Unmerged revisions

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-01 23:06:00 +0000
+++ src/CMakeLists.txt	2015-11-18 10:28:19 +0000
@@ -21,6 +21,7 @@
     Widgets/Device/DeviceItem.vala
     Widgets/Device/DevicePage.vala   
     Widgets/WifiInterface.vala
+    Widgets/EtherInterface.vala
     Widgets/Proxy/ProxyConfigurationPage.vala
     Widgets/Proxy/ProxyExceptionsPage.vala
     Widgets/Proxy/ProxyPage.vala    
@@ -30,6 +31,7 @@
     common/Utils.vala
     common/Widgets/WifiMenuItem.vala
     common/Widgets/AbstractWifiInterface.vala
+    common/Widgets/AbstractEtherInterface.vala
     common/rfkill.vala
     common/Widgets/NMVisualizer.vala
     common/Widgets/WidgetNMInterface.vala

=== 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-18 10:28:19 +0000
@@ -30,7 +30,11 @@
         private Gtk.Image row_image;
         private Gtk.Image status_image;
 
-        private string title;
+        public string title {
+			set {
+				row_title.label = value;
+			}
+		}
         private string subtitle;
         private string icon_name;
 
@@ -38,12 +42,13 @@
         private Gtk.Label row_title;
 
         public DeviceItem (string _title, string _subtitle, string _icon_name = "network-wired") {
-            this.title = _title;
             this.subtitle = _subtitle;
             this.icon_name = _icon_name;
             this.type = Utils.ItemType.INVALID;
 
             create_ui (icon_name);
+            
+			this.title = _title;
         }
 
         public DeviceItem.from_interface (WidgetNMInterface iface,
@@ -52,18 +57,14 @@
             this.page = iface;
             this.device = iface.device;
             this.type = Utils.ItemType.DEVICE;
-            
-            if (_title != "") {
-                this.title = _title;
-            } else {
-                this.title = Utils.type_to_string (device.get_device_type ());
-            }
-           
+
             this.subtitle = "";
             this.icon_name = _icon_name;
 
             create_ui (icon_name);
-            switch_status (device.get_state ());
+			iface.bind_property ("display-title", this, "title");
+            
+			switch_status (device.get_state ());
 
             device.state_changed.connect ( () => {
                 switch_status (device.get_state ());
@@ -82,7 +83,7 @@
             row_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DND);
             row_image.pixel_size = 32;
 
-            row_title = new Gtk.Label (title);
+            row_title = new Gtk.Label ("");
             row_title.get_style_context ().add_class ("h3");
             row_title.ellipsize = Pango.EllipsizeMode.END;
             row_title.halign = Gtk.Align.START;

=== 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-18 10:28:19 +0000
@@ -30,7 +30,7 @@
             bottom_revealer.transition_type = Gtk.RevealerTransitionType.NONE;
 
             this.icon_name = "network-wired";
-            this.title = Utils.type_to_string (device.get_device_type ());
+            display_title = Utils.type_to_string (device.get_device_type ());
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             details_box.pack_end (Utils.get_advanced_button_from_device (device), false, false, 0);
@@ -49,7 +49,7 @@
             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 ());
+            display_title = Utils.type_to_string (device.get_device_type ());
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             details_box.pack_start (Utils.get_advanced_button_from_device (device), false, false, 0);

=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2015-10-22 17:08:56 +0000
+++ src/Widgets/DeviceList.vala	2015-11-18 10:28:19 +0000
@@ -33,8 +33,6 @@
         private Gtk.Label devices_l;
         private DeviceItem proxy;
 
-        private int wireless_item = 0;
-
         public DeviceList () {
             this.selection_mode = Gtk.SelectionMode.SINGLE;
             this.activate_on_single_click = true;  
@@ -56,14 +54,8 @@
         }
 
         public void add_device_to_list (WidgetNMInterface iface) {
-            if (iface.device.get_device_type () == NM.DeviceType.WIFI) {
-                string title = _("Wireless");
-                if (wireless_item > 0) {
-                    title += SUFFIX + wireless_item.to_string ();
-                }
-
-                item = new DeviceItem.from_interface (iface, "network-wireless", title);
-                wireless_item++;
+            if (iface is AbstractWifiInterface) {
+                item = new DeviceItem.from_interface (iface, "network-wireless");
             } else {
 
                 if (!iface.device.get_managed ()) {
@@ -92,10 +84,6 @@
         }
 
         public void remove_row_from_list (DeviceItem item) {
-            if (item.device.get_device_type () == NM.DeviceType.WIFI && wireless_item > 0) {
-                wireless_item--;
-            } 
-
             items.remove (item);
             this.remove (item);
         }

=== added file 'src/Widgets/EtherInterface.vala'
--- src/Widgets/EtherInterface.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/EtherInterface.vala	2015-11-18 10:28:19 +0000
@@ -0,0 +1,47 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 Adam Bieńkowski (http://launchpad.net/switchboard-network-plug)
+ *
+ * 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]
+ *              xapantu <[e-mail]>
+ */
+
+namespace Network.Widgets {
+    public class EtherInterface : Network.AbstractEtherInterface {
+
+        public EtherInterface (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
+            info_box = new info_box.from_device (device);
+            this.init (device, info_box);
+
+            bottom_revealer.transition_type = Gtk.RevealerTransitionType.NONE;
+
+            this.icon_name = "network-wired";
+
+            var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+            details_box.pack_end (Utils.get_advanced_button_from_device (device), false, false, 0);
+
+            update ();
+
+            bottom_box.pack_start (info_box, true, true);
+            bottom_box.pack_end (details_box, false, false);
+
+            pack_start (bottom_revealer, true, true);
+            this.show_all ();
+        }
+    }
+}

=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2015-10-09 19:12:42 +0000
+++ src/Widgets/Page.vala	2015-11-18 10:28:19 +0000
@@ -41,20 +41,8 @@
             }
         }
 
-        private string _title;
-        public string title {
-            get {
-                return _title;
-            }
-
-            set {
-                _title = value;
-                device_label.label = _title;
-            }
-        }
-
         private Gtk.Image device_img;
-        private Gtk.Label device_label;
+        protected Gtk.Label device_label;
 
         protected Gtk.Revealer bottom_revealer;
         protected Gtk.Box bottom_box;

=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2015-10-09 19:12:42 +0000
+++ src/Widgets/WifiInterface.vala	2015-11-18 10:28:19 +0000
@@ -61,7 +61,6 @@
             init_wifi_interface (nm_client, settings, device_);
 
             this.icon_name = "network-wireless";
-            this.title = _("Wireless");
             this.spacing = 0;
 
             control_box.margin_bottom = 12;

=== added file 'src/common/Widgets/AbstractEtherInterface.vala'
--- src/common/Widgets/AbstractEtherInterface.vala	1970-01-01 00:00:00 +0000
+++ src/common/Widgets/AbstractEtherInterface.vala	2015-11-18 10:28:19 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program 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 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class Network.AbstractEtherInterface : Network.WidgetNMInterface {
+
+	public override void update_name (int count) {
+		if (count <= 1) {
+			display_title = _("Ethernet");
+		}
+		else {
+			display_title = device.get_description ();
+		}
+	}
+}

=== 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-18 10:28:19 +0000
@@ -112,6 +112,15 @@
 		update();
 	}
 
+	public override void update_name (int count) {
+		if (count <= 1) {
+			display_title = _("Wi-Fi");
+		}
+		else {
+			display_title = device.get_description ();
+		}
+	}
+
 	Gtk.Label construct_placeholder_label (string text, bool title) {
 		var label = new Gtk.Label (text);
 		label.visible = true;

=== modified file 'src/common/Widgets/NMVisualizer.vala'
--- src/common/Widgets/NMVisualizer.vala	2015-08-02 12:30:11 +0000
+++ src/common/Widgets/NMVisualizer.vala	2015-11-18 10:28:19 +0000
@@ -56,6 +56,26 @@
 				break;
 			}
 		}
+		
+		update_interfaces_names ();
+	}
+
+	void update_interfaces_names () {
+		var count_type = new Gee.HashMap<string, int?> ();
+		foreach (var iface in network_interface) {
+			var type = iface.get_type ().name ();
+			if (count_type.has_key (type)) {
+				count_type[type] = count_type[type] + 1;
+			}
+			else {
+				count_type[type] = 1;
+			}
+		}
+
+		foreach (var iface in network_interface) {
+			var type = iface.get_type ().name ();
+			iface.update_name (count_type [type]);
+		}
 	}
 
 	private void device_added_cb (NM.Device device) {
@@ -63,13 +83,10 @@
 
 		if (device is NM.DeviceWifi) {
 			widget_interface = new WifiInterface (nm_client, nm_settings, device);
+
 			debug ("Wifi interface added");
 		} else if (device is NM.DeviceEthernet) {
-#if INDICATOR_NETWORK
 			widget_interface = new EtherInterface (nm_client, nm_settings, device);
-#else
-			widget_interface = new Widgets.DevicePage (nm_client, nm_settings, device);
-#endif
 			debug ("Ethernet interface added");
 		} else {
 			debug ("Unknown device: %s\n", device.get_device_type().to_string());
@@ -82,6 +99,9 @@
 			widget_interface.notify["state"].connect(update_state);
 
 		}
+			
+		update_interfaces_names ();
+
 
 		update_all();
 

=== modified file 'src/common/Widgets/WidgetNMInterface.vala'
--- src/common/Widgets/WidgetNMInterface.vala	2015-08-01 22:16:50 +0000
+++ src/common/Widgets/WidgetNMInterface.vala	2015-11-18 10:28:19 +0000
@@ -23,6 +23,16 @@
 #endif
 	public Network.State state { get; protected set; default = Network.State.DISCONNECTED; }
 
+	public string display_title { get; protected set; default = _("Unknown device"); }
+
+#if PLUG_NETWORK
+	construct {
+		notify["display-title"].connect ( () => {
+			device_label.label = display_title;
+		});
+	}
+#endif
+
 #if INDICATOR_NETWORK
 	public Wingpanel.Widgets.Separator? sep = null;
 
@@ -41,4 +51,8 @@
 	public virtual void update () {
 #endif
 	}
+
+	public virtual void update_name (int count) {
+		display_title = _("Unknown type: %s ").printf (device.get_description ());
+	}
 }