always 'show' error label, but leave it blank for no error

restore title to dialog, move error strings etc. inside .ui
and use multiples of 6 pixel spacing

Change-Id: Iae39238315cced956e2b6fbbae47bf79f4653920

4 files changed, 134 insertions, 66 deletions

diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 944c8ce17a0c..8bb48167718b 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -64,13 +64,6 @@
 #define FL_SEP1         51
 #define FL_SEP2         52
 
-// Insert/Delete/Move/Copy Sheet
-#define STR_NEWDOC      6
-#define STR_CURRENTDOC  14
-#define STR_TABNAME_WARN_USED    15
-#define STR_TABNAME_WARN_EMPTY   16
-#define STR_TABNAME_WARN_INVALID 17
-
 // String input
 #define ED_INPUT        10
 
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 4b5fa6494d27..1a0c26b10e1e 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -60,9 +60,12 @@ private:
     FixedText*       pFtWarn;
     OKButton*        pBtnOk;
 
-    OUString   maStrTabNameUsed;
-    OUString   maStrTabNameEmpty;
-    OUString   maStrTabNameInvalid;
+    OUString   msCurrentDoc;
+    OUString   msNewDoc;
+
+    OUString   msStrTabNameUsed;
+    OUString   msStrTabNameEmpty;
+    OUString   msStrTabNameInvalid;
 
     const OUString maDefaultName;
 
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index d7a032cc3edb..c3f0153c91e0 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -39,11 +39,6 @@
 ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault)
 
     :   ModalDialog ( pParent, "MoveCopySheetDialog", "modules/scalc/ui/movecopysheet.ui" ),
-        //
-        maStrTabNameUsed( SC_RESSTR(STR_TABNAME_WARN_USED) ),
-        maStrTabNameEmpty( SC_RESSTR(STR_TABNAME_WARN_EMPTY) ),
-        maStrTabNameInvalid( SC_RESSTR(STR_TABNAME_WARN_INVALID) ),
-        //
         maDefaultName( rDefault ),
         mnCurrentDocPos( 0 ),
         nDocument   ( 0 ),
@@ -55,11 +50,23 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault)
     get(pBtnMove, "move");
     get(pBtnCopy, "copy");
     get(pLbDoc, "toDocument");
+
+    assert(pLbDoc->GetEntryCount() == 2);
+    msCurrentDoc = pLbDoc->GetEntry(0);
+    msNewDoc = pLbDoc->GetEntry(1);
+    pLbDoc->Clear();
+    assert(pLbDoc->GetEntryCount() == 0);
+
     get(pLbTable, "insertBefore");
+    pLbTable->set_height_request(pLbTable->GetTextHeight() * 8);
     get(pEdTabName, "newName");
     get(pFtWarn, "newNameWarn");
     get(pBtnOk, "ok");
 
+    msStrTabNameUsed = get<FixedText>("warnunused")->GetText();
+    msStrTabNameEmpty = get<FixedText>("warnempty")->GetText();
+    msStrTabNameInvalid = get<FixedText>("warninvalid")->GetText();
+
     Init();
 }
 
@@ -150,8 +157,8 @@ void ScMoveTableDlg::CheckNewTabName()
     if (aNewName.isEmpty())
     {
         // New sheet name is empty.  This is not good.
-        pFtWarn->SetText(maStrTabNameEmpty);
-        pFtWarn->Show();
+        pFtWarn->SetControlBackground(Color(COL_YELLOW));
+        pFtWarn->SetText(msStrTabNameEmpty);
         pBtnOk->Disable();
         return;
     }
@@ -159,8 +166,8 @@ void ScMoveTableDlg::CheckNewTabName()
     if (!ScDocument::ValidTabName(aNewName))
     {
         // New sheet name contains invalid characters.
-        pFtWarn->SetText(maStrTabNameInvalid);
-        pFtWarn->Show();
+        pFtWarn->SetControlBackground(Color(COL_YELLOW));
+        pFtWarn->SetText(msStrTabNameInvalid);
         pBtnOk->Disable();
         return;
     }
@@ -180,13 +187,14 @@ void ScMoveTableDlg::CheckNewTabName()
 
     if ( bFound )
     {
-        pFtWarn->SetText(maStrTabNameUsed);
-        pFtWarn->Show();
+        pFtWarn->SetControlBackground(Color(COL_YELLOW));
+        pFtWarn->SetText(msStrTabNameUsed);
         pBtnOk->Disable();
     }
     else
     {
-        pFtWarn->Hide();
+        pFtWarn->SetControlBackground();
+        pFtWarn->SetText(OUString());
         pBtnOk->Enable();
     }
 }
