[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Csikós Tamás
csks.tomi at gmail.com
Tue Jul 9 01:21:10 PDT 2013
sw/UIConfig_swriter.mk | 1
sw/inc/globals.hrc | 1
sw/source/ui/config/optdlg.hrc | 33 -
sw/source/ui/config/optdlg.src | 239 -------------
sw/source/ui/config/optpage.cxx | 178 ++++------
sw/source/ui/dialog/swdlgfact.cxx | 1
sw/source/ui/inc/optpage.hxx | 57 +--
sw/uiconfig/swriter/ui/opttablepage.ui | 583 +++++++++++++++++++++++++++++++++
8 files changed, 684 insertions(+), 409 deletions(-)
New commits:
commit f39885181180e960be80155a91f60906132b414a
Author: Csikós Tamás <csks.tomi at gmail.com>
Date: Sun Jul 7 15:35:37 2013 +0200
modern .ui widgetlayout for optpage
Change-Id: I257f4c5878caabd5394bb2641ebf6d82a833e5f1
Reviewed-on: https://gerrit.libreoffice.org/4756
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index dd533a7..58abfe1 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
+ sw/uiconfig/swriter/ui/opttablepage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 8411ebf..60cb591 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -168,7 +168,6 @@
#define TP_FRM_ADD (RC_GLOBALS_BEGIN + 51)
#define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55)
-#define TP_OPTTABLE_PAGE (RC_GLOBALS_BEGIN + 56)
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index ffe8233..4dd3868 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -73,37 +73,4 @@
#define LB_LABEL_SIZE 111
#define LB_INDEX_SIZE 112
-//Tabpage Table
-#define CB_HEADER 101
-#define CB_REPEAT_HEADER 102
-#define CB_DONT_SPLIT 103
-#define CB_BORDER 104
-#define CB_NUMFORMATTING 105
-#define CB_NUMALIGNMENT 106
-#define FL_TABLE 107
-#define FL_TABLE_INSERT 108
-#define CB_NUMFMT_FORMATTING 109
-#define FL_MOVE 110
-#define FT_ROWMOVE 111
-#define MF_ROWMOVE 112
-#define FT_COLMOVE 113
-#define MF_COLMOVE 114
-#define FT_INSERT 115
-#define FT_ROWINSERT 116
-#define MF_ROWINSERT 117
-#define FT_COLINSERT 118
-#define MF_COLINSERT 119
-#define FT_HANDLING 120
-#define RB_FIX 121
-#define RB_FIXPROP 122
-#define RB_VAR 123
-#define FT_FIX 124
-#define FT_FIXPROP 125
-#define FT_VAR 126
-
-#define FT_MOVE 128
-#define FT_COMMENT 133
-#define FL_TABLE_SEPARATOR 139
-#define CB_PROSPECT_RTL 140
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 4635874..93b6033 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -195,245 +195,6 @@ TabPage TP_STD_FONT
};
};
-TabPage TP_OPTTABLE_PAGE
-{
- HelpID = HID_OPTTABLE_PAGE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_TABLE
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 113 , 8 ) ;
- Text [ en-US ] = "Default";
- };
- CheckBox CB_HEADER
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 107 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "H~eading";
- };
- CheckBox CB_REPEAT_HEADER
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER";
- Pos = MAP_APPFONT ( 21 , 27 ) ;
- Size = MAP_APPFONT ( 99 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Re~peat on each page";
- };
- CheckBox CB_DONT_SPLIT
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT";
- Pos = MAP_APPFONT ( 12 , 40 ) ;
- Size = MAP_APPFONT ( 107 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Do not split";
- };
- CheckBox CB_BORDER
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER";
- Pos = MAP_APPFONT ( 12 , 53 ) ;
- Size = MAP_APPFONT ( 107 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "B~order";
- };
- FixedLine FL_TABLE_SEPARATOR
- {
- Pos = MAP_APPFONT ( 120 , 14 ) ;
- Size = MAP_APPFONT ( 4 , 52 ) ;
- Vert = TRUE;
- };
- FixedLine FL_TABLE_INSERT
- {
- Pos = MAP_APPFONT ( 125 , 3 ) ;
- Size = MAP_APPFONT ( 129 , 8 ) ;
- Text [ en-US ] = "Input in tables";
- };
- CheckBox CB_NUMFORMATTING
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING";
- Pos = MAP_APPFONT ( 131 , 14 ) ;
- Size = MAP_APPFONT ( 118 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Number recognition";
- };
- CheckBox CB_NUMFMT_FORMATTING
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING";
- Pos = MAP_APPFONT ( 140 , 27 ) ;
- Size = MAP_APPFONT ( 114 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Number format recognition";
- };
- CheckBox CB_NUMALIGNMENT
- {
- HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT";
- Pos = MAP_APPFONT ( 140 , 40 ) ;
- Size = MAP_APPFONT ( 114 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Alignment";
- };
- FixedLine FL_MOVE
- {
- Pos = MAP_APPFONT ( 6 , 69 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Keyboard handling";
- };
- FixedText FT_MOVE
- {
- Pos = MAP_APPFONT ( 12 , 80) ;
- Size = MAP_APPFONT ( 100 , 8 ) ;
- Text [ en-US ] = "Move cells";
- };
- FixedText FT_ROWMOVE
- {
- Pos = MAP_APPFONT ( 21 , 93 ) ;
- Size = MAP_APPFONT ( 51 , 8 ) ;
- Text [ en-US ] = "~Row" ;
- };
- MetricField MF_ROWMOVE
- {
- HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 83 , 91 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- SpinSize = 10 ;
- Minimum = 25 ;
- Maximum = 999 ;
- First = 25 ;
- Last = 2000 ;
- };
- FixedText FT_COLMOVE
- {
- Pos = MAP_APPFONT ( 21 , 108 ) ;
- Size = MAP_APPFONT ( 51 , 8 ) ;
- Text [ en-US ] = "~Column" ;
- };
- MetricField MF_COLMOVE
- {
- HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 83 , 106 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- SpinSize = 10 ;
- Minimum = 25 ;
- Maximum = 999 ;
- First = 25 ;
- Last = 2000 ;
- };
- FixedText FT_INSERT
- {
- Pos = MAP_APPFONT ( 136 , 80 ) ;
- Size = MAP_APPFONT ( 110 , 8 ) ;
- Text [ en-US ] = "Insert cell";
- };
- FixedText FT_ROWINSERT
- {
- Pos = MAP_APPFONT ( 145 , 93 ) ;
- Size = MAP_APPFONT ( 51 , 8 ) ;
- Text [ en-US ] = "Ro~w" ;
- };
- MetricField MF_ROWINSERT
- {
- HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 211 , 91 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- SpinSize = 10 ;
- Minimum = 25 ;
- Maximum = 999 ;
- First = 25 ;
- Last = 2000 ;
- };
- FixedText FT_COLINSERT
- {
- Pos = MAP_APPFONT ( 145 , 108 ) ;
- Size = MAP_APPFONT ( 51 , 10 ) ;
- Text [ en-US ] = "Colu~mn" ;
- };
- MetricField MF_COLINSERT
- {
- HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 211 , 106 ) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_CM ;
- SpinSize = 10 ;
- Minimum = 25 ;
- Maximum = 999 ;
- First = 25 ;
- Last = 2000 ;
- };
- FixedText FT_HANDLING
- {
- Pos = MAP_APPFONT ( 12 , 122 ) ;
- Size = MAP_APPFONT ( 230 , 8 ) ;
- Text [ en-US ] = "Behavior of rows/columns";
- };
- RadioButton RB_FIX
- {
- HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX";
- Pos = MAP_APPFONT ( 21 , 133 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Fixed" ;
- };
- FixedText FT_FIX
- {
- Pos = MAP_APPFONT ( 93 , 133 ) ;
- Size = MAP_APPFONT ( 155 , 16 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Changes affect the adjacent area only";
- };
- RadioButton RB_FIXPROP
- {
- HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP";
- Pos = MAP_APPFONT ( 21 , 151 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Fi~xed, proportional" ;
- };
- FixedText FT_FIXPROP
- {
- Pos = MAP_APPFONT ( 93 , 151 ) ;
- Size = MAP_APPFONT ( 155 , 16 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Changes affect the entire table";
- };
- RadioButton RB_VAR
- {
- HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR";
- Pos = MAP_APPFONT ( 21 , 169 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Variable" ;
- };
- FixedText FT_VAR
- {
- Pos = MAP_APPFONT ( 93 , 169 ) ;
- Size = MAP_APPFONT ( 155 , 16 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Changes affect the table size";
- };
-};
-
StringArray STR_PRINTOPTUI
{
ItemList [en-US] =
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8019213..bd6a6e5 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1068,49 +1068,29 @@ void SwStdFontTabPage::PageCreated (SfxAllItemSet aSet)
}
SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, SW_RES(TP_OPTTABLE_PAGE), rSet),
- aTableFL (this, SW_RES(FL_TABLE )),
- aHeaderCB (this, SW_RES(CB_HEADER )),
- aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER )),
- aDontSplitCB (this, SW_RES(CB_DONT_SPLIT )),
- aBorderCB (this, SW_RES(CB_BORDER )),
-
- aSeparatorFL (this, SW_RES(FL_TABLE_SEPARATOR)),
-
- aTableInsertFL (this, SW_RES(FL_TABLE_INSERT )),
- aNumFormattingCB(this, SW_RES(CB_NUMFORMATTING )),
- aNumFmtFormattingCB(this, SW_RES(CB_NUMFMT_FORMATTING )),
- aNumAlignmentCB (this, SW_RES(CB_NUMALIGNMENT )),
-
- aMoveFL( this, SW_RES(FL_MOVE )),
- aMoveFT( this, SW_RES(FT_MOVE )),
- aRowMoveFT( this, SW_RES(FT_ROWMOVE )),
- aRowMoveMF( this, SW_RES(MF_ROWMOVE )),
- aColMoveFT( this, SW_RES(FT_COLMOVE )),
- aColMoveMF( this, SW_RES(MF_COLMOVE )),
-
- aInsertFT( this, SW_RES(FT_INSERT )),
- aRowInsertFT( this, SW_RES(FT_ROWINSERT)),
- aRowInsertMF( this, SW_RES(MF_ROWINSERT)),
- aColInsertFT( this, SW_RES(FT_COLINSERT)),
- aColInsertMF( this, SW_RES(MF_COLINSERT)),
-
- aHandlingFT( this, SW_RES(FT_HANDLING )),
- aFixRB( this, SW_RES(RB_FIX )),
- aFixPropRB( this, SW_RES(RB_FIXPROP )),
- aVarRB( this, SW_RES(RB_VAR )),
- aFixFT( this, SW_RES(FT_FIX )),
- aFixPropFT( this, SW_RES(FT_FIXPROP )),
- aVarFT( this, SW_RES(FT_VAR )),
+ SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", rSet),
pWrtShell(0),
bHTMLMode(sal_False)
{
- FreeResource();
+ get(pHeaderCB,"header");
+ get(pRepeatHeaderCB,"repeatheader");
+ get(pDontSplitCB,"dontsplit");
+ get(pBorderCB,"border");
+ get(pNumFormattingCB,"numformatting");
+ get(pNumFmtFormattingCB,"numfmtformatting");
+ get(pNumAlignmentCB,"numalignment");
+ get(pRowMoveMF,"rowmove");
+ get(pColMoveMF,"colmove");
+ get(pRowInsertMF,"rowinsert");
+ get(pColInsertMF,"colinsert");
+ get(pFixRB,"fix");
+ get(pFixPropRB,"fixprop");
+ get(pVarRB,"var");
Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
- aNumFormattingCB.SetClickHdl(aLnk);
- aNumFmtFormattingCB.SetClickHdl(aLnk);
- aHeaderCB.SetClickHdl(aLnk);
+ pNumFormattingCB->SetClickHdl(aLnk);
+ pNumFmtFormattingCB->SetClickHdl(aLnk);
+ pHeaderCB->SetClickHdl(aLnk);
}
SwTableOptionsTabPage::~SwTableOptionsTabPage()
@@ -1128,22 +1108,22 @@ sal_Bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
sal_Bool bRet = sal_False;
SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
- if(aRowMoveMF.IsModified())
- pModOpt->SetTblHMove( (sal_uInt16)aRowMoveMF.Denormalize( aRowMoveMF.GetValue(FUNIT_TWIP)));
+ if(pRowMoveMF->IsModified())
+ pModOpt->SetTblHMove( (sal_uInt16)pRowMoveMF->Denormalize( pRowMoveMF->GetValue(FUNIT_TWIP)));
- if(aColMoveMF.IsModified())
- pModOpt->SetTblVMove( (sal_uInt16)aColMoveMF.Denormalize( aColMoveMF.GetValue(FUNIT_TWIP)));
+ if(pColMoveMF->IsModified())
+ pModOpt->SetTblVMove( (sal_uInt16)pColMoveMF->Denormalize( pColMoveMF->GetValue(FUNIT_TWIP)));
- if(aRowInsertMF.IsModified())
- pModOpt->SetTblHInsert((sal_uInt16)aRowInsertMF.Denormalize( aRowInsertMF.GetValue(FUNIT_TWIP)));
+ if(pRowInsertMF->IsModified())
+ pModOpt->SetTblHInsert((sal_uInt16)pRowInsertMF->Denormalize( pRowInsertMF->GetValue(FUNIT_TWIP)));
- if(aColInsertMF.IsModified())
- pModOpt->SetTblVInsert((sal_uInt16)aColInsertMF.Denormalize( aColInsertMF.GetValue(FUNIT_TWIP)));
+ if(pColInsertMF->IsModified())
+ pModOpt->SetTblVInsert((sal_uInt16)pColInsertMF->Denormalize( pColInsertMF->GetValue(FUNIT_TWIP)));
TblChgMode eMode;
- if(aFixRB.IsChecked())
+ if(pFixRB->IsChecked())
eMode = TBLFIX_CHGABS;
- else if(aFixPropRB.IsChecked())
+ else if(pFixPropRB->IsChecked())
eMode = TBLFIX_CHGPROP;
else
eMode = TBLVAR_CHGABS;
@@ -1169,41 +1149,41 @@ sal_Bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
SwInsertTableOptions aInsOpts( 0, 0 );
- if (aHeaderCB.IsChecked())
+ if (pHeaderCB->IsChecked())
aInsOpts.mnInsMode |= tabopts::HEADLINE;
- if (aRepeatHeaderCB.IsEnabled() )
- aInsOpts.mnRowsToRepeat = aRepeatHeaderCB.IsChecked()? 1 : 0;
+ if (pRepeatHeaderCB->IsEnabled() )
+ aInsOpts.mnRowsToRepeat = pRepeatHeaderCB->IsChecked()? 1 : 0;
- if (!aDontSplitCB.IsChecked())
+ if (!pDontSplitCB->IsChecked())
aInsOpts.mnInsMode |= tabopts::SPLIT_LAYOUT;
- if (aBorderCB.IsChecked())
+ if (pBorderCB->IsChecked())
aInsOpts.mnInsMode |= tabopts::DEFAULT_BORDER;
- if (aHeaderCB.GetSavedValue() != aHeaderCB.GetState() ||
- aRepeatHeaderCB.GetSavedValue() != aRepeatHeaderCB.GetState() ||
- aDontSplitCB.GetSavedValue() != aDontSplitCB.GetState() ||
- aBorderCB.GetSavedValue() != aBorderCB.GetState())
+ if (pHeaderCB->GetSavedValue() != pHeaderCB->GetState() ||
+ pRepeatHeaderCB->GetSavedValue() != pRepeatHeaderCB->GetState() ||
+ pDontSplitCB->GetSavedValue() != pDontSplitCB->GetState() ||
+ pBorderCB->GetSavedValue() != pBorderCB->GetState())
{
pModOpt->SetInsTblFlags(bHTMLMode, aInsOpts);
}
- if (aNumFormattingCB.GetSavedValue() != aNumFormattingCB.GetState())
+ if (pNumFormattingCB->GetSavedValue() != pNumFormattingCB->GetState())
{
- pModOpt->SetInsTblFormatNum(bHTMLMode, aNumFormattingCB.IsChecked());
+ pModOpt->SetInsTblFormatNum(bHTMLMode, pNumFormattingCB->IsChecked());
bRet = sal_True;
}
- if (aNumFmtFormattingCB.GetSavedValue() != aNumFmtFormattingCB.GetState())
+ if (pNumFmtFormattingCB->GetSavedValue() != pNumFmtFormattingCB->GetState())
{
- pModOpt->SetInsTblChangeNumFormat(bHTMLMode, aNumFmtFormattingCB.IsChecked());
+ pModOpt->SetInsTblChangeNumFormat(bHTMLMode, pNumFmtFormattingCB->IsChecked());
bRet = sal_True;
}
- if (aNumAlignmentCB.GetSavedValue() != aNumAlignmentCB.GetState())
+ if (pNumAlignmentCB->GetSavedValue() != pNumAlignmentCB->GetState())
{
- pModOpt->SetInsTblAlignNum(bHTMLMode, aNumAlignmentCB.IsChecked());
+ pModOpt->SetInsTblAlignNum(bHTMLMode, pNumAlignmentCB->IsChecked());
bRet = sal_True;
}
@@ -1217,22 +1197,22 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet.Get( SID_ATTR_METRIC );
FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
- ::SetFieldUnit( aRowMoveMF, eFieldUnit );
- ::SetFieldUnit( aColMoveMF, eFieldUnit );
- ::SetFieldUnit( aRowInsertMF, eFieldUnit );
- ::SetFieldUnit( aColInsertMF, eFieldUnit );
+ ::SetFieldUnit( *pRowMoveMF, eFieldUnit );
+ ::SetFieldUnit( *pColMoveMF, eFieldUnit );
+ ::SetFieldUnit( *pRowInsertMF, eFieldUnit );
+ ::SetFieldUnit( *pColInsertMF, eFieldUnit );
}
- aRowMoveMF .SetValue(aRowMoveMF.Normalize(pModOpt->GetTblHMove()), FUNIT_TWIP);
- aColMoveMF .SetValue(aColMoveMF.Normalize(pModOpt->GetTblVMove()), FUNIT_TWIP);
- aRowInsertMF.SetValue(aRowInsertMF.Normalize(pModOpt->GetTblHInsert()), FUNIT_TWIP);
- aColInsertMF.SetValue(aColInsertMF.Normalize(pModOpt->GetTblVInsert()), FUNIT_TWIP);
+ pRowMoveMF->SetValue(pRowMoveMF->Normalize(pModOpt->GetTblHMove()), FUNIT_TWIP);
+ pColMoveMF->SetValue(pColMoveMF->Normalize(pModOpt->GetTblVMove()), FUNIT_TWIP);
+ pRowInsertMF->SetValue(pRowInsertMF->Normalize(pModOpt->GetTblHInsert()), FUNIT_TWIP);
+ pColInsertMF->SetValue(pColInsertMF->Normalize(pModOpt->GetTblVInsert()), FUNIT_TWIP);
switch(pModOpt->GetTblMode())
{
- case TBLFIX_CHGABS: aFixRB.Check(); break;
- case TBLFIX_CHGPROP: aFixPropRB.Check(); break;
- case TBLVAR_CHGABS: aVarRB.Check(); break;
+ case TBLFIX_CHGABS: pFixRB->Check(); break;
+ case TBLFIX_CHGPROP: pFixPropRB->Check(); break;
+ case TBLVAR_CHGABS: pVarRB->Check(); break;
}
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem))
@@ -1243,50 +1223,50 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
// hide certain controls for html
if(bHTMLMode)
{
- aRepeatHeaderCB.Hide();
- aDontSplitCB.Hide();
+ pRepeatHeaderCB->Hide();
+ pDontSplitCB->Hide();
long nMoveUpBy =
- aRepeatHeaderCB.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+ pRepeatHeaderCB->LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
- Point aPos = aRepeatHeaderCB.GetPosPixel();
- aRepeatHeaderCB.SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
+ Point aPos = pRepeatHeaderCB->GetPosPixel();
+ pRepeatHeaderCB->SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
nMoveUpBy +=
- aDontSplitCB.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+ pDontSplitCB->LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
- aPos = aBorderCB.GetPosPixel();
- aBorderCB.SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
+ aPos = pBorderCB->GetPosPixel();
+ pBorderCB->SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
}
SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
- aHeaderCB.Check(0 != (nInsTblFlags & tabopts::HEADLINE));
- aRepeatHeaderCB.Check((!bHTMLMode) && (aInsOpts.mnRowsToRepeat > 0));
- aDontSplitCB.Check(!(nInsTblFlags & tabopts::SPLIT_LAYOUT));
- aBorderCB.Check(0 != (nInsTblFlags & tabopts::DEFAULT_BORDER));
+ pHeaderCB->Check(0 != (nInsTblFlags & tabopts::HEADLINE));
+ pRepeatHeaderCB->Check((!bHTMLMode) && (aInsOpts.mnRowsToRepeat > 0));
+ pDontSplitCB->Check(!(nInsTblFlags & tabopts::SPLIT_LAYOUT));
+ pBorderCB->Check(0 != (nInsTblFlags & tabopts::DEFAULT_BORDER));
- aNumFormattingCB.Check(pModOpt->IsInsTblFormatNum(bHTMLMode));
- aNumFmtFormattingCB.Check(pModOpt->IsInsTblChangeNumFormat(bHTMLMode));
- aNumAlignmentCB.Check(pModOpt->IsInsTblAlignNum(bHTMLMode));
+ pNumFormattingCB->Check(pModOpt->IsInsTblFormatNum(bHTMLMode));
+ pNumFmtFormattingCB->Check(pModOpt->IsInsTblChangeNumFormat(bHTMLMode));
+ pNumAlignmentCB->Check(pModOpt->IsInsTblAlignNum(bHTMLMode));
- aHeaderCB.SaveValue();
- aRepeatHeaderCB.SaveValue();
- aDontSplitCB.SaveValue();
- aBorderCB.SaveValue();
- aNumFormattingCB.SaveValue();
- aNumFmtFormattingCB.SaveValue();
- aNumAlignmentCB.SaveValue();
+ pHeaderCB->SaveValue();
+ pRepeatHeaderCB->SaveValue();
+ pDontSplitCB->SaveValue();
+ pBorderCB->SaveValue();
+ pNumFormattingCB->SaveValue();
+ pNumFmtFormattingCB->SaveValue();
+ pNumAlignmentCB->SaveValue();
CheckBoxHdl(0);
}
IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl)
{
- aNumFmtFormattingCB.Enable(aNumFormattingCB.IsChecked());
- aNumAlignmentCB.Enable(aNumFormattingCB.IsChecked());
- aRepeatHeaderCB.Enable(aHeaderCB.IsChecked());
+ pNumFmtFormattingCB->Enable(pNumFormattingCB->IsChecked());
+ pNumAlignmentCB->Enable(pNumFormattingCB->IsChecked());
+ pRepeatHeaderCB->Enable(pHeaderCB->IsChecked());
return 0;
}
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index db7514d..effb970 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1321,7 +1321,6 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
case RID_SW_TP_STD_FONT_CTL:
pRet = SwStdFontTabPage::Create;
break;
- case TP_OPTTABLE_PAGE :
case RID_SW_TP_HTML_OPTTABLE_PAGE:
case RID_SW_TP_OPTTABLE_PAGE:
pRet = SwTableOptionsTabPage::Create;
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 93f3cb5..cb30157 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -221,39 +221,24 @@ public:
class SwTableOptionsTabPage : public SfxTabPage
{
- FixedLine aTableFL;
- CheckBox aHeaderCB;
- CheckBox aRepeatHeaderCB;
- CheckBox aDontSplitCB;
- CheckBox aBorderCB;
-
- FixedLine aSeparatorFL;
-
- FixedLine aTableInsertFL;
- CheckBox aNumFormattingCB;
- CheckBox aNumFmtFormattingCB;
- CheckBox aNumAlignmentCB;
-
- FixedLine aMoveFL;
- FixedText aMoveFT;
- FixedText aRowMoveFT;
- MetricField aRowMoveMF;
- FixedText aColMoveFT;
- MetricField aColMoveMF;
-
- FixedText aInsertFT;
- FixedText aRowInsertFT;
- MetricField aRowInsertMF;
- FixedText aColInsertFT;
- MetricField aColInsertMF;
-
- FixedText aHandlingFT;
- RadioButton aFixRB;
- RadioButton aFixPropRB;
- RadioButton aVarRB;
- FixedText aFixFT;
- FixedText aFixPropFT;
- FixedText aVarFT;
+ CheckBox* pHeaderCB;
+ CheckBox* pRepeatHeaderCB;
+ CheckBox* pDontSplitCB;
+ CheckBox* pBorderCB;
+
+ CheckBox* pNumFormattingCB;
+ CheckBox* pNumFmtFormattingCB;
+ CheckBox* pNumAlignmentCB;
+
+ MetricField* pRowMoveMF;
+ MetricField* pColMoveMF;
+
+ MetricField* pRowInsertMF;
+ MetricField* pColInsertMF;
+
+ RadioButton* pFixRB;
+ RadioButton* pFixPropRB;
+ RadioButton* pVarRB;
SwWrtShell* pWrtShell;
sal_Bool bHTMLMode;
@@ -473,10 +458,10 @@ class SwCompareOptionsTabPage : public SfxTabPage
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
#endif
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui
new file mode 100644
index 0000000..40ada4c
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -0,0 +1,583 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment">
+ <property name="lower">0.25</property>
+ <property name="upper">9.9900000000000002</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="OptTablePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">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="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="alignment1">
+ <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="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="header">
+ <property name="label" translatable="yes">H_eading</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">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="repeatheader">
+ <property name="label" translatable="yes">Re_peat on each page</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="dontsplit">
+ <property name="label" translatable="yes">_Do not split</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">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="border">
+ <property name="label" translatable="yes">B_order</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">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Default</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="numformatting">
+ <property name="label" translatable="yes">_Number recognition</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">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="numfmtformatting">
+ <property name="label" translatable="yes">N_umber format recognition</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">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="numalignment">
+ <property name="label" translatable="yes">_Alignment</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">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Input in tables</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="alignment3">
+ <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="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Move cells</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="rowmove:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment</property>
+ <property name="digits">2</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>
+ <object class="GtkSpinButton" id="colmove:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Row:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rowmove:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Column:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">colmove:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">In‌sert cell</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="rowinsert:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="colinsert:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ro_w:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rowinsert:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Colu_mn:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">colinsert:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Behavior of rows/columns</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="fix">
+ <property name="label" translatable="yes">_Fixed</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</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">fixprop</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="fixprop">
+ <property name="label" translatable="yes">Fi_xed, proportional</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</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">var</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="var">
+ <property name="label" translatable="yes">_Variable</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</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">fix</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Changes affect the adjacent area only</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>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Changes affect the entire table</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Changes affect the table size</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Keyboard handling</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list