[gnome-boxes/wip/rishi/rhel: 3/18] wizard-source: Move the file selection button next to the heading



commit 464106075215cceb5bb5bb20ee67ebb4f5d6235f
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Sep 7 14:35:55 2017 +0200

    wizard-source: Move the file selection button next to the heading
    
    This reduces the vertical height of the window to approximately what
    it was before the previous patch.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=786679

 data/ui/wizard-source.ui |  100 +++++++++++++++++++++++++---------------------
 1 files changed, 54 insertions(+), 46 deletions(-)
---
diff --git a/data/ui/wizard-source.ui b/data/ui/wizard-source.ui
index 6a0f0ae..ce7d3c7 100644
--- a/data/ui/wizard-source.ui
+++ b/data/ui/wizard-source.ui
@@ -35,59 +35,63 @@
         </child>
 
         <child>
-          <object class="GtkLabel" id="downloaded_label">
+          <object class="GtkBox" id="downloaded_and_select_file_hbox">
             <property name="visible">True</property>
-            <property name="halign">start</property>
             <property name="margin-bottom">20</property>
-            <property name="use-markup">True</property>
-            <property name="label" translatable="yes">Downloaded</property>
-            <attributes>
-              <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-            </attributes>
-          </object>
-        </child>
-
-        <child>
-          <object class="BoxesWizardScrolled" id="media_scrolled"/>
-        </child>
-
-        <child>
-          <object class="GtkButton" id="select_file_button">
-            <property name="visible">True</property>
-            <signal name="clicked" handler="on_select_file_button_clicked"/>
-            <style>
-              <class name="boxes-menu-row"/>
-            </style>
+            <property name="spacing">50</property>
+            <property name="orientation">horizontal</property>
             <child>
-              <object class="GtkBox" id="select_file_box">
+              <object class="GtkLabel" id="downloaded_label">
                 <property name="visible">True</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
-                <property name="margin-start">20</property>
-                <property name="margin-end">20</property>
-                <property name="spacing">20</property>
-                <property name="orientation">horizontal</property>
-                <child>
-                  <object class="GtkLabel" id="select_file_label">
-                    <property name="visible">True</property>
-                    <property name="halign">start</property>
-                    <property name="use-underline">True</property>
-                    <property name="label" translatable="yes">_Select a file</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
+                <property name="halign">start</property>
+                <property name="hexpand">True</property>
+                <property name="use-markup">True</property>
+                <property name="vexpand">False</property>
+                <property name="label" translatable="yes">Downloaded</property>
+                <attributes>
+                  <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="select_file_button">
+                <property name="visible">True</property>
+                <property name="vexpand">False</property>
+                <signal name="clicked" handler="on_select_file_button_clicked"/>
                 <child>
-                  <object class="GtkLabel" id="select_file_next_label">
+                  <object class="GtkBox" id="select_file_box">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">▶</property>
+                    <property name="margin-start">10</property>
+                    <property name="margin-end">10</property>
+                    <property name="spacing">50</property>
+                    <property name="orientation">horizontal</property>
+                    <child>
+                      <object class="GtkLabel" id="select_file_label">
+                        <property name="visible">True</property>
+                        <property name="halign">start</property>
+                        <property name="use-underline">True</property>
+                        <property name="label" translatable="yes">_Select a file</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="select_file_next_label">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">▶</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
                 </child>
               </object>
             </child>
@@ -95,6 +99,10 @@
         </child>
 
         <child>
+          <object class="BoxesWizardScrolled" id="media_scrolled"/>
+        </child>
+
+        <child>
           <object class="GtkLabel" id="available_to_download_label">
             <property name="visible">True</property>
             <property name="halign">start</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]