@@ -213,8 +221,6 @@ void ScMoveTableDlg::Init()
     pBtnMove->Check( true );
     pBtnCopy->Check( false );
     pEdTabName->Enable(false);
-    pFtWarn->SetControlBackground( Color( COL_YELLOW ) );
-    pFtWarn->Hide();
     InitDocListBox();
     SelHdl( pLbDoc );
 }
@@ -244,7 +250,7 @@ void ScMoveTableDlg::InitDocListBox()
             {
                 mnCurrentDocPos = nSelPos = i;
                 aEntryName += sal_Unicode( ' ' );
-                aEntryName += String( ScResId( STR_CURRENTDOC ) );
+                aEntryName += msCurrentDoc;
             }
 
             pLbDoc->InsertEntry( aEntryName, i );
@@ -256,7 +262,7 @@ void ScMoveTableDlg::InitDocListBox()
     }
 
     pLbDoc->SetUpdateMode( sal_True );
-    pLbDoc->InsertEntry( String( ScResId( STR_NEWDOC ) ) );
+    pLbDoc->InsertEntry(msNewDoc);
     pLbDoc->SelectEntryPos( nSelPos );
 }
 
diff --git a/sc/uiconfig/scalc/ui/movecopysheet.ui b/sc/uiconfig/scalc/ui/movecopysheet.ui
index 3b047c33b668..28f0a8c40028 100644
--- a/sc/uiconfig/scalc/ui/movecopysheet.ui
+++ b/sc/uiconfig/scalc/ui/movecopysheet.ui
@@ -3,43 +3,41 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="MoveCopySheetDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Move/Copy Sheet</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</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="layout_style">spread</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -51,11 +49,9 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -91,15 +87,14 @@
                     <child>
                       <object class="GtkRadioButton" id="move">
                         <property name="label" translatable="yes">_Move</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
+                        <property name="group">copy</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -110,14 +105,13 @@
                     <child>
                       <object class="GtkRadioButton" id="copy">
                         <property name="label" translatable="yes">C_opy</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
+                        <property name="group">move</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -153,34 +147,41 @@
           <object class="GtkFrame" id="location">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_top">5</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
               <object class="GtkAlignment" id="alignment2">
                 <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>
                   <object class="GtkBox" id="box2">
                     <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">12</property>
                     <child>
                       <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="toDocumentLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_top">5</property>
-                            <property name="margin_bottom">3</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
                             <property name="label" translatable="yes">To _document</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">toDocument</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -194,6 +195,10 @@
                             <property name="can_focus">False</property>
                             <property name="entry_text_column">0</property>
                             <property name="id_column">1</property>
+                            <items>
+                              <item translatable="yes">(current document)</item>
+                              <item translatable="yes">- new document -</item>
+                            </items>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -212,17 +217,19 @@
                       <object class="GtkBox" id="box4">
                         <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>
                           <object class="GtkLabel" id="insertBeforeLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_top">8</property>
-                            <property name="margin_bottom">3</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0.49000000953674316</property>
                             <property name="label" translatable="yes">_Insert before</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">insertBefore:before</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -234,11 +241,14 @@
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
                             <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkTreeView" id="insertBefore">
+                              <object class="GtkTreeView" id="insertBefore:before">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
                                 <child internal-child="selection">
                                   <object class="GtkTreeSelection" id="treeview-selection"/>
@@ -295,13 +305,86 @@
                   <object class="GtkAlignment" id="alignment3">
                     <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="GtkEntry" id="newName">
+                      <object class="GtkBox" id="box6">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkEntry" id="newName">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="newNameWarn">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="warnunused">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="valign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label" translatable="yes">This name is already used.</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="warnempty">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="valign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label" translatable="yes">Name is empty.</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="warninvalid">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="valign">start</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0</property>
+                            <property name="label" translatable="yes">Name contains one or more invalid characters.</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -311,23 +394,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="newNameWarn">
-                    <property name="height_request">30</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">start</property>
-                    <property name="margin_left">12</property>
-                    <property name="margin_right">1</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0.54000002145767212</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child type="label">