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

[Jan Holesovsky]

 cui/source/options/optaboutconfig.cxx     |    2 +-
 cui/uiconfig/ui/aboutconfigvaluedialog.ui |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 0096575d2269e1d5931e18c10d26ab00bcabf495
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Dec 12 10:32:13 2013 +0100

    About config: Make the value box dialog a bit nicer.
    
    Change-Id: I5e25401b76458e712070bc76c86083bbd9ae2daa

diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 56b945a..08cfbc5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -121,7 +121,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent )
 
 Size CuiCustomMultilineEdit::GetOptimalSize() const
 {
-    return LogicToPixel(Size(150,30),MAP_APPFONT);
+    return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
 }
 
 Size CuiAboutConfigTabPage::GetOptimalSize() const
diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
index 8c359d7..8995bd5 100644
--- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
+++ b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="AboutConfigValueDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -9,12 +10,12 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="layout_style">start</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
@@ -72,6 +73,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
@@ -79,7 +81,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Value</property>
+                <property name="label" translatable="yes">Value:</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -91,7 +93,7 @@
               <object class="cuilo-CuiCustomMultilineEdit" id="valuebox">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">True</property>
                 <property name="wrap_mode">char</property>
               </object>
               <packing>