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

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui  |    2 
 sc/uiconfig/scalc/ui/optimalrowheightdialog.ui |   70 ++++++++++++++++++++++---
 2 files changed, 64 insertions(+), 8 deletions(-)

New commits:
commit 595dd498adb2c1ab6ee0d1ebe831123a076120fc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 22 21:38:03 2013 +0000

    I apparently overwrote the optimal row height dialog with another
    
    Change-Id: Iccd4f2c8b628589c6a184cc561a1e6225c1a9441

diff --git a/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui b/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui
index 1765cf9..13661db 100644
--- a/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui
+++ b/sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkDialog" id="OptimalColWidthDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Optimal Column Height</property>
+    <property name="title" translatable="yes">Optimal Column Width</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui b/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui
index 0dee26e..6a4beeb 100644
--- a/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui
+++ b/sc/uiconfig/scalc/ui/optimalrowheightdialog.ui
@@ -31,6 +31,34 @@
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -40,17 +68,22 @@
           </packing>
         </child>
         <child>
-          <object class="GtkGrid" id="grid1">
+          <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="valign">start</property>
             <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="label" translatable="yes">No solution was found.</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Add</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">value:0.00cm</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -60,19 +93,40 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="error">
+              <object class="GtkSpinButton" id="value:0.00cm">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes">label</property>
+                <property name="invisible_char">•</property>
+                <property name="digits">2</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="default">
+                <property name="label" translatable="yes">_Default value</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -84,6 +138,8 @@
     </child>
     <action-widgets>
       <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
     </action-widgets>
   </object>
 </interface>