[Libreoffice-commits] core.git: cui/uiconfig sc/uiconfig

Caolán McNamara caolanm at redhat.com
Thu Jul 25 02:26:47 PDT 2013


 cui/uiconfig/ui/colorpage.ui             |    1 +
 cui/uiconfig/ui/optemailpage.ui          |    1 +
 cui/uiconfig/ui/optlanguagespage.ui      |    1 +
 cui/uiconfig/ui/optproxypage.ui          |    7 +++++++
 cui/uiconfig/ui/optuserpage.ui           |   26 ++++++++++++++++++++++++++
 sc/uiconfig/scalc/ui/optcalculatepage.ui |    1 +
 sc/uiconfig/scalc/ui/optdefaultpage.ui   |    1 +
 sc/uiconfig/scalc/ui/optformula.ui       |   17 ++++++++++-------
 sc/uiconfig/scalc/ui/optsortlists.ui     |    1 +
 9 files changed, 49 insertions(+), 7 deletions(-)

New commits:
commit 08fd81112fdf418cbefe7284bd22822401a7a110
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 25 10:26:08 2013 +0100

    vertically align textboxes to center, which looks much better on MacOSX
    
    Change-Id: I44fc514fcd93a23ebe3444c4f64f2ee4060ee000

diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 6c58d05..0630cb8 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -85,6 +85,7 @@
                       <object class="GtkEntry" id="name">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="valign">center</property>
                         <property name="invisible_char">•</property>
                         <property name="width_chars">22</property>
                       </object>
diff --git a/cui/uiconfig/ui/optemailpage.ui b/cui/uiconfig/ui/optemailpage.ui
index 2fda2ba..2a21ddc 100644
--- a/cui/uiconfig/ui/optemailpage.ui
+++ b/cui/uiconfig/ui/optemailpage.ui
@@ -39,6 +39,7 @@
               <object class="GtkEntry" id="url">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">32</property>
diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui
index 1c20f62..5b899b6 100644
--- a/cui/uiconfig/ui/optlanguagespage.ui
+++ b/cui/uiconfig/ui/optlanguagespage.ui
@@ -154,6 +154,7 @@
                   <object class="GtkEntry" id="datepatterns">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">●</property>
                   </object>
                   <packing>
diff --git a/cui/uiconfig/ui/optproxypage.ui b/cui/uiconfig/ui/optproxypage.ui
index d823a1c..55554f1 100644
--- a/cui/uiconfig/ui/optproxypage.ui
+++ b/cui/uiconfig/ui/optproxypage.ui
@@ -43,6 +43,7 @@
               <object class="cuilo-SvxNoSpaceEdit" id="http">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -56,6 +57,7 @@
               <object class="cuilo-SvxNoSpaceEdit" id="https">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -69,6 +71,7 @@
               <object class="cuilo-SvxNoSpaceEdit" id="ftp">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -82,6 +85,7 @@
               <object class="GtkEntry" id="noproxy">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">●</property>
               </object>
@@ -96,6 +100,7 @@
               <object class="cuilo-SvxNoSpaceEdit" id="httpport">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="max_length">5</property>
                 <property name="width_chars">5</property>
                 <property name="only_numeric">True</property>
@@ -111,6 +116,7 @@
               <object class="cuilo-SvxNoSpaceEdit" id="httpsport">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="max_length">5</property>
                 <property name="width_chars">5</property>
                 <property name="only_numeric">True</property>
@@ -126,6 +132,7 @@
               <object class="cuilo-SvxNoSpaceEdit" id="ftpport">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="max_length">5</property>
                 <property name="width_chars">5</property>
                 <property name="only_numeric">True</property>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index b544059..dcdb382 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -161,6 +161,7 @@
                   <object class="GtkEntry" id="firstname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -180,6 +181,7 @@
                   <object class="GtkEntry" id="lastname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -199,6 +201,7 @@
                   <object class="GtkEntry" id="shortname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">7</property>
                     <child internal-child="accessible">
@@ -231,6 +234,7 @@
                   <object class="GtkEntry" id="city">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -250,6 +254,7 @@
                   <object class="GtkEntry" id="state">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -269,6 +274,7 @@
                   <object class="GtkEntry" id="zip">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">15</property>
                     <child internal-child="accessible">
