[gnome-boxes] wizard: Instruction & trademark labels on 1st page only

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 8fe48693afc6cd25ff1457c64a712f375c5adc3c
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sat Feb 14 17:33:49 2015 +0000

    wizard: Instruction & trademark labels on 1st page only
    
    These (especially trademark one) don't fit on the 'Enter URL' page so
    lets make sure they only appear on main page.

 data/ui/wizard-source.ui |   39 +++++++++++++++++++++++++++++++++++++--
 data/ui/wizard.ui        |   34 ----------------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)
---
diff --git a/data/ui/wizard-source.ui b/data/ui/wizard-source.ui
index 920ab83..751a216 100644
--- a/data/ui/wizard-source.ui
+++ b/data/ui/wizard-source.ui
@@ -14,12 +14,30 @@
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">0</property>
-        <property name="margin-top">15</property>
-        <property name="margin-bottom">15</property>
+        <property name="margin-top">30</property>
+        <property name="margin-bottom">30</property>
         <style>
           <class name="boxes-source-nb"/>
           <class name="boxes-menu"/>
         </style>
+
+        <child>
+          <object class="GtkLabel" id="instruction_label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Insert operating system installation media or select a 
source below</property>
+            <property name="wrap">True</property>
+            <property name="halign">start</property>
+            <property name="margin-bottom">20</property>
+            <style>
+              <class name="boxes-wizard-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+
         <child>
           <object class="BoxesWizardScrolled" id="media_scrolled"/>
         </child>
@@ -148,6 +166,23 @@
             </child>
           </object>
         </child>
+
+        <child>
+          <object class="GtkLabel" id="trademark_label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Any trademarks shown above are used merely for 
identification of software products you have already obtained and are the property of their respective 
owners.</property>
+            <property name="wrap">True</property>
+            <property name="max-width-chars">50</property>
+            <property name="margin-top">20</property>
+            <style>
+              <class name="boxes-logo-notice-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
       </object>
 
       <packing>
diff --git a/data/ui/wizard.ui b/data/ui/wizard.ui
index 9c97276..03ef2e3 100644
--- a/data/ui/wizard.ui
+++ b/data/ui/wizard.ui
@@ -23,27 +23,9 @@
             <property name="spacing">5</property>
             <property name="margin-start">10</property>
             <property name="margin-end">10</property>
-            <property name="margin-top">24</property>
-            <property name="margin-bottom">24</property>
             <property name="valign">center</property>
 
             <child>
-              <object class="GtkLabel" id="instruction_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Insert operating system installation media or 
select a source below</property>
-                <property name="wrap">True</property>
-                <property name="halign">start</property>
-                <style>
-                  <class name="boxes-wizard-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-
-            <child>
               <object class="BoxesWizardSource" id="wizard_source">
                 <property name="visible">True</property>
               </object>
@@ -52,22 +34,6 @@
                 <property name="fill">False</property>
               </packing>
             </child>
-
-            <child>
-              <object class="GtkLabel" id="trademark_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Any trademarks shown above are used merely for 
identification of software products you have already obtained and are the property of their respective 
owners.</property>
-                <property name="wrap">True</property>
-                <property name="max-width-chars">50</property>
-                <style>
-                  <class name="boxes-logo-notice-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
           </object>
 
           <packing>