Merge lp:~donadigo/switchboard-plug-networking/ipv6 into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Fix bug #1517121: "On IPv6 and v4 (dual stack) networks only IPv4 is displayed".
* Fix not expanding content when resizing.
* Move "unknown" label to one constant.

Fixes bug #1517121: "On IPv6 and v4 (dual stack) networks only IPv4 is displayed".

This branch adds a IPv6 label to connections that has IPv6 address available.
Other: only one unknown constant string accross the labels and fixes for not expanding content when resizing.

[lp:~donadigo/switchboard-plug-networking/ipv6]

242. By Adam Bieńkowski on 2016-06-06

Return on first found address

243. By Adam Bieńkowski on 2016-06-08

Display multiple IPv6 addressess; use CIDR notation; fixes for not expanding ui

[Danielle Foré (danrabbit)]

It looks like the label for IPv6 is vertically centered. This is pretty confusing. It should be valign start to make sure it's associated correctly.

review: Needs Fixing (ux)

[lp:~donadigo/switchboard-plug-networking/ipv6]

244. By Adam Bieńkowski on 2016-06-08

Initialy set IPv6 address to unknown

245. By Adam Bieńkowski on 2016-06-08

Revert last change

246. By Adam Bieńkowski on 2016-06-08

Align the IPv6 label vertically

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-02-12 18:38:11 +0000
+++ src/Plug.vala	2016-06-08 20:01:19 +0000
@@ -73,6 +73,7 @@
             paned.width_request = 250;
 
             content = new Gtk.Stack ();
+            content.hexpand = true;
 
             var sidebar = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             device_list = new Widgets.DeviceList ();
@@ -99,8 +100,8 @@
             sidebar.pack_start (scrolled_window, true, true);
             sidebar.pack_start (footer, false, false);
 
-            paned.pack1 (sidebar, true, false);
-            paned.pack2 (content, true, true);
+            paned.pack1 (sidebar, true, true);
+            paned.pack2 (content, true, false);
             paned.set_position (240);
 
             connect_signals ();
@@ -122,12 +123,11 @@
             });
             
             device_list.show_no_devices.connect ((show) => {
+                scrolled_window.sensitive = !show;
                 if (show) {
                     content.set_visible_child (no_devices);
-                    scrolled_window.sensitive = false;
                 } else {
                     content.set_visible_child (page);
-                    scrolled_window.sensitive = true;
                 }
             });
 

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2016-04-24 15:32:14 +0000
+++ src/Utils.vala	2016-06-08 20:01:19 +0000
@@ -18,6 +18,8 @@
  */
 
 namespace Network {
+    public const string UNKNOWN_STR = (_("Unknown"));
+
     public class Utils {
         public class Hotspot {
             public delegate void UpdateSecretCallback ();
@@ -218,7 +220,7 @@
                     return _("Failed to connect");
                 case NM.DeviceState.UNKNOWN:
                 default:
-                    return _("Unknown");
+                    return UNKNOWN_STR;
             }
         }
 
@@ -252,7 +254,7 @@
                     return _("Bridge master");
                 case NM.DeviceType.UNKNOWN:
                 default:
-                    return _("Unknown");
+                    return UNKNOWN_STR;
             }
         }
     }

=== modified file 'src/Widgets/InfoBox.vala'
--- src/Widgets/InfoBox.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/InfoBox.vala	2016-06-08 20:01:19 +0000
@@ -24,20 +24,24 @@
         private NM.Device device;
         private DeviceItem? owner;
 
-        private string ipaddress_l = (_("IP Address:") + SUFFIX);
+        private string ip4address_l = (_("IP Address:") + SUFFIX);
+        private string ip6address_l = (_("IPv6 Address:") + SUFFIX);
         private string mask_l = (_("Subnet mask:") + SUFFIX);
         private string router_l = (_("Router:") + SUFFIX);
         private string broadcast_l = (_("Broadcast:") + SUFFIX);
         private string sent_l = (_("Sent:") + SUFFIX);
         private string received_l = (_("Received:") + SUFFIX);
 
-        private Gtk.Label ipaddress;
+        private Gtk.Label ip4address;
+        private Gtk.Label ip6address;
         private Gtk.Label mask;
         private Gtk.Label router;
         private Gtk.Label broadcast;
         private Gtk.Label sent;
         private Gtk.Label received;
 
