From: Debian GNOME Maintainers
 <pkg-gnome-maintainers@lists.alioth.debian.org>
Date: Thu, 2 Jun 2022 14:36:35 +0200
Subject: resize-connection-editor

===================================================================
---
 .../connection-editor/8021x-security-page.ui       |  6 +--
 .../connection-editor/ce-page-8021x-security.c     |  2 +-
 panels/network/connection-editor/ce-page-ip4.c     |  4 +-
 panels/network/connection-editor/ce-page-ip6.c     |  4 +-
 .../network/connection-editor/ce-page-security.c   |  2 +-
 .../network/connection-editor/connection-editor.ui |  4 +-
 panels/network/connection-editor/details-page.ui   |  9 +++--
 panels/network/connection-editor/ethernet-page.ui  | 36 ++++++++---------
 panels/network/connection-editor/ip4-page.ui       | 42 ++++++++++----------
 panels/network/connection-editor/ip6-page.ui       | 46 +++++++++++-----------
 panels/network/connection-editor/security-page.ui  |  6 +--
 panels/network/connection-editor/vpn-page.ui       |  6 +--
 panels/network/connection-editor/wifi-page.ui      |  6 +--
 13 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/panels/network/connection-editor/8021x-security-page.ui b/panels/network/connection-editor/8021x-security-page.ui
index 4880d99..2e774a3 100644
--- a/panels/network/connection-editor/8021x-security-page.ui
+++ b/panels/network/connection-editor/8021x-security-page.ui
@@ -8,14 +8,14 @@
         <property name="propagate-natural-width">True</property>
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="margin_start">50</property>
-            <property name="margin_end">50</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="row_spacing">10</property>
-            <property name="column_spacing">6</property>
+            <property name="column_spacing">2</property>
             <child>
               <object class="GtkLabel" id="security_label">
                 <property name="xalign">1</property>
diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c
index 3826946..97cd01a 100644
--- a/panels/network/connection-editor/ce-page-8021x-security.c
+++ b/panels/network/connection-editor/ce-page-8021x-security.c
@@ -68,7 +68,7 @@ finish_setup (CEPage8021xSecurity *self, gpointer unused, GError *error, gpointe
 	if (error)
 		return;
 
-	self->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+	self->group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
 	self->security = nma_ws_802_1x_new (self->connection, FALSE, FALSE);
 	if (!self->security) {
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index b7a687d..0aeed7c 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -247,7 +247,7 @@ add_address_row (CEPageIP4   *self,
         row = gtk_list_box_row_new ();
         gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
-        row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        row_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_add_css_class (row_box, "linked");
 
         widget = GTK_WIDGET (ce_ip_address_entry_new (AF_INET));
@@ -393,7 +393,7 @@ add_route_row (CEPageIP4   *self,
         row = gtk_list_box_row_new ();
         gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
-        row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        row_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_add_css_class (row_box, "linked");
 
         widget = GTK_WIDGET (ce_ip_address_entry_new (AF_INET));
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index a5e5dcb..0a02fc0 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -231,7 +231,7 @@ add_address_row (CEPageIP6   *self,
         row = gtk_list_box_row_new ();
         gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
-        row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        row_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_add_css_class (row_box, "linked");
 
         widget = GTK_WIDGET (ce_ip_address_entry_new (AF_INET6));
@@ -369,7 +369,7 @@ add_route_row (CEPageIP6   *self,
         row = gtk_list_box_row_new ();
         gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
-        row_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+        row_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_add_css_class (row_box, "linked");
 
         widget = GTK_WIDGET (ce_ip_address_entry_new (AF_INET6));
diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c
index fbc627a..2a51301 100644
--- a/panels/network/connection-editor/ce-page-security.c
+++ b/panels/network/connection-editor/ce-page-security.c
@@ -234,7 +234,7 @@ finish_setup (CEPageSecurity *self)
         sw = nm_connection_get_setting_wireless (self->connection);
         g_assert (sw);
 
-        self->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+        self->group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
         dev_caps =   NM_WIFI_DEVICE_CAP_CIPHER_WEP40
                    | NM_WIFI_DEVICE_CAP_CIPHER_WEP104
diff --git a/panels/network/connection-editor/connection-editor.ui b/panels/network/connection-editor/connection-editor.ui
index 89f8418..0c3b116 100644
--- a/panels/network/connection-editor/connection-editor.ui
+++ b/panels/network/connection-editor/connection-editor.ui
@@ -3,7 +3,7 @@
   <template class="NetConnectionEditor" parent="AdwWindow">
     <property name="destroy-with-parent">True</property>
     <property name="modal">True</property>
-    <property name="width_request">360</property>
+    <property name="width_request">320</property>
     <property name="height_request">294</property>
     <child>
       <object class="AdwToolbarView">
@@ -59,7 +59,7 @@
                           <object class="AdwBin" id="add_connection_frame">
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
-                            <property name="width_request">300</property>
+                            <property name="width_request">200</property>
                             <property name="valign">start</property>
                             <property name="margin-start">12</property>
                             <property name="margin-end">12</property>
diff --git a/panels/network/connection-editor/details-page.ui b/panels/network/connection-editor/details-page.ui
index 8ae94ff..163e8a5 100644
--- a/panels/network/connection-editor/details-page.ui
+++ b/panels/network/connection-editor/details-page.ui
@@ -8,12 +8,12 @@
         <property name="propagate-natural-width">True</property>
         <child>
           <object class="GtkGrid">
-            <property name="margin_start">24</property>
-            <property name="margin_end">24</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
             <property name="margin_top">24</property>
             <property name="margin_bottom">24</property>
             <property name="row_spacing">12</property>
-            <property name="column_spacing">12</property>
+            <property name="column_spacing">2</property>
             <child>
               <object class="GtkLabel" id="strength_heading_label">
                 <property name="xalign">1</property>
@@ -414,6 +414,7 @@
                       <object class="GtkLabel">
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">_Metered connection: has data limits or can incur charges</property>
+                        <property name="wrap">True</property>
                         <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">restrict_data_check</property>
@@ -424,7 +425,7 @@
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Software updates and other large downloads will not be started automatically.</property>
                         <property name="wrap">True</property>
-                        <property name="max_width_chars">60</property>
+                        <property name="max_width_chars">30</property>
                         <style>
                           <class name="dim-label" />
                         </style>
diff --git a/panels/network/connection-editor/ethernet-page.ui b/panels/network/connection-editor/ethernet-page.ui
index 89cdf8f..9c7cf3d 100644
--- a/panels/network/connection-editor/ethernet-page.ui
+++ b/panels/network/connection-editor/ethernet-page.ui
@@ -13,14 +13,14 @@
         <property name="propagate-natural-width">True</property>
         <child>
           <object class="GtkGrid">
-            <property name="margin_start">50</property>
-            <property name="margin_end">50</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
-            <property name="hexpand">True</property>
+            <property name="hexpand">False</property>
             <property name="vexpand">True</property>
-            <property name="row_spacing">10</property>
-            <property name="column_spacing">6</property>
+            <property name="row_spacing">5</property>
+            <property name="column_spacing">2</property>
             <child>
               <object class="GtkLabel">
                 <property name="xalign">1</property>
@@ -37,8 +37,8 @@
               <object class="GtkEntry" id="name_entry">
                 <property name="invisible_char">●</property>
                 <layout>
-                  <property name="column">1</property>
-                  <property name="row">0</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -50,7 +50,7 @@
                 <property name="mnemonic_widget">mac_combo</property>
                 <layout>
                   <property name="column">0</property>
-                  <property name="row">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -60,8 +60,8 @@
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
                 <layout>
-                  <property name="column">1</property>
-                  <property name="row">1</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -71,8 +71,8 @@
                 <property name="hexpand">True</property>
                 <property name="active_id">0</property>
                 <layout>
-                  <property name="column">1</property>
-                  <property name="row">2</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
                 <child internal-child="entry">
                   <object class="GtkEntry">
@@ -88,7 +88,7 @@
                 <property name="mnemonic_widget">mtu_spin</property>
                 <layout>
                   <property name="column">0</property>
-                  <property name="row">3</property>
+                  <property name="row">4</property>
                 </layout>
               </object>
             </child>
@@ -101,7 +101,7 @@
                 <property name="mnemonic_widget">cloned_mac_combo</property>
                 <layout>
                   <property name="column">0</property>
-                  <property name="row">2</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -109,8 +109,8 @@
               <object class="GtkLabel" id="mtu_label">
                 <property name="label" translatable="yes">bytes</property>
                 <layout>
-                  <property name="column">2</property>
-                  <property name="row">3</property>
+                  <property name="column">1</property>
+                  <property name="row">4</property>
                 </layout>
               </object>
             </child>
@@ -118,8 +118,8 @@
               <object class="GtkSpinButton" id="mtu_spin">
                 <property name="adjustment">mtu_adjustment</property>
                 <layout>
-                  <property name="column">1</property>
-                  <property name="row">3</property>
+                  <property name="column">0</property>
+                  <property name="row">4</property>
                 </layout>
               </object>
             </child>
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index 31183b4..c988c26 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -10,13 +10,13 @@
           <object class="GtkViewport">
             <child>
               <object class="GtkGrid" id="main_box">
-                <property name="margin_start">24</property>
-                <property name="margin_end">24</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <property name="margin_top">24</property>
                 <property name="margin_bottom">24</property>
                 <property name="orientation">vertical</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">6</property>
+                <property name="row-spacing">2</property>
+                <property name="column-spacing">2</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="label" translatable="yes">IPv_4 Method</property>
@@ -38,8 +38,8 @@
                     <property name="action-name">ip4page.ip4method</property>
                     <property name="action-target">'automatic'</property>
                     <layout>
-                      <property name="row">0</property>
-                      <property name="column">1</property>
+                      <property name="row">1</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -49,8 +49,8 @@
                     <property name="action-name">ip4page.ip4method</property>
                     <property name="action-target">'local'</property>
                     <layout>
-                      <property name="row">0</property>
-                      <property name="column">2</property>
+                      <property name="row">2</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -60,8 +60,8 @@
                     <property name="action-name">ip4page.ip4method</property>
                     <property name="action-target">'manual'</property>
                     <layout>
-                      <property name="row">1</property>
-                      <property name="column">1</property>
+                      <property name="row">3</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -71,8 +71,8 @@
                     <property name="action-name">ip4page.ip4method</property>
                     <property name="action-target">'disabled'</property>
                     <layout>
-                      <property name="row">1</property>
-                      <property name="column">2</property>
+                      <property name="row">4</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -82,8 +82,8 @@
                     <property name="action-name">ip4page.ip4method</property>
                     <property name="action-target">'shared'</property>
                     <layout>
-                      <property name="row">2</property>
-                      <property name="column">1</property>
+                      <property name="row">5</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -92,9 +92,9 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <layout>
-                      <property name="row">3</property>
+                      <property name="row">6</property>
                       <property name="column">0</property>
-                      <property name="column-span">3</property>
+                      <property name="column-span">1</property>
                     </layout>
                     <child>
                       <object class="GtkBox" id="address_box">
@@ -112,7 +112,7 @@
                         </child>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkLabel" id="address_address_label">
                                 <property name="hexpand">True</property>
@@ -260,7 +260,7 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="orientation">horizontal</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkLabel" id="routes_address_label">
                                     <property name="hexpand">True</property>
@@ -357,19 +357,19 @@
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="routes_metric_sizegroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">vertical</property>
     <widgets>
       <widget name="routes_metric_label" />
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="routes_sizegroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">vertical</property>
     <widgets>
       <widget name="routes_stub_box" />
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="address_sizegroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">vertical</property>
     <widgets>
       <widget name="address_stub_box" />
     </widgets>
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index fc68016..f553bab 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -10,13 +10,13 @@
           <object class="GtkViewport">
             <child>
               <object class="GtkGrid" id="main_box">
-                <property name="margin_start">24</property>
-                <property name="margin_end">24</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <property name="margin_top">24</property>
                 <property name="margin_bottom">24</property>
                 <property name="orientation">vertical</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">6</property>
+                <property name="row-spacing">2</property>
+                <property name="column-spacing">2</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="label" translatable="yes">IPv_6 Method</property>
@@ -38,8 +38,8 @@
                     <property name="action-name">ip6page.ip6method</property>
                     <property name="action-target">'automatic'</property>
                     <layout>
-                      <property name="row">0</property>
-                      <property name="column">1</property>
+                      <property name="row">1</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -49,8 +49,8 @@
                     <property name="action-name">ip6page.ip6method</property>
                     <property name="action-target">'dhcp'</property>
                     <layout>
-                      <property name="row">0</property>
-                      <property name="column">2</property>
+                      <property name="row">2</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -60,8 +60,8 @@
                     <property name="action-name">ip6page.ip6method</property>
                     <property name="action-target">'local'</property>
                     <layout>
-                      <property name="row">1</property>
-                      <property name="column">1</property>
+                      <property name="row">3</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -71,8 +71,8 @@
                     <property name="action-name">ip6page.ip6method</property>
                     <property name="action-target">'manual'</property>
                     <layout>
-                      <property name="row">1</property>
-                      <property name="column">2</property>
+                      <property name="row">4</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -82,8 +82,8 @@
                     <property name="action-name">ip6page.ip6method</property>
                     <property name="action-target">'disabled'</property>
                     <layout>
-                      <property name="row">2</property>
-                      <property name="column">1</property>
+                      <property name="row">5</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -93,8 +93,8 @@
                     <property name="action-name">ip6page.ip6method</property>
                     <property name="action-target">'shared'</property>
                     <layout>
-                      <property name="row">2</property>
-                      <property name="column">2</property>
+                      <property name="row">6</property>
+                      <property name="column">0</property>
                     </layout>
                   </object>
                 </child>
@@ -103,9 +103,9 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <layout>
-                      <property name="row">3</property>
+                      <property name="row">7</property>
                       <property name="column">0</property>
-                      <property name="column-span">3</property>
+                      <property name="column-span">1</property>
                     </layout>
                     <child>
                       <object class="GtkBox" id="address_box">
@@ -123,7 +123,7 @@
                         </child>
                         <child>
                           <object class="GtkBox">
-                            <property name="orientation">horizontal</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkLabel" id="address_address_label">
                                 <property name="hexpand">True</property>
@@ -271,7 +271,7 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="orientation">horizontal</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkLabel" id="routes_address_label">
                                     <property name="hexpand">True</property>
@@ -368,19 +368,19 @@
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="routes_metric_sizegroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">vertical </property>
     <widgets>
       <widget name="routes_metric_label" />
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="routes_sizegroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">vertical </property>
     <widgets>
       <widget name="routes_stub_box" />
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="address_sizegroup">
-    <property name="mode">horizontal</property>
+    <property name="mode">vertical </property>
     <widgets>
       <widget name="address_stub_box" />
     </widgets>
diff --git a/panels/network/connection-editor/security-page.ui b/panels/network/connection-editor/security-page.ui
index affba83..ef8723a 100644
--- a/panels/network/connection-editor/security-page.ui
+++ b/panels/network/connection-editor/security-page.ui
@@ -8,14 +8,14 @@
         <property name="propagate-natural-width">True</property>
         <child>
           <object class="GtkGrid">
-            <property name="margin_start">50</property>
-            <property name="margin_end">50</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="row_spacing">10</property>
-            <property name="column_spacing">6</property>
+            <property name="column_spacing">2</property>
             <child>
               <object class="GtkLabel" id="security_label">
                 <property name="xalign">1</property>
diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
index d087e5e..8ce453b 100644
--- a/panels/network/connection-editor/vpn-page.ui
+++ b/panels/network/connection-editor/vpn-page.ui
@@ -8,12 +8,12 @@
         <property name="propagate-natural-width">True</property>
         <child>
           <object class="GtkBox" id="box">
-            <property name="margin_start">50</property>
-            <property name="margin_end">50</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">10</property>
+            <property name="spacing">2</property>
             <child>
               <object class="GtkBox">
                 <property name="spacing">6</property>
diff --git a/panels/network/connection-editor/wifi-page.ui b/panels/network/connection-editor/wifi-page.ui
index daf0ea6..eae877f 100644
--- a/panels/network/connection-editor/wifi-page.ui
+++ b/panels/network/connection-editor/wifi-page.ui
@@ -8,14 +8,14 @@
         <property name="propagate-natural-width">True</property>
         <child>
           <object class="GtkGrid">
-            <property name="margin_start">50</property>
-            <property name="margin_end">50</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="row_spacing">10</property>
-            <property name="column_spacing">6</property>
+            <property name="column_spacing">2</property>
             <child>
               <object class="GtkLabel">
                 <property name="xalign">1</property>