[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sc/uiconfig sw/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |    9 ++++++---
 sw/uiconfig/swriter/ui/opttablepage.ui       |   13 +++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit ca070a758cd29315b4e9f91a298c90d2f57936a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 8 18:52:24 2014 +0000

    allow long labels to line break
    
    writer table options page (e.g. de)
    
    Change-Id: Ib8f3daad397fc4b8d37979f5c6d1e12b8884677d
    (cherry picked from commit 5b29623e0ad6231dd933bd2b2a0017f89436c9d8)

diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui
index 48a7f3c..4003ffa 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan  8 18:48:05 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment">
@@ -337,8 +338,12 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Changes affect the adjacent area only</property>
+                        <property name="wrap">True</property>
+                        <property name="wrap_mode">char</property>
+                        <property name="max_width_chars">50</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -351,8 +356,11 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Changes affect the entire table</property>
+                        <property name="wrap">True</property>
+                        <property name="max_width_chars">50</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -365,8 +373,11 @@
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Changes affect the table size</property>
+                        <property name="wrap">True</property>
+                        <property name="max_width_chars">50</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -501,7 +512,6 @@
                             <property name="can_focus">True</property>
                             <property name="halign">start</property>
                             <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="adjustment">adjustment</property>
                             <property name="digits">2</property>
                           </object>
@@ -518,7 +528,6 @@
                             <property name="can_focus">True</property>
                             <property name="halign">start</property>
                             <property name="invisible_char">●</property>
-                            <property name="invisible_char_set">True</property>
                             <property name="adjustment">adjustment</property>
                             <property name="digits">2</property>
                           </object>
commit c8204020835de157aaef60e217275612dab8b633
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 8 18:43:35 2014 +0000

    stretch label to fill vertically for long text
    
    calc compatibility page (e.g. de)
    
    Change-Id: Ieab742900747808a4c27205b190e416b391b7a39
    (cherry picked from commit 3466f403470c192d24b9d7859b8a6a6ae5c94a2b)

diff --git a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
index c71e37a..bc01915 100644
--- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
+++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan  8 18:42:59 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="OptCompatibilityPage">
@@ -12,6 +13,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
@@ -19,6 +21,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
@@ -26,6 +29,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
@@ -33,6 +37,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
                     <property name="label" translatable="yes">Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings.</property>
@@ -52,9 +57,7 @@
                   <object class="GtkComboBoxText" id="keybindings">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="valign">center</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
+                    <property name="valign">start</property>
                     <items>
                       <item translatable="yes">Default</item>
                       <item translatable="yes">OpenOffice.org legacy</item>