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

[Csikós Tamás]

 sc/source/ui/miscdlgs/mvtabdlg.cxx            |    5 +++++
 sc/uiconfig/scalc/ui/movecopysheet.ui         |    4 +++-
 starmath/uiconfig/smath/ui/alignmentdialog.ui |    1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9a44e90c2c5c19fb310298ed525c2b77f49c97b8
Author: Csikós Tamás <csks.tomi at gmail.com>
Date:   Thu Jul 25 17:56:47 2013 +0200

    minor updates
    
    alignmentdialog.ui - The default button's text was aligned to the right
    mvtabdlg.cc - the warning text doesn't occupy the space, when there is no warning
    movecopysheet.ui - top alignment set to 6, radiobuttons aligned horizontally
    
    Change-Id: I5c3fbc512292917a2f4297e164fce73c56a124f3
    Reviewed-on: https://gerrit.libreoffice.org/5110
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index c3f0153..2dff426 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -157,6 +157,7 @@ void ScMoveTableDlg::CheckNewTabName()
     if (aNewName.isEmpty())
     {
         // New sheet name is empty.  This is not good.
+        pFtWarn->Show(sal_True);
         pFtWarn->SetControlBackground(Color(COL_YELLOW));
         pFtWarn->SetText(msStrTabNameEmpty);
         pBtnOk->Disable();
@@ -166,6 +167,7 @@ void ScMoveTableDlg::CheckNewTabName()
     if (!ScDocument::ValidTabName(aNewName))
     {
         // New sheet name contains invalid characters.
+        pFtWarn->Show(sal_True);
         pFtWarn->SetControlBackground(Color(COL_YELLOW));
         pFtWarn->SetText(msStrTabNameInvalid);
         pBtnOk->Disable();
@@ -187,12 +189,14 @@ void ScMoveTableDlg::CheckNewTabName()
 
     if ( bFound )
     {
+        pFtWarn->Show(sal_True);
         pFtWarn->SetControlBackground(Color(COL_YELLOW));
         pFtWarn->SetText(msStrTabNameUsed);
         pBtnOk->Disable();
     }
     else
     {
+        pFtWarn->Hide(sal_True);
         pFtWarn->SetControlBackground();
         pFtWarn->SetText(OUString());
         pBtnOk->Enable();
@@ -221,6 +225,7 @@ void ScMoveTableDlg::Init()
     pBtnMove->Check( true );
     pBtnCopy->Check( false );
     pEdTabName->Enable(false);
+    pFtWarn->Hide(sal_True);
     InitDocListBox();
     SelHdl( pLbDoc );
 }
diff --git a/sc/uiconfig/scalc/ui/movecopysheet.ui b/sc/uiconfig/scalc/ui/movecopysheet.ui
index 28f0a8c..47b0bad 100644
--- a/sc/uiconfig/scalc/ui/movecopysheet.ui
+++ b/sc/uiconfig/scalc/ui/movecopysheet.ui
@@ -78,18 +78,19 @@
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkBox" id="box1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkRadioButton" id="move">
                         <property name="label" translatable="yes">_Move</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>
@@ -108,6 +109,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index 7368f21..e0b4fed 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -66,7 +66,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="image_position">right</property>
               </object>
               <packing>
                 <property name="expand">False</property>