[med-svn] [aghermann] 08/31: space between widgets on main SF window

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit 2040ed32422e61da4f8ae802a6087dd2ede0ba60
Author: Andrei Zavada <hmmr at ra>
Date:   Sat Nov 9 13:35:33 2013 +0200

    space between widgets on main SF window
---
 upstream/data/sf.glade |   60 +++++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/upstream/data/sf.glade b/upstream/data/sf.glade
index 1232dd8..5ceadca 100644
--- a/upstream/data/sf.glade
+++ b/upstream/data/sf.glade
@@ -839,14 +839,14 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkMenuBar" id="iiSFMontag">
+                  <object class="GtkMenuBar" id="iiSFMontage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="iSFMontageMenu">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Montage</property>
+                        <property name="label" translatable="yes">_M</property>
                         <property name="use_underline">True</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="menu7">
@@ -1032,13 +1032,11 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
+                <property name="row_spacing">3</property>
                 <child>
                   <object class="GtkButton" id="bSFBack">
                     <property name="label" translatable="yes">◀</property>
@@ -1065,7 +1063,7 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Page</property>
+                    <property name="label" translatable="yes">_P </property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">eSFCurrentPage</property>
                   </object>
@@ -1102,7 +1100,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="lSFTotalPages">
-                    <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
@@ -1145,7 +1142,7 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Page size:</property>
+                        <property name="label" translatable="yes">@:</property>
                         <attributes>
                           <attribute name="scale" value="0.80000000000000004"/>
                         </attributes>
@@ -1197,7 +1194,8 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="padding">3</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -1209,8 +1207,8 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="padding">4</property>
-                <property name="position">4</property>
+                <property name="padding">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
@@ -1299,6 +1297,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="padding">3</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -1474,18 +1473,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSeparator" id="separator6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">9</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkTable" id="cSFSleepStageStats">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -1618,6 +1605,19 @@
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkSeparator" id="separator6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="padding">3</property>
+                        <property name="position">9</property>
+                      </packing>
+                    </child>
+                    <child>
                       <object class="GtkSeparator" id="separator4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -2314,6 +2314,7 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="padding">3</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -2372,19 +2373,6 @@ skew:	𝑔(𝑢) = 𝑢2</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="padding">3</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git