+        private Gtk.Label ip6address_head;
+
         public InfoBox.from_device (NM.Device? _device) {
             owner = null;
             device = _device;
@@ -84,8 +88,12 @@
             activity_info.attach_next_to (received_head, sent_head, Gtk.PositionType.BOTTOM);
             activity_info.attach_next_to (received, received_head, Gtk.PositionType.RIGHT);
 
-            ipaddress = new Gtk.Label ("");
-            ipaddress.selectable = true;
+            ip4address = new Gtk.Label ("");
+            ip4address.selectable = true;
+
+            ip6address = new Gtk.Label ("");
+            ip6address.selectable = true;
+            ip6address.no_show_all = true;
 
             mask = new Gtk.Label ("");
             mask.selectable = true;
@@ -96,22 +104,30 @@
             broadcast = new Gtk.Label ("");
             broadcast.selectable = true;
 
-            var ipaddress_head = new Gtk.Label (ipaddress_l);
+            var ip4address_head = new Gtk.Label (ip4address_l);
+
+            ip6address_head = new Gtk.Label (ip6address_l);
+            ip6address_head.no_show_all = true;
+            ip6address_head.valign = Gtk.Align.START;
+
             var mask_head = new Gtk.Label (mask_l);
             var broadcast_head = new Gtk.Label (broadcast_l);
             var router_head = new Gtk.Label (router_l);
 
-            fix_halign (Gtk.Align.START, ipaddress, mask, broadcast,
-                        router, ipaddress_head, mask_head,
+            fix_halign (Gtk.Align.START, ip4address, ip6address, mask, broadcast,
+                        router, ip4address_head, ip6address_head, mask_head,
                         broadcast_head, router_head);
 
-            fix_first_col (ipaddress_head, mask_head,
+            fix_first_col (ip4address_head, ip6address_head, mask_head,
                            broadcast_head, router_head);
 
-            info_grid.attach (ipaddress_head, 0, 0);
-            info_grid.attach_next_to (ipaddress, ipaddress_head, Gtk.PositionType.RIGHT);
-
-            info_grid.attach_next_to (mask_head, ipaddress_head, Gtk.PositionType.BOTTOM);
+            info_grid.attach (ip4address_head, 0, 0);
+            info_grid.attach_next_to (ip4address, ip4address_head, Gtk.PositionType.RIGHT);
+
+            info_grid.attach_next_to (ip6address_head, ip4address_head, Gtk.PositionType.BOTTOM);
+            info_grid.attach_next_to (ip6address, ip6address_head, Gtk.PositionType.RIGHT);
+
+            info_grid.attach_next_to (mask_head, ip6address_head, Gtk.PositionType.BOTTOM);
             info_grid.attach_next_to (mask, mask_head, Gtk.PositionType.RIGHT);
 
             info_grid.attach_next_to (router_head, mask_head, Gtk.PositionType.BOTTOM);
@@ -133,24 +149,45 @@
         }
 
         public void update_activity (string sent_bytes, string received_bytes) {
-            sent.label = sent_bytes ?? _("Unknown");
-            received.label = received_bytes ?? _("Unknown");
+            sent.label = sent_bytes ?? UNKNOWN_STR;
+            received.label = received_bytes ?? UNKNOWN_STR;
         }
 
         public void update_status () {
             // Refresh DHCP4 info
             var dhcp4 = device.get_dhcp4_config ();
             if (dhcp4 != null) {
-                ipaddress.label =  (dhcp4.get_one_option ("ip_address") ?? _("Unknown"));
-                mask.label =  (dhcp4.get_one_option ("subnet_mask") ?? _("Unknown"));
-                router.label =  (dhcp4.get_one_option ("routers") ?? _("Unknown"));
-                broadcast.label =  (dhcp4.get_one_option ("broadcast_address") ?? _("Unknown"));
+                ip4address.label =  (dhcp4.get_one_option ("ip_address") ?? UNKNOWN_STR);
+                mask.label =  (dhcp4.get_one_option ("subnet_mask") ?? UNKNOWN_STR);
+                router.label =  (dhcp4.get_one_option ("routers") ?? UNKNOWN_STR);
+                broadcast.label =  (dhcp4.get_one_option ("broadcast_address") ?? UNKNOWN_STR);
             } else {
-                ipaddress.label = _("Unknown");
-                mask.label =  _("Unknown");
-                router.label = _("Unknown");
-                broadcast.label = _("Unknown");
-            }
+                ip4address.label = UNKNOWN_STR;
+                mask.label =  UNKNOWN_STR;
+                router.label = UNKNOWN_STR;
+                broadcast.label = UNKNOWN_STR;
+            }
+
+            var ip6 = device.get_ip6_config ();
+            ip6address.visible = ip6address_head.visible = (ip6 != null);
+            ip6address.label = "";
+            if (ip6 != null) {
+                int i = 1;
+                SList<NM.IP6Address> addresses = ip6.get_addresses ().copy ();
+                addresses.@foreach ((addr) => {
+                    addr.@ref ();
+                    var inet = new InetAddress.from_bytes (addr.get_address (), SocketFamily.IPV6);
+                    string inet_str = inet.to_string () + "/" + addr.get_prefix ().to_string ();
+                    ip6address.visible = ip6address_head.visible = (inet_str.strip () != "");
+                    ip6address.label += inet_str;
+                    if (i < addresses.length ()) {
+                        ip6address.label += "\n";
+                    }
+
+                    i++;
+                });         
+            }
+
 
             if (owner != null) {
                 update_sidebar (owner);

=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2016-05-09 18:10:58 +0000
+++ src/Widgets/Page.vala	2016-06-08 20:01:19 +0000
@@ -121,8 +121,8 @@
         }
 
         public void get_activity_information (string iface, out string sent_bytes, out string received_bytes) {
-            sent_bytes = _("Unknown");
-            received_bytes = _("Unknown");
+            sent_bytes = UNKNOWN_STR;
+            received_bytes = UNKNOWN_STR;
 
             string tx_bytes_path = "/sys/class/net/" + iface + "/statistics/tx_bytes";
             string rx_bytes_path = "/sys/class/net/" + iface + "/statistics/rx_bytes";

=== modified file 'src/common/Utils.vala'
--- src/common/Utils.vala	2015-12-20 20:39:29 +0000
+++ src/common/Utils.vala	2016-06-08 20:01:19 +0000
@@ -51,7 +51,7 @@
         case Network.State.WIRED_UNPLUGGED:
             return _("Cable unplugged");
         }
-        return _("Unknown");
+        return UNKNOWN_STR;
     }
 }