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

[Benjamin Berg <bberg src gnome org>]

commit 90e59b402bae0257cacde462fb7ff8481fdd9082
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed Dec 5 12:26:27 2018 +0100

    connection-editor: Let IP methods shrink more

 panels/network/connection-editor/ip4-page.ui | 119 +++++++++++-----------
 panels/network/connection-editor/ip6-page.ui | 143 ++++++++++++---------------
 2 files changed, 120 insertions(+), 142 deletions(-)
---
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index 59011590d..92a6a7a4f 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkGrid" id="page">
+  <object class="GtkBox" id="page">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="row-spacing">6</property>
-    <property name="column-spacing">6</property>
+    <property name="spacing">6</property>
     <child>
       <object class="GtkLabel" id="heading_enable">
         <property name="visible">True</property>
@@ -19,65 +18,53 @@
           <attribute name="weight" value="bold"/>
         </attributes>
       </object>
-      <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">0</property>
-      </packing>
     </child>
     <child>
-      <object class="GtkRadioButton" id="radio_automatic">
-        <property name="label" translatable="yes">Automatic (DHCP)</property>
+      <object class="GtkFlowBox">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_local">
-        <property name="label" translatable="yes">Link-Local Only</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
-      </object>
-      <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_manual">
-        <property name="label" translatable="yes">Manual</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
-      </object>
-      <packing>
-        <property name="top-attach">1</property>
-        <property name="left-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_disabled">
-        <property name="label" translatable="yes">Disable</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
+        <property name="can_focus">False</property>
+        <property name="homogeneous">True</property>
+        <property name="max_children_per_line">2</property>
+        <child>
+          <object class="GtkRadioButton" id="radio_automatic">
+            <property name="label" translatable="yes">Automatic (DHCP)</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_local">
+            <property name="label" translatable="yes">Link-Local Only</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_manual">
+            <property name="label" translatable="yes">Manual</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_disabled">
+            <property name="label" translatable="yes">Disable</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
       </object>
-      <packing>
-        <property name="top-attach">1</property>
-        <property name="left-attach">2</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox" id="page_content">
@@ -368,13 +355,22 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="never_default_check">
-            <property name="label" translatable="yes">Use this connection _only for resources on its 
network</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
+            <child>
+              <object class="GtkLabel" id="never_default_label">
+                <property name="label" translatable="yes">Use this connection _only for resources on its 
network</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="ellipsize">end</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -383,11 +379,6 @@
           </packing>
         </child>
       </object>
-      <packing>
-        <property name="top-attach">2</property>
-        <property name="left-attach">0</property>
-        <property name="width">3</property>
-      </packing>
     </child>
   </object>
   <object class="GtkSizeGroup" id="routes_sizegroup">
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index e9602dec2..199e57a85 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkGrid" id="page">
+  <object class="GtkBox" id="page">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="row-spacing">6</property>
-    <property name="column-spacing">6</property>
+    <property name="spacing">6</property>
     <child>
       <object class="GtkLabel" id="heading_enable">
         <property name="visible">True</property>
@@ -19,79 +18,63 @@
           <attribute name="weight" value="bold"/>
         </attributes>
       </object>
-      <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">0</property>
-      </packing>
     </child>
     <child>
-      <object class="GtkRadioButton" id="radio_automatic">
-        <property name="label" translatable="yes">Automatic</property>
+      <object class="GtkFlowBox">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_dhcp">
-        <property name="label" translatable="yes">Automatic, DHCP only</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
-      </object>
-      <packing>
-        <property name="top-attach">0</property>
-        <property name="left-attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_local">
-        <property name="label" translatable="yes">Link-Local Only</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
-      </object>
-      <packing>
-        <property name="top-attach">1</property>
-        <property name="left-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_manual">
-        <property name="label" translatable="yes">Manual</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
-      </object>
-      <packing>
-        <property name="top-attach">1</property>
-        <property name="left-attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkRadioButton" id="radio_disabled">
-        <property name="label" translatable="yes">Disable</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="draw_indicator">True</property>
-        <property name="group">radio_automatic</property>
+        <property name="can_focus">False</property>
+        <property name="homogeneous">True</property>
+        <property name="max_children_per_line">2</property>
+        <child>
+          <object class="GtkRadioButton" id="radio_automatic">
+            <property name="label" translatable="yes">Automatic</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_dhcp">
+            <property name="label" translatable="yes">Automatic, DHCP only</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_local">
+            <property name="label" translatable="yes">Link-Local Only</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_manual">
+            <property name="label" translatable="yes">Manual</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioButton" id="radio_disabled">
+            <property name="label" translatable="yes">Disable</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">radio_automatic</property>
+          </object>
+        </child>
       </object>
-      <packing>
-        <property name="top-attach">2</property>
-        <property name="left-attach">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox" id="page_content">
@@ -382,13 +365,22 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="never_default_check">
-            <property name="label" translatable="yes">Use this connection _only for resources on its 
network</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
+            <child>
+              <object class="GtkLabel" id="never_default_label">
+                <property name="label" translatable="yes">Use this connection _only for resources on its 
network</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="ellipsize">end</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -397,11 +389,6 @@
           </packing>
         </child>
       </object>
-      <packing>
-        <property name="top-attach">3</property>
-        <property name="left-attach">0</property>
-        <property name="width">3</property>
-      </packing>
     </child>
   </object>
   <object class="GtkSizeGroup" id="routes_sizegroup">