[gnome-control-center/wip/benzea/wifi-panel-with-editor-changes: 13/19] connection-editor: Let IP routes shrink more

[Benjamin Berg <bberg src gnome org>]

commit 569c2800396efa68d0c995f38f68d03867b3869c
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed Dec 5 11:06:13 2018 +0100

    connection-editor: Let IP routes shrink more

 panels/network/connection-editor/ce-page-ip4.c | 18 +++++++++++++-----
 panels/network/connection-editor/ce-page-ip6.c | 18 +++++++++++++-----
 panels/network/connection-editor/ip4-page.ui   | 10 +++++++++-
 panels/network/connection-editor/ip6-page.ui   | 11 ++++++++++-
 4 files changed, 45 insertions(+), 12 deletions(-)
---
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 100a3b4e3..b246db3ef 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -377,28 +377,37 @@ add_route_row (CEPageIP4   *page,
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "address", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), address);
-        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 0);
         gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
         widget = gtk_entry_new ();
         g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "netmask", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), netmask);
-        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 0);
         gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
         widget = gtk_entry_new ();
         g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "gateway", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : "");
-        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 0);
         gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
         widget = gtk_entry_new ();
         g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
@@ -409,7 +418,6 @@ add_route_row (CEPageIP4   *page,
                 g_free (s);
         }
         gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
-        gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
         group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_metric_sizegroup"));
@@ -426,7 +434,7 @@ add_route_row (CEPageIP4   *page,
         gtk_container_add (GTK_CONTAINER (row_box), delete_button);
         g_object_set_data (G_OBJECT (row), "delete-button", delete_button);
 
-        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_stub_sizegroup"));
         gtk_size_group_add_widget (group, delete_button);
 
         gtk_container_add (GTK_CONTAINER (row), row_box);
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index 35653f3a1..d75ef424e 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -349,35 +349,43 @@ add_route_row (CEPageIP6   *page,
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "address", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), address);
-        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 0);
         gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
         widget = gtk_entry_new ();
         g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "prefix", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), prefix ? prefix : "");
-        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 0);
         gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
         widget = gtk_entry_new ();
         g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "gateway", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), gateway);
-        gtk_entry_set_width_chars (GTK_ENTRY (widget), 16);
+        gtk_entry_set_width_chars (GTK_ENTRY (widget), 0);
         gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        gtk_size_group_add_widget (group, widget);
+
         widget = gtk_entry_new ();
         g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
         g_signal_connect_swapped (widget, "activate", G_CALLBACK (ensure_empty_routes_row), page);
         g_object_set_data (G_OBJECT (row), "metric", widget);
         gtk_entry_set_text (GTK_ENTRY (widget), metric ? metric : "");
         gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
-        gtk_widget_set_hexpand (widget, TRUE);
         gtk_container_add (GTK_CONTAINER (row_box), widget);
 
         group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_metric_sizegroup"));
@@ -394,7 +402,7 @@ add_route_row (CEPageIP6   *page,
         gtk_container_add (GTK_CONTAINER (row_box), delete_button);
         g_object_set_data (G_OBJECT (row), "delete-button", delete_button);
 
-        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_sizegroup"));
+        group = GTK_SIZE_GROUP (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_stub_sizegroup"));
         gtk_size_group_add_widget (group, delete_button);
 
         gtk_container_add (GTK_CONTAINER (row), row_box);
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index 60ec601ba..59011590d 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -390,13 +390,21 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="routes_sizegroup">
+    <property name="mode">horizontal</property>
+    <widgets>
+      <widget name="routes_address_label" />
+      <widget name="routes_netmask_label" />
+      <widget name="routes_gateway_label" />
+    </widgets>
+  </object>
   <object class="GtkSizeGroup" id="routes_metric_sizegroup">
     <property name="mode">horizontal</property>
     <widgets>
       <widget name="routes_metric_label" />
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="routes_sizegroup">
+  <object class="GtkSizeGroup" id="routes_stub_sizegroup">
     <property name="mode">horizontal</property>
     <widgets>
       <widget name="routes_stub_box" />
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index 3e2fd64b1..e9602dec2 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -404,13 +404,21 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="routes_sizegroup">
+    <property name="mode">horizontal</property>
+    <widgets>
+      <widget name="routes_address_label" />
+      <widget name="routes_prefix_label" />
+      <widget name="routes_gateway_label" />
+    </widgets>
+  </object>
   <object class="GtkSizeGroup" id="routes_metric_sizegroup">
     <property name="mode">horizontal</property>
     <widgets>
       <widget name="routes_metric_label" />
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="routes_sizegroup">
+  <object class="GtkSizeGroup" id="routes_stub_sizegroup">
     <property name="mode">horizontal</property>
     <widgets>
       <widget name="routes_stub_box" />
@@ -424,3 +432,4 @@
   </object>
 </interface>
 
+