From 67e5e3763f31fdc906c8e9b3239b636bce3139ed Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 2 Apr 2013 13:28:50 +0100
Subject: various efforts to consistently apply HIG rules

Change-Id: I1056635b0bd6f1220a7cf7cc1182a37c7d104a9a
---
 cui/uiconfig/ui/cellalignment.ui | 123 ++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 73 deletions(-)

(limited to 'cui')

diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index 2b9f4fb085eb..631d8756ede4 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -34,8 +34,9 @@
               <object class="GtkGrid" id="grid10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">24</property>
                 <child>
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
@@ -115,6 +116,8 @@
                   <object class="svxlo-DialControl" id="dialcontrol">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
                     <property name="active">True</property>
                   </object>
                   <packing>
@@ -154,7 +157,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">25</property>
+                        <property name="margin_left">12</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0.5</property>
                         <property name="inconsistent">True</property>
@@ -214,6 +217,7 @@
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_bottom">1</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
@@ -260,7 +264,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="margin_left">25</property>
+                    <property name="margin_left">12</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="inconsistent">True</property>
@@ -273,6 +277,45 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkHBox" id="boxDirection">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="LabelTxtDir">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Te_xt direction</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">comboTextDirBox</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="svxlo-FrameDirectionListBox" id="comboTextDirBox">
+                        <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="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
               </object>
             </child>
           </object>
@@ -311,6 +354,7 @@
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="border_width">6</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
@@ -382,6 +426,7 @@
                   <object class="GtkComboBox" id="comboboxHorzAlign">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <property name="model">liststoreHorzAlign</property>
                   </object>
                   <packing>
@@ -395,6 +440,7 @@
                   <object class="GtkComboBox" id="comboboxVertAlign">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <property name="model">liststoreVertAlign</property>
                   </object>
                   <packing>
@@ -426,46 +472,6 @@
         <property name="height">1</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkHBox" id="boxDirection">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="LabelTxtDir">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Te_xt direction</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">comboTextDirBox</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="svxlo-FrameDirectionListBox" id="comboTextDirBox">
-            <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="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkBox" id="boxStrings">
         <property name="visible">True</property>
@@ -518,7 +524,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">4</property>
+        <property name="top_attach">3</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>
@@ -596,33 +602,4 @@
       </row>
     </data>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <property name="mode">both</property>
-    <property name="ignore_hidden">True</property>
-    <widgets>
-      <widget name="spinIndentFrom:0.00pt"/>
-      <widget name="labelHorzAlign"/>
-      <widget name="labelVertAlign"/>
-      <widget name="labelIndent"/>
-      <widget name="comboboxHorzAlign"/>
-      <widget name="comboboxVertAlign"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup2">
-    <property name="ignore_hidden">True</property>
-    <widgets>
-      <widget name="checkWrapTextAuto"/>
-      <widget name="checkShrinkFitCellSize"/>
-      <widget name="checkHyphActive"/>
-      <widget name="LabelTxtDir"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup3">
-    <widgets>
-      <widget name="orientation"/>
-      <widget name="properties"/>
-      <widget name="alignment"/>
-      <widget name="boxDirection"/>
-    </widgets>
-  </object>
 </interface>
-- 
cgit