[connections/adjust-assistant-spacing] assistant: Adjust margin and spacing of UI elements

[Felipe Borges <felipeborges src gnome org>]

commit 9098336433a510ba7a26b8952c57dd9f875b332d
Author: Felipe Borges <felipeborges gnome org>
Date:   Thu Jul 29 13:51:59 2021 +0200

    assistant: Adjust margin and spacing of UI elements
    
    Fixes #62

 src/ui/assistant.ui | 166 +++++++++++++++++++++++++---------------------------
 1 file changed, 80 insertions(+), 86 deletions(-)
---
diff --git a/src/ui/assistant.ui b/src/ui/assistant.ui
index 4d53e5e..19d0a5d 100644
--- a/src/ui/assistant.ui
+++ b/src/ui/assistant.ui
@@ -2,113 +2,107 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
     <template class="ConnectionsAssistant" parent="GtkPopover">
-      <property name="border-width">20</property>
+      <property name="border-width">10</property>
 
       <child>
-        <object class="GtkGrid">
+        <object class="GtkBox">
           <property name="visible">True</property>
-          <property name="row-spacing">10</property>
-          <property name="column-spacing">5</property>
+          <property name="orientation">vertical</property>
 
           <child>
-            <object class="GtkLabel">
+            <object class="GtkBox">
               <property name="visible">True</property>
-              <property name="halign">start</property>
-              <property name="xalign">0</property>
-              <property name="wrap">True</property>
-              <property name="max-width-chars">40</property>
-              <property name="label" translatable="yes">Enter the network identifier of the remote desktop 
to connect to:</property>
-            </object>
-            <packing>
-              <property name="top-attach">0</property>
-              <property name="left-attach">0</property>
-              <property name="width">2</property>
-            </packing>
-          </child>
+              <property name="orientation">vertical</property>
+              <property name="margin">10</property>
+              <property name="spacing">5</property>
 
-          <child>
-            <object class="GtkEntry" id="url_entry">
-              <property name="visible">True</property>
-              <property name="hexpand">True</property>
-              <property name="completion">url_completion</property>
-              <signal name="changed" handler="on_url_entry_changed"/>
-              <signal name="activate" handler="on_url_entry_activated"/>
-            </object>
-            <packing>
-              <property name="top-attach">1</property>
-              <property name="left-attach">0</property>
-              <property name="width">2</property>
-            </packing>
-          </child>
+              <child>
+                <object class="GtkLabel">
+                  <property name="visible">True</property>
+                  <property name="halign">start</property>
+                  <property name="xalign">0</property>
+                  <property name="wrap">True</property>
+                  <property name="max-width-chars">40</property>
+                  <property name="label" translatable="yes">Enter the network identifier of the remote 
desktop to connect to:</property>
+                </object>
+              </child>
 
-          <child>
-            <object class="GtkLabel">
-              <property name="visible">True</property>
-              <property name="halign">start</property>
-              <property name="label" translatable="yes">Connection Type</property>
-              <attributes>
-                <attribute name="weight" value="bold"/>
-              </attributes>
+              <child>
+                <object class="GtkEntry" id="url_entry">
+                  <property name="visible">True</property>
+                  <property name="hexpand">True</property>
+                  <property name="completion">url_completion</property>
+                  <signal name="changed" handler="on_url_entry_changed"/>
+                  <signal name="activate" handler="on_url_entry_activated"/>
+                </object>
+              </child>
             </object>
-            <packing>
-              <property name="top-attach">2</property>
-              <property name="left-attach">0</property>
-            </packing>
           </child>
 
           <child>
-            <object class="GtkRadioButton" id="rdp_radio_button">
+            <object class="GtkBox">
               <property name="visible">True</property>
-              <property name="label" translatable="yes">RDP (standard for connecting to Windows)</property>
-            </object>
-            <packing>
-              <property name="top-attach">3</property>
-              <property name="left-attach">0</property>
-              <property name="width">2</property>
-            </packing>
-          </child>
+              <property name="orientation">vertical</property>
+              <property name="margin">10</property>
+              <property name="spacing">5</property>
 
-          <child>
-            <object class="GtkRadioButton" id="vnc_radio_button">
-              <property name="visible">True</property>
-              <property name="group">rdp_radio_button</property>
-              <property name="label" translatable="yes">VNC (standard for connecting to Linux)</property>
-            </object>
-            <packing>
-              <property name="top-attach">4</property>
-              <property name="left-attach">0</property>
-              <property name="width">2</property>
-            </packing>
-          </child>
+              <child>
+                <object class="GtkLabel">
+                  <property name="visible">True</property>
+                  <property name="halign">start</property>
+                  <property name="label" translatable="yes">Connection Type</property>
+                  <attributes>
+                    <attribute name="weight" value="bold"/>
+                  </attributes>
+                </object>
+              </child>
 
-          <child>
-            <object class="GtkButton" id="help_button">
-              <property name="visible">True</property>
-              <property name="halign">start</property>
-              <property name="label" translatable="yes">Help</property>
-              <signal name="clicked" handler="on_help_button_clicked"/>
+              <child>
+                <object class="GtkRadioButton" id="rdp_radio_button">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">RDP (standard for connecting to 
Windows)</property>
+                </object>
+              </child>
+
+              <child>
+                <object class="GtkRadioButton" id="vnc_radio_button">
+                  <property name="visible">True</property>
+                  <property name="group">rdp_radio_button</property>
+                  <property name="label" translatable="yes">VNC (standard for connecting to Linux)</property>
+                </object>
+              </child>
             </object>
-            <packing>
-              <property name="top-attach">5</property>
-              <property name="left-attach">0</property>
-            </packing>
           </child>
 
           <child>
-            <object class="GtkButton" id="create_button">
+            <object class="GtkBox">
               <property name="visible">True</property>
-              <property name="sensitive">False</property>
-              <property name="halign">end</property>
-              <property name="label" translatable="yes">Connect</property>
-              <signal name="clicked" handler="on_create_connection_button_clicked"/>
-              <style>
-                <class name="suggested-action"/>
-              </style>
+              <property name="margin">10</property>
+              <property name="spacing">5</property>
+
+              <child>
+                <object class="GtkButton" id="help_button">
+                  <property name="visible">True</property>
+                  <property name="hexpand">True</property>
+                  <property name="halign">start</property>
+                  <property name="label" translatable="yes">Help</property>
+                  <signal name="clicked" handler="on_help_button_clicked"/>
+                </object>
+              </child>
+
+              <child>
+                <object class="GtkButton" id="create_button">
+                  <property name="visible">True</property>
+                  <property name="sensitive">False</property>
+                  <property name="halign">end</property>
+                  <property name="label" translatable="yes">Connect</property>
+                  <signal name="clicked" handler="on_create_connection_button_clicked"/>
+                  <style>
+                    <class name="suggested-action"/>
+                  </style>
+                </object>
+              </child>
             </object>
-            <packing>
-              <property name="top-attach">5</property>
-              <property name="left-attach">1</property>
-            </packing>
           </child>
         </object>
       </child>