@@ -302,6 +308,7 @@
                   <object class="GtkEntry" id="title">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -321,6 +328,7 @@
                   <object class="GtkEntry" id="position">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -353,6 +361,7 @@
                   <object class="GtkEntry" id="home">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -372,6 +381,7 @@
                   <object class="GtkEntry" id="work">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -405,6 +415,7 @@
                   <object class="GtkEntry" id="fax">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -424,6 +435,7 @@
                   <object class="GtkEntry" id="email">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <child internal-child="accessible">
@@ -488,6 +500,7 @@
                   <object class="GtkEntry" id="ruslastname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -508,6 +521,7 @@
                   <object class="GtkEntry" id="rusfathersname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -528,6 +542,7 @@
                   <object class="GtkEntry" id="russhortname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">7</property>
                     <property name="invisible_char_set">True</property>
@@ -548,6 +563,7 @@
                   <object class="GtkEntry" id="rusfirstname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -597,6 +613,7 @@
                   <object class="GtkEntry" id="eastlastname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -617,6 +634,7 @@
                   <object class="GtkEntry" id="eastfirstname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -637,6 +655,7 @@
                   <object class="GtkEntry" id="eastshortname">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">7</property>
                     <property name="invisible_char_set">True</property>
@@ -686,6 +705,7 @@
                   <object class="GtkEntry" id="russtreet">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -706,6 +726,7 @@
                   <object class="GtkEntry" id="apartnum">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">15</property>
                     <property name="invisible_char_set">True</property>
@@ -755,6 +776,7 @@
                   <object class="GtkEntry" id="icity">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -775,6 +797,7 @@
                   <object class="GtkEntry" id="izip">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">•</property>
                     <property name="width_chars">15</property>
                     <property name="invisible_char_set">True</property>
@@ -808,6 +831,7 @@
                   <object class="GtkEntry" id="street">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -836,6 +860,7 @@
                   <object class="GtkEntry" id="country">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -864,6 +889,7 @@
                   <object class="GtkEntry" id="company">
                     <property name="can_focus">True</property>
                     <property name="no_show_all">True</property>
+                    <property name="valign">center</property>
                     <property name="hexpand">True</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
diff --git a/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui
index 322cd95..668fe9a 100644
--- a/sc/uiconfig/scalc/ui/optcalculatepage.ui
+++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui
@@ -296,6 +296,7 @@
                   <object class="scuilo-ScDoubleField" id="minchange">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">●</property>
                     <property name="width_chars">12</property>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/optdefaultpage.ui b/sc/uiconfig/scalc/ui/optdefaultpage.ui
index 3441605..3b26553 100644
--- a/sc/uiconfig/scalc/ui/optdefaultpage.ui
+++ b/sc/uiconfig/scalc/ui/optdefaultpage.ui
@@ -67,6 +67,7 @@
                   <object class="GtkEntry" id="sheetprefix">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="valign">center</property>
                     <property name="invisible_char">●</property>
                   </object>
                   <packing>
diff --git a/sc/uiconfig/scalc/ui/optformula.ui b/sc/uiconfig/scalc/ui/optformula.ui
index f7b0652..b77d2da 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">32000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkBox" id="OptFormula">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -285,6 +292,7 @@
                               <object class="GtkEntry" id="function">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="valign">center</property>
                                 <property name="invisible_char">●</property>
                                 <property name="invisible_char_set">True</property>
                               </object>
@@ -299,6 +307,7 @@
                               <object class="GtkEntry" id="arraycolumn">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="valign">center</property>
                                 <property name="invisible_char">●</property>
                                 <property name="invisible_char_set">True</property>
                               </object>
@@ -313,6 +322,7 @@
                               <object class="GtkEntry" id="arrayrow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="valign">center</property>
                                 <property name="invisible_char">●</property>
                                 <property name="invisible_char_set">True</property>
                               </object>
@@ -490,11 +500,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">1</property>
-    <property name="upper">32000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>
diff --git a/sc/uiconfig/scalc/ui/optsortlists.ui b/sc/uiconfig/scalc/ui/optsortlists.ui
index 752bbb0..25e4fb9 100644
--- a/sc/uiconfig/scalc/ui/optsortlists.ui
+++ b/sc/uiconfig/scalc/ui/optsortlists.ui
@@ -53,6 +53,7 @@
               <object class="GtkEntry" id="copyfrom">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">●</property>
               </object>


More information about the Libreoffice-commits mailing list