Kaydet (Commit) 95b4c032 authored tarafından Caolán McNamara's avatar Caolán McNamara

use secondary-group packing to left group help and adapt to OK->Insert change

Change-Id: I0325f42e78efbf819c6883b69d5a8903e05ac36e
üst db8aa2fc
......@@ -57,7 +57,7 @@ class SwInsTableDlg : public SfxModalDialog
CheckBox* m_pDontSplitCB;
CheckBox* m_pBorderCB;
OKButton* m_pOkBtn;
PushButton* m_pInsertBtn;
PushButton* m_pAutoFmtBtn;
SwWrtShell* pShell;
......@@ -67,6 +67,7 @@ class SwInsTableDlg : public SfxModalDialog
DECL_LINK( ModifyName, Edit * );
DECL_LINK( ModifyRowCol, NumericField * );
DECL_LINK( AutoFmtHdl, PushButton* );
DECL_LINK(OKHdl, void*);
DECL_LINK(CheckBoxHdl, void * = 0);
DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 );
DECL_LINK( ModifyRepeatHeaderNF_Hdl, void* p = 0 );
......
......@@ -96,7 +96,7 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
get(m_pDontSplitCB, "dontsplitcb");
get(m_pBorderCB, "bordercb");
get(m_pAutoFmtBtn, "autoformat");
get(m_pOkBtn, "ok");
get(m_pInsertBtn, "ok");
get(m_pRepeatGroup, "repeatgroup");
get(m_pRepeatHeaderNF, "repeatheaderspin");
......@@ -109,6 +109,8 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
m_pColNF->SetMax(ROW_COL_PROD/m_pRowNF->GetValue());
m_pAutoFmtBtn->SetClickHdl(LINK(this, SwInsTableDlg, AutoFmtHdl));
m_pInsertBtn->SetClickHdl(LINK(this, SwInsTableDlg, OKHdl));
sal_Bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
......@@ -142,6 +144,12 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView )
m_pRepeatHeaderNF->SetMax( nMax );
}
IMPL_LINK_NOARG(SwInsTableDlg, OKHdl)
{
EndDialog(RET_OK);
return 0;
}
SwInsTableDlg::~SwInsTableDlg()
{
delete pTAutoFmt;
......@@ -156,7 +164,7 @@ IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
pEdit->SetText(sTblName);
}
m_pOkBtn->Enable(pShell->GetTblStyle( sTblName ) == 0);
m_pInsertBtn->Enable(pShell->GetTblStyle( sTblName ) == 0);
return 0;
}
IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, pEdit )
......
......@@ -30,7 +30,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
......@@ -38,18 +37,18 @@
<property name="expand">True</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-add</property>
<property name="label">Insert</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">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>
<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