Kaydet (Commit) 9a44e90c authored tarafından Csikós Tamás's avatar Csikós Tamás Kaydeden (comit) Caolán McNamara

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/5110Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 4f2fa58f
...@@ -157,6 +157,7 @@ void ScMoveTableDlg::CheckNewTabName() ...@@ -157,6 +157,7 @@ void ScMoveTableDlg::CheckNewTabName()
if (aNewName.isEmpty()) if (aNewName.isEmpty())
{ {
// New sheet name is empty. This is not good. // New sheet name is empty. This is not good.
pFtWarn->Show(sal_True);
pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetControlBackground(Color(COL_YELLOW));
pFtWarn->SetText(msStrTabNameEmpty); pFtWarn->SetText(msStrTabNameEmpty);
pBtnOk->Disable(); pBtnOk->Disable();
...@@ -166,6 +167,7 @@ void ScMoveTableDlg::CheckNewTabName() ...@@ -166,6 +167,7 @@ void ScMoveTableDlg::CheckNewTabName()
if (!ScDocument::ValidTabName(aNewName)) if (!ScDocument::ValidTabName(aNewName))
{ {
// New sheet name contains invalid characters. // New sheet name contains invalid characters.
pFtWarn->Show(sal_True);
pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetControlBackground(Color(COL_YELLOW));
pFtWarn->SetText(msStrTabNameInvalid); pFtWarn->SetText(msStrTabNameInvalid);
pBtnOk->Disable(); pBtnOk->Disable();
...@@ -187,12 +189,14 @@ void ScMoveTableDlg::CheckNewTabName() ...@@ -187,12 +189,14 @@ void ScMoveTableDlg::CheckNewTabName()
if ( bFound ) if ( bFound )
{ {
pFtWarn->Show(sal_True);
pFtWarn->SetControlBackground(Color(COL_YELLOW)); pFtWarn->SetControlBackground(Color(COL_YELLOW));
pFtWarn->SetText(msStrTabNameUsed); pFtWarn->SetText(msStrTabNameUsed);
pBtnOk->Disable(); pBtnOk->Disable();
} }
else else
{ {
pFtWarn->Hide(sal_True);
pFtWarn->SetControlBackground(); pFtWarn->SetControlBackground();
pFtWarn->SetText(OUString()); pFtWarn->SetText(OUString());
pBtnOk->Enable(); pBtnOk->Enable();
...@@ -221,6 +225,7 @@ void ScMoveTableDlg::Init() ...@@ -221,6 +225,7 @@ void ScMoveTableDlg::Init()
pBtnMove->Check( true ); pBtnMove->Check( true );
pBtnCopy->Check( false ); pBtnCopy->Check( false );
pEdTabName->Enable(false); pEdTabName->Enable(false);
pFtWarn->Hide(sal_True);
InitDocListBox(); InitDocListBox();
SelHdl( pLbDoc ); SelHdl( pLbDoc );
} }
......
...@@ -78,18 +78,19 @@ ...@@ -78,18 +78,19 @@
<object class="GtkAlignment" id="alignment1"> <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkBox" id="box1"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkRadioButton" id="move"> <object class="GtkRadioButton" id="move">
<property name="label" translatable="yes">_Move</property> <property name="label" translatable="yes">_Move</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
...@@ -108,6 +109,7 @@ ...@@ -108,6 +109,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
......
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="image_position">right</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment