[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig sw/uiconfig

[Caolán McNamara]

 cui/source/tabpages/transfrm.hrc      |    1 -
 cui/uiconfig/ui/possizetabpage.ui     |   20 ++++++++++++--------
 sw/uiconfig/swriter/ui/fldfuncpage.ui |    5 ++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 1e689e18701a21728dd2b02ea459a62fec5b561e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 19 11:04:36 2013 +0100

    tweak a bit
    
    Change-Id: Ic2ea51faf0fcec0a7d6fdc4a52e2e930e8461e20

diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc
index 36535ad..72feeb7 100644
--- a/cui/source/tabpages/transfrm.hrc
+++ b/cui/source/tabpages/transfrm.hrc
@@ -53,7 +53,6 @@
 #define FT_REFERENCE                37
 #define FT_POSPRESETS               38
 #define FT_ANGLEPRESETS             39
-#define LB_ORIENT                   40
 #define FT_SIZEREFERENCE            41
 #define CTL_SIZERECT                42
 #define FT_POSREFERENCE             43
diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui
index bf5fc3d..4482675 100644
--- a/cui/uiconfig/ui/possizetabpage.ui
+++ b/cui/uiconfig/ui/possizetabpage.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
+    <property name="spacing">12</property>
     <child>
       <object class="GtkFrame" id="FL_POSITION">
         <property name="visible">True</property>
@@ -124,6 +124,7 @@
                       <object class="svxlo-SvxRectCtl" id="CTL_POSRECT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">start</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -259,13 +260,10 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="width">1</property>
+                        <property name="width">2</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -298,6 +296,7 @@
                       <object class="svxlo-SvxRectCtl" id="CTL_SIZERECT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">start</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -514,9 +513,14 @@
       <widget name="FT_POS_Y"/>
       <widget name="FT_WIDTH"/>
       <widget name="FT_HEIGHT"/>
-      <widget name="CBX_SCALE"/>
-      <widget name="TSB_POSPROTECT"/>
-      <widget name="TSB_SIZEPROTECT"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+    <widgets>
+      <widget name="MTR_FLD_POS_X:0.00cm"/>
+      <widget name="MTR_FLD_POS_Y:0.00cm"/>
+      <widget name="MTR_FLD_WIDTH:0.00cm"/>
+      <widget name="MTR_FLD_HEIGHT:0.00cm"/>
     </widgets>
   </object>
 </interface>
commit 7ed90fdf548978d640a7ed26ffda99c10586aac9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 19 10:59:16 2013 +0100

    wrong mnemonic widget
    
    Change-Id: I539fb2599743ed2eda3b33895f73230cc2342055

diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 83d4277..e5f77b3 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -428,6 +428,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection5"/>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -507,7 +510,7 @@
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Na_me</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">name</property>
+                        <property name="mnemonic_widget">listname</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>