wizard: use spacing in VBox'es to separate elements, not ypad!=0 in the elements

...because labels (a typical element of VBox) with ypad!=0
can't have text properly wrapped by Gtk.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 22 insertions, 34 deletions

diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade
index 301bca68..7a0f3d0b 100644
--- a/src/gui-wizard-gtk/wizard.glade
+++ b/src/gui-wizard-gtk/wizard.glade
@@ -34,9 +34,8 @@
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="ypad">0</property>
-            <property name="wrap">True</property>
             <property name="label" translatable="yes">On the following screens, you will be asked to describe how the problem occurred, to choose how to analyze the problem (if needed), to review collected data, and to choose where the problem should be reported. Click 'Forward' to proceed.</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -51,8 +50,8 @@
             <child>
               <object class="GtkScrolledWindow" id="container_details1">
                 <property name="visible">True</property>
-                <property name="shadow_type">GTK_SHADOW_OUT</property>
                 <property name="can_focus">True</property>
+                <property name="shadow_type">GTK_SHADOW_OUT</property>
                 <child>
                   <object class="GtkTreeView" id="tv_details">
                     <property name="visible">True</property>
@@ -85,41 +84,27 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="ypad">5</property>
-            <property name="label" translatable="yes">How did this problem happen (step-by-step)? How can it be reproduced?</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="ypad">5</property>
-            <property name="label" translatable="yes">Any additional comments useful for diagnosing the problem?</property>
+            <property name="label" translatable="yes">How did this problem happen (step-by-step)? How can it be reproduced? Any additional comments useful for diagnosing the problem?</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow4">
             <property name="visible">True</property>
-            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <property name="can_focus">True</property>
+            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <child>
               <object class="GtkTextView" id="tv_comment">
                 <property name="visible">True</property>
@@ -131,7 +116,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -140,14 +125,14 @@
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="ypad">5</property>
             <property name="label" translatable="yes">&lt;b&gt;Your comments are not private.&lt;/b&gt; They may be included into publicly visible problem reports.</property>
             <property name="use_markup">True</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -160,6 +145,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="lbl_page5">
             <property name="visible">True</property>
@@ -199,8 +185,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
-                <property name="image_position">right</property>
                 <property name="use_underline">True</property>
+                <property name="image_position">right</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -239,12 +225,12 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="lbl_analyze_log">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="ypad">5</property>
             <property name="label" translatable="yes">Analyzing did not start yet</property>
             <property name="use_markup">True</property>
             <property name="wrap">True</property>
@@ -258,8 +244,8 @@
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
-            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <property name="can_focus">True</property>
+            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <child>
               <object class="GtkTextView" id="tv_analyze_log">
                 <property name="visible">True</property>
@@ -285,6 +271,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="lbl_page3">
             <property name="visible">True</property>
@@ -326,8 +313,8 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
-                <property name="image_position">right</property>
                 <property name="use_underline">True</property>
+                <property name="image_position">right</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -367,13 +354,13 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="lbl_page4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="ypad">0</property>
             <property name="label" translatable="yes">Backtrace provides developers with details of the crash, helping them track down the source of the problem. Please review it and remove any sensitive data you would rather not share:</property>
             <property name="wrap">True</property>
           </object>
@@ -386,8 +373,8 @@
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow2">
             <property name="visible">True</property>
-            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <property name="can_focus">True</property>
+            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <child>
               <object class="GtkTextView" id="tv_backtrace">
                 <property name="visible">True</property>
@@ -565,6 +552,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="lbl_page6">
             <property name="visible">True</property>
@@ -655,8 +643,8 @@
         <child>
           <object class="GtkScrolledWindow" id="container_details2">
             <property name="visible">True</property>
-            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <property name="can_focus">True</property>
+            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <child>
               <placeholder/>
             </child>
@@ -677,12 +665,12 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
+        <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="lbl_report_log">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="ypad">5</property>
             <property name="label" translatable="yes">Reporting did not start yet</property>
             <property name="use_markup">True</property>
             <property name="wrap">True</property>
@@ -696,8 +684,8 @@
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow6">
             <property name="visible">True</property>
-            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <property name="can_focus">True</property>
+            <property name="shadow_type">GTK_SHADOW_OUT</property>
             <child>
               <object class="GtkTextView" id="tv_report_log">
                 <property name="visible">True</property>