[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk
Csikós Tamás
csks.tomi at gmail.com
Thu Jul 11 02:28:50 PDT 2013
sc/AllLangResTarget_sc.mk | 1
sc/UIConfig_scalc.mk | 1
sc/source/ui/inc/optdlg.hrc | 39 --
sc/source/ui/inc/tpview.hxx | 63 +--
sc/source/ui/optdlg/tpview.cxx | 294 +++++++---------
sc/source/ui/src/optdlg.src | 271 ---------------
sc/uiconfig/scalc/ui/tpviewpage.ui | 666 +++++++++++++++++++++++++++++++++++++
7 files changed, 832 insertions(+), 503 deletions(-)
New commits:
commit 395b974daa234cb45f570eab100ed835c6b20b3a
Author: Csikós Tamás <csks.tomi at gmail.com>
Date: Wed Jul 10 13:13:45 2013 +0200
modern .ui widgetlayout for tpview
Change-Id: I0eb4a1aecf0726c709ea68145207dcf519a3773e
Reviewed-on: https://gerrit.libreoffice.org/4802
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 2736ac7..52a6ec3 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\
$(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/iconsets.src \
- sc/source/ui/src/optdlg.src \
sc/source/ui/src/popup.src \
sc/source/ui/src/autofmt.src \
sc/source/ui/src/globstr.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 5e4b9e9..72e7547 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
+ sc/uiconfig/scalc/ui/tpviewpage \
sc/uiconfig/scalc/ui/ungroupdialog \
))
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 7b0d234..b593ba7 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -37,25 +37,6 @@
#define BTN_NULLVALS 21
#define BTN_NOTES 22
-// TP_LCONTENT
-
-#define GB_DISPLAY 20
-#define CB_FORMULA 21
-#define CB_NIL 22
-#define CB_ANNOT 23
-#define CB_VALUE 24
-#define CB_ANCHOR 25
-#define GB_OBJECT 26
-#define FT_OBJGRF 27
-#define LB_OBJGRF 28
-#define FT_DIAGRAM 29
-#define LB_DIAGRAM 30
-#define FT_DRAW 31
-#define LB_DRAW 32
-#define CB_CLIP 33
-#define GB_ZOOM 34
-#define CB_SYNCZOOM 35
-
// TP_LAYOUT
#define CB_DOCONLY 5
#define CB_MERGE_PARA_DIST 6
@@ -63,26 +44,6 @@
#define CB_AUTO_UPDATE_FIELDS 8
#define CB_AUTO_UPDATE_CHARTS 9
-#define GB_WINDOW 50
-#define CB_ROWCOLHEADER 51
-#define CB_HSCROLL 52
-#define CB_VSCROLL 53
-#define CB_TBLREG 54
-#define CB_OUTLINE 55
-#define GB_LINES 56
-#define FT_COLOR 58
-#define LB_COLOR 59
-#define CB_GUIDELINE 60
-#define CB_PAGEBREAKS 66
-#define FL_SEPARATOR1 71
-#define FL_SEPARATOR2 72
-#define FT_GRID 74
-#define LB_GRID 75
-
-// TP_INPUT
-#define CB_RFIND 75
-
-
// TP_FORMULA
#define FL_FORMULA_OPTIONS 80
#define FT_FORMULA_SYNTAX 81
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 7f786cb..53fba0f 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -35,44 +35,31 @@ class ScViewOptions;
class ScTpContentOptions : public SfxTabPage
{
- FixedLine aLinesGB;
- FixedText aGridFT;
- ListBox aGridLB;
- FixedText aColorFT;
- ColorListBox aColorLB;
- CheckBox aBreakCB;
- CheckBox aGuideLineCB;
-
- FixedLine aSeparator1FL;
-
- FixedLine aDisplayGB;
- CheckBox aFormulaCB;
- CheckBox aNilCB;
- CheckBox aAnnotCB;
- CheckBox aValueCB;
- CheckBox aAnchorCB;
- CheckBox aClipMarkCB;
- CheckBox aRangeFindCB;
-
- FixedLine aObjectGB;
- FixedText aObjGrfFT;
- ListBox aObjGrfLB;
- FixedText aDiagramFT;
- ListBox aDiagramLB;
- FixedText aDrawFT;
- ListBox aDrawLB;
-
- FixedLine aZoomGB;
- CheckBox aSyncZoomCB;
-
- FixedLine aSeparator2FL;
-
- FixedLine aWindowGB;
- CheckBox aRowColHeaderCB;
- CheckBox aHScrollCB;
- CheckBox aVScrollCB;
- CheckBox aTblRegCB;
- CheckBox aOutlineCB;
+ ListBox* pGridLB;
+ FixedText* pColorFT;
+ ColorListBox* pColorLB;
+ CheckBox* pBreakCB;
+ CheckBox* pGuideLineCB;
+
+ CheckBox* pFormulaCB;
+ CheckBox* pNilCB;
+ CheckBox* pAnnotCB;
+ CheckBox* pValueCB;
+ CheckBox* pAnchorCB;
+ CheckBox* pClipMarkCB;
+ CheckBox* pRangeFindCB;
+
+ ListBox* pObjGrfLB;
+ ListBox* pDiagramLB;
+ ListBox* pDrawLB;
+
+ CheckBox* pSyncZoomCB;
+
+ CheckBox* pRowColHeaderCB;
+ CheckBox* pHScrollCB;
+ CheckBox* pVScrollCB;
+ CheckBox* pTblRegCB;
+ CheckBox* pOutlineCB;
ScViewOptions* pLocalOptions;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 27d286f..2b6741e 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -48,71 +48,57 @@
ScTpContentOptions::ScTpContentOptions( Window* pParent,
const SfxItemSet& rArgSet ) :
- SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet),
-
- aLinesGB( this, ScResId(GB_LINES )),
- aGridFT( this, ScResId(FT_GRID )),
- aGridLB( this, ScResId(LB_GRID )),
- aColorFT( this, ScResId(FT_COLOR )),
- aColorLB( this, ScResId(LB_COLOR )),
- aBreakCB( this, ScResId(CB_PAGEBREAKS )),
- aGuideLineCB( this, ScResId(CB_GUIDELINE )),
-
- aSeparator1FL (this, ScResId(FL_SEPARATOR1 )),
- aDisplayGB( this, ScResId(GB_DISPLAY)),
- aFormulaCB( this, ScResId(CB_FORMULA)),
- aNilCB( this, ScResId(CB_NIL )),
- aAnnotCB( this, ScResId(CB_ANNOT )),
- aValueCB( this, ScResId(CB_VALUE )),
- aAnchorCB( this, ScResId(CB_ANCHOR )),
- aClipMarkCB( this, ScResId(CB_CLIP )),
- aRangeFindCB( this, ScResId( CB_RFIND )),
-
- aObjectGB( this, ScResId(GB_OBJECT )),
- aObjGrfFT( this, ScResId(FT_OBJGRF )),
- aObjGrfLB( this, ScResId(LB_OBJGRF )),
- aDiagramFT( this, ScResId(FT_DIAGRAM)),
- aDiagramLB( this, ScResId(LB_DIAGRAM)),
- aDrawFT( this, ScResId(FT_DRAW )),
- aDrawLB( this, ScResId(LB_DRAW )),
-
- aZoomGB( this, ScResId(GB_ZOOM) ),
- aSyncZoomCB( this, ScResId(CB_SYNCZOOM) ),
-
- aSeparator2FL (this, ScResId(FL_SEPARATOR2)),
- aWindowGB( this, ScResId(GB_WINDOW )),
- aRowColHeaderCB(this, ScResId(CB_ROWCOLHEADER )),
- aHScrollCB( this, ScResId(CB_HSCROLL )),
- aVScrollCB( this, ScResId(CB_VSCROLL )),
- aTblRegCB( this, ScResId(CB_TBLREG )),
- aOutlineCB( this, ScResId(CB_OUTLINE )),
+ SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", rArgSet),
pLocalOptions(0)
{
- FreeResource();
- aSeparator1FL.SetStyle( aSeparator1FL.GetStyle() | WB_VERT );
- aSeparator2FL.SetStyle( aSeparator2FL.GetStyle() | WB_VERT );
+ get(pGridLB,"grid");
+ get(pColorFT,"color_label");
+ get(pColorLB,"color");
+ get(pBreakCB,"break");
+ get(pGuideLineCB,"guideline");
+
+ get(pFormulaCB,"formula");
+ get(pNilCB,"nil");
+ get(pAnnotCB,"annot");
+ get(pValueCB,"value");
+ get(pAnchorCB,"anchor");
+ get(pClipMarkCB,"clipmark");
+ get(pRangeFindCB,"rangefind");
+
+ get(pObjGrfLB,"objgrf");
+ get(pDiagramLB,"diagram");
+ get(pDrawLB,"draw");
+
+ get(pSyncZoomCB,"synczoom");
+
+ get(pRowColHeaderCB,"rowcolheader");
+ get(pHScrollCB,"hscroll");
+ get(pVScrollCB,"vscroll");
+ get(pTblRegCB,"tblreg");
+ get(pOutlineCB,"outline");
+
SetExchangeSupport();
Link aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
- aObjGrfLB. SetSelectHdl(aSelObjHdl);
- aDiagramLB. SetSelectHdl(aSelObjHdl);
- aDrawLB. SetSelectHdl(aSelObjHdl);
- aGridLB. SetSelectHdl( LINK( this, ScTpContentOptions, GridHdl ) );
+ pObjGrfLB-> SetSelectHdl(aSelObjHdl);
+ pDiagramLB-> SetSelectHdl(aSelObjHdl);
+ pDrawLB-> SetSelectHdl(aSelObjHdl);
+ pGridLB-> SetSelectHdl( LINK( this, ScTpContentOptions, GridHdl ) );
Link aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
- aFormulaCB .SetClickHdl(aCBHdl);
- aNilCB .SetClickHdl(aCBHdl);
- aAnnotCB .SetClickHdl(aCBHdl);
- aValueCB .SetClickHdl(aCBHdl);
- aAnchorCB .SetClickHdl(aCBHdl);
- aClipMarkCB .SetClickHdl(aCBHdl);
-
- aVScrollCB .SetClickHdl(aCBHdl);
- aHScrollCB .SetClickHdl(aCBHdl);
- aTblRegCB .SetClickHdl(aCBHdl);
- aOutlineCB .SetClickHdl(aCBHdl);
- aBreakCB .SetClickHdl(aCBHdl);
- aGuideLineCB.SetClickHdl(aCBHdl);
- aRowColHeaderCB.SetClickHdl(aCBHdl);
+ pFormulaCB ->SetClickHdl(aCBHdl);
+ pNilCB ->SetClickHdl(aCBHdl);
+ pAnnotCB ->SetClickHdl(aCBHdl);
+ pValueCB ->SetClickHdl(aCBHdl);
+ pAnchorCB ->SetClickHdl(aCBHdl);
+ pClipMarkCB ->SetClickHdl(aCBHdl);
+
+ pVScrollCB ->SetClickHdl(aCBHdl);
+ pHScrollCB ->SetClickHdl(aCBHdl);
+ pTblRegCB ->SetClickHdl(aCBHdl);
+ pOutlineCB ->SetClickHdl(aCBHdl);
+ pBreakCB ->SetClickHdl(aCBHdl);
+ pGuideLineCB->SetClickHdl(aCBHdl);
+ pRowColHeaderCB->SetClickHdl(aCBHdl);
}
@@ -130,38 +116,38 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent,
sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
{
sal_Bool bRet = false;
- if( aFormulaCB .GetSavedValue() != aFormulaCB .IsChecked() ||
- aNilCB .GetSavedValue() != aNilCB .IsChecked() ||
- aAnnotCB .GetSavedValue() != aAnnotCB .IsChecked() ||
- aValueCB .GetSavedValue() != aValueCB .IsChecked() ||
- aAnchorCB .GetSavedValue() != aAnchorCB .IsChecked() ||
- aClipMarkCB .GetSavedValue() != aClipMarkCB .IsChecked() ||
- aObjGrfLB .GetSavedValue() != aObjGrfLB .GetSelectEntryPos() ||
- aDiagramLB .GetSavedValue() != aDiagramLB .GetSelectEntryPos() ||
- aDrawLB .GetSavedValue() != aDrawLB .GetSelectEntryPos() ||
- aGridLB .GetSavedValue() != aGridLB .GetSelectEntryPos() ||
- aRowColHeaderCB .GetSavedValue() != aRowColHeaderCB.IsChecked() ||
- aHScrollCB .GetSavedValue() != aHScrollCB .IsChecked() ||
- aVScrollCB .GetSavedValue() != aVScrollCB .IsChecked() ||
- aTblRegCB .GetSavedValue() != aTblRegCB .IsChecked() ||
- aOutlineCB .GetSavedValue() != aOutlineCB .IsChecked() ||
- aColorLB .GetSavedValue() != aColorLB .GetSelectEntryPos() ||
- aBreakCB .GetSavedValue() != aBreakCB .IsChecked() ||
- aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked())
+ if( pFormulaCB ->GetSavedValue() != pFormulaCB ->IsChecked() ||
+ pNilCB ->GetSavedValue() != pNilCB ->IsChecked() ||
+ pAnnotCB ->GetSavedValue() != pAnnotCB ->IsChecked() ||
+ pValueCB ->GetSavedValue() != pValueCB ->IsChecked() ||
+ pAnchorCB ->GetSavedValue() != pAnchorCB ->IsChecked() ||
+ pClipMarkCB->GetSavedValue() != pClipMarkCB->IsChecked() ||
+ pObjGrfLB ->GetSavedValue() != pObjGrfLB ->GetSelectEntryPos() ||
+ pDiagramLB ->GetSavedValue() != pDiagramLB ->GetSelectEntryPos() ||
+ pDrawLB ->GetSavedValue() != pDrawLB ->GetSelectEntryPos() ||
+ pGridLB ->GetSavedValue() != pGridLB->GetSelectEntryPos() ||
+ pRowColHeaderCB->GetSavedValue() != pRowColHeaderCB->IsChecked() ||
+ pHScrollCB ->GetSavedValue() != pHScrollCB ->IsChecked() ||
+ pVScrollCB ->GetSavedValue() != pVScrollCB ->IsChecked() ||
+ pTblRegCB ->GetSavedValue() != pTblRegCB ->IsChecked() ||
+ pOutlineCB ->GetSavedValue() != pOutlineCB ->IsChecked() ||
+ pColorLB ->GetSavedValue() != pColorLB ->GetSelectEntryPos() ||
+ pBreakCB ->GetSavedValue() != pBreakCB ->IsChecked() ||
+ pGuideLineCB ->GetSavedValue() != pGuideLineCB ->IsChecked())
{
- pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
- aColorLB.GetSelectEntry() );
+ pLocalOptions->SetGridColor( pColorLB->GetSelectEntryColor(),
+ pColorLB->GetSelectEntry() );
rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions));
bRet = sal_True;
}
- if(aRangeFindCB.GetSavedValue() != aRangeFindCB.IsChecked())
+ if(pRangeFindCB->GetSavedValue() != pRangeFindCB->IsChecked())
{
- rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, aRangeFindCB.IsChecked()));
+ rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked()));
bRet = sal_True;
}
- if(aSyncZoomCB.GetSavedValue() != aSyncZoomCB.IsChecked())
+ if(pSyncZoomCB->GetSavedValue() != pSyncZoomCB->IsChecked())
{
- rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, aSyncZoomCB.IsChecked()));
+ rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked()));
bRet = sal_True;
}
@@ -177,54 +163,54 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
((const ScTpViewItem*)pItem)->GetViewOptions() );
else
pLocalOptions = new ScViewOptions;
- aFormulaCB .Check(pLocalOptions->GetOption(VOPT_FORMULAS));
- aNilCB .Check(pLocalOptions->GetOption(VOPT_NULLVALS));
- aAnnotCB .Check(pLocalOptions->GetOption(VOPT_NOTES));
- aValueCB .Check(pLocalOptions->GetOption(VOPT_SYNTAX));
- aAnchorCB .Check(pLocalOptions->GetOption(VOPT_ANCHOR));
- aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
-
- aObjGrfLB .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
- aDiagramLB .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
- aDrawLB .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
-
- aRowColHeaderCB.Check( pLocalOptions->GetOption(VOPT_HEADER) );
- aHScrollCB .Check( pLocalOptions->GetOption(VOPT_HSCROLL) );
- aVScrollCB .Check( pLocalOptions->GetOption(VOPT_VSCROLL) );
- aTblRegCB .Check( pLocalOptions->GetOption(VOPT_TABCONTROLS) );
- aOutlineCB .Check( pLocalOptions->GetOption(VOPT_OUTLINER) );
+ pFormulaCB ->Check(pLocalOptions->GetOption(VOPT_FORMULAS));
+ pNilCB ->Check(pLocalOptions->GetOption(VOPT_NULLVALS));
+ pAnnotCB ->Check(pLocalOptions->GetOption(VOPT_NOTES));
+ pValueCB ->Check(pLocalOptions->GetOption(VOPT_SYNTAX));
+ pAnchorCB ->Check(pLocalOptions->GetOption(VOPT_ANCHOR));
+ pClipMarkCB->Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
+
+ pObjGrfLB ->SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
+ pDiagramLB ->SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
+ pDrawLB ->SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
+
+ pRowColHeaderCB->Check( pLocalOptions->GetOption(VOPT_HEADER) );
+ pHScrollCB->Check( pLocalOptions->GetOption(VOPT_HSCROLL) );
+ pVScrollCB->Check( pLocalOptions->GetOption(VOPT_VSCROLL) );
+ pTblRegCB ->Check( pLocalOptions->GetOption(VOPT_TABCONTROLS) );
+ pOutlineCB->Check( pLocalOptions->GetOption(VOPT_OUTLINER) );
InitGridOpt();
- aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
- aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
+ pBreakCB->Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
+ pGuideLineCB->Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
- aRangeFindCB.Check(((const SfxBoolItem*)pItem)->GetValue());
+ pRangeFindCB->Check(((const SfxBoolItem*)pItem)->GetValue());
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem))
- aSyncZoomCB.Check(((const SfxBoolItem*)pItem)->GetValue());
-
- aRangeFindCB.SaveValue();
- aSyncZoomCB.SaveValue();
-
- aFormulaCB .SaveValue();
- aNilCB .SaveValue();
- aAnnotCB .SaveValue();
- aValueCB .SaveValue();
- aAnchorCB .SaveValue();
- aClipMarkCB .SaveValue();
- aObjGrfLB .SaveValue();
- aDiagramLB .SaveValue();
- aDrawLB .SaveValue();
- aRowColHeaderCB .SaveValue();
- aHScrollCB .SaveValue();
- aVScrollCB .SaveValue();
- aTblRegCB .SaveValue();
- aOutlineCB .SaveValue();
- aGridLB .SaveValue();
- aColorLB .SaveValue();
- aBreakCB .SaveValue();
- aGuideLineCB .SaveValue();
+ pSyncZoomCB->Check(((const SfxBoolItem*)pItem)->GetValue());
+
+ pRangeFindCB->SaveValue();
+ pSyncZoomCB->SaveValue();
+
+ pFormulaCB->SaveValue();
+ pNilCB->SaveValue();
+ pAnnotCB->SaveValue();
+ pValueCB->SaveValue();
+ pAnchorCB->SaveValue();
+ pClipMarkCB->SaveValue();
+ pObjGrfLB->SaveValue();
+ pDiagramLB->SaveValue();
+ pDrawLB->SaveValue();
+ pRowColHeaderCB->SaveValue();
+ pHScrollCB->SaveValue();
+ pVScrollCB->SaveValue();
+ pTblRegCB->SaveValue();
+ pOutlineCB->SaveValue();
+ pGridLB->SaveValue();
+ pColorLB->SaveValue();
+ pBreakCB->SaveValue();
+ pGuideLineCB->SaveValue();
}
void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
@@ -247,9 +233,9 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
ScVObjMode eMode = ScVObjMode(nSelPos);
ScVObjType eType = VOBJ_TYPE_OLE;
- if ( pLb == &aDiagramLB )
+ if ( pLb == pDiagramLB )
eType = VOBJ_TYPE_CHART;
- else if ( pLb == &aDrawLB )
+ else if ( pLb == pDrawLB )
eType = VOBJ_TYPE_DRAW;
pLocalOptions->SetObjMode( eType, eMode );
@@ -262,19 +248,19 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
ScViewOption eOption = VOPT_FORMULAS;
sal_Bool bChecked = pBtn->IsChecked();
- if ( &aFormulaCB == pBtn ) eOption = VOPT_FORMULAS;
- else if ( &aNilCB == pBtn ) eOption = VOPT_NULLVALS;
- else if ( &aAnnotCB == pBtn ) eOption = VOPT_NOTES;
- else if ( &aValueCB == pBtn ) eOption = VOPT_SYNTAX;
- else if ( &aAnchorCB == pBtn ) eOption = VOPT_ANCHOR;
- else if ( &aClipMarkCB == pBtn ) eOption = VOPT_CLIPMARKS;
- else if ( &aVScrollCB == pBtn ) eOption = VOPT_VSCROLL;
- else if ( &aHScrollCB == pBtn ) eOption = VOPT_HSCROLL;
- else if ( &aTblRegCB == pBtn ) eOption = VOPT_TABCONTROLS;
- else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER;
- else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS;
- else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES;
- else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
+ if ( pFormulaCB == pBtn ) eOption = VOPT_FORMULAS;
+ else if ( pNilCB == pBtn ) eOption = VOPT_NULLVALS;
+ else if ( pAnnotCB == pBtn ) eOption = VOPT_NOTES;
+ else if ( pValueCB == pBtn ) eOption = VOPT_SYNTAX;
+ else if ( pAnchorCB == pBtn ) eOption = VOPT_ANCHOR;
+ else if ( pClipMarkCB == pBtn ) eOption = VOPT_CLIPMARKS;
+ else if ( pVScrollCB == pBtn ) eOption = VOPT_VSCROLL;
+ else if ( pHScrollCB == pBtn ) eOption = VOPT_HSCROLL;
+ else if ( pTblRegCB == pBtn ) eOption = VOPT_TABCONTROLS;
+ else if ( pOutlineCB == pBtn ) eOption = VOPT_OUTLINER;
+ else if ( pBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS;
+ else if ( pGuideLineCB == pBtn ) eOption = VOPT_HELPLINES;
+ else if ( pRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
pLocalOptions->SetOption( eOption, bChecked );
@@ -290,7 +276,7 @@ void ScTpContentOptions::InitGridOpt()
if ( bGrid || bGridOnTop )
{
- aColorFT.Enable(), aColorLB.Enable();
+ pColorFT->Enable(), pColorLB->Enable();
if ( !bGridOnTop )
nSelPos = 0;
else
@@ -298,13 +284,13 @@ void ScTpContentOptions::InitGridOpt()
}
else
{
- aColorFT.Disable(), aColorLB.Disable();
+ pColorFT->Disable(), pColorLB->Disable();
nSelPos = 2;
}
- aGridLB.SelectEntryPos (nSelPos);
+ pGridLB->SelectEntryPos (nSelPos);
- if ( aColorLB.GetEntryCount() == 0 )
+ if ( pColorLB->GetEntryCount() == 0 )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
// there might be another DocShell here
@@ -325,7 +311,7 @@ void ScTpContentOptions::InitGridOpt()
//------------------------------------------------------
- aColorLB.SetUpdateMode( false );
+ pColorLB->SetUpdateMode( false );
// items from ColorTable
@@ -333,17 +319,17 @@ void ScTpContentOptions::InitGridOpt()
for ( long n=0; n<nCount; n++ )
{
XColorEntry* pEntry = pColorList->GetColor(n);
- aColorLB.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
+ pColorLB->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
// default GridColor
Color aStdCol( SC_STD_GRIDCOLOR ); // same default as in ScViewOptions
if ( LISTBOX_ENTRY_NOTFOUND ==
- aColorLB.GetEntryPos( aStdCol ) )
- aColorLB.InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) );
+ pColorLB->GetEntryPos( aStdCol ) )
+ pColorLB->InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) );
- aColorLB.SetUpdateMode( sal_True );
+ pColorLB->SetUpdateMode( sal_True );
Invalidate();
}
@@ -352,12 +338,12 @@ void ScTpContentOptions::InitGridOpt()
String aName;
Color aCol = pLocalOptions->GetGridColor( &aName );
- nSelPos = aColorLB.GetEntryPos( aCol );
+ nSelPos = pColorLB->GetEntryPos( aCol );
if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
- aColorLB.SelectEntryPos( nSelPos );
+ pColorLB->SelectEntryPos( nSelPos );
else
- aColorLB.SelectEntryPos( aColorLB.InsertEntry( aCol, aName ) );
+ pColorLB->SelectEntryPos( pColorLB->InsertEntry( aCol, aName ) );
}
IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
@@ -366,8 +352,8 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
sal_Bool bGrid = ( nSelPos <= 1 );
sal_Bool bGridOnTop = ( nSelPos == 1 );
- aColorFT.Enable(bGrid);
- aColorLB.Enable(bGrid);
+ pColorFT->Enable(bGrid);
+ pColorLB->Enable(bGrid);
pLocalOptions->SetOption( VOPT_GRID, bGrid );
pLocalOptions->SetOption( VOPT_GRID_ONTOP, bGridOnTop );
return 0;
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
deleted file mode 100644
index 9fc7478..0000000
--- a/sc/source/ui/src/optdlg.src
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "optdlg.hrc"
-
-TabPage RID_SCPAGE_CONTENT
-{
- HelpId = HID_SCPAGE_CONTENT ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedLine GB_LINES
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 121 , 8 ) ;
- Text [ en-US ] = "Visual aids";
- };
- FixedText FT_GRID
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:FT_GRID";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 40 , 8 ) ;
- Text [ en-US ] = "~Grid lines" ;
- };
- ListBox LB_GRID
- {
- HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_GRID";
- Pos = MAP_APPFONT ( 54 , 12 ) ;
- Size = MAP_APPFONT ( 70 , 46 ) ;
- Border = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Show" ; Default ; > ;
- < "Show on colored cells" ; Default ; > ;
- < "Hide" ; Default ; > ;
- };
-
- };
- FixedText FT_COLOR
- {
- Pos = MAP_APPFONT ( 21 , 28 ) ;
- Size = MAP_APPFONT ( 31 , 8 ) ;
- Text [ en-US ] = "~Color" ;
- };
- ListBox LB_COLOR
- {
- HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_COLOR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 54 , 26 ) ;
- Size = MAP_APPFONT ( 70 , 86 ) ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- };
- CheckBox CB_PAGEBREAKS
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_PAGEBREAKS";
- Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Page breaks" ;
- };
- CheckBox CB_GUIDELINE
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE";
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Helplines ~While Moving";
- };
- FixedLine FL_SEPARATOR1
- {
- Pos = MAP_APPFONT ( 130 , 14 ) ;
- Size = MAP_APPFONT ( 1 , 88 ) ;
- };
- FixedLine GB_DISPLAY
- {
- Pos = MAP_APPFONT ( 133 , 3 ) ;
- Size = MAP_APPFONT ( 121 , 8 ) ;
- Text [ en-US ] = "Display" ;
- };
- CheckBox CB_FORMULA
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_FORMULA";
- Pos = MAP_APPFONT ( 139 , 14 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Formulas" ;
- };
- CheckBox CB_NIL
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_NIL";
- Pos = MAP_APPFONT ( 139 , 27 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Zero val~ues" ;
- };
- CheckBox CB_ANNOT
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANNOT";
- Pos = MAP_APPFONT ( 139 , 40 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Comment indicator" ;
- };
- CheckBox CB_VALUE
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_VALUE";
- Pos = MAP_APPFONT ( 139 , 53 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Value h~ighlighting" ;
- };
- CheckBox CB_ANCHOR
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANCHOR";
- Pos = MAP_APPFONT ( 139 , 66 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Anchor" ;
- };
- CheckBox CB_CLIP
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_CLIP";
- Pos = MAP_APPFONT ( 139 , 79 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Te~xt overflow" ;
- };
- CheckBox CB_RFIND
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_RFIND";
- Pos = MAP_APPFONT ( 139 , 92 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Show references in color" ;
- };
- FixedLine GB_OBJECT
- {
- Pos = MAP_APPFONT ( 6 , 72 ) ;
- Size = MAP_APPFONT ( 121 , 8 ) ;
- Text [ en-US ] = "Objects" ;
- };
- FixedText FT_OBJGRF
- {
- Pos = MAP_APPFONT ( 12 , 85 ) ;
- Size = MAP_APPFONT ( 68 , 8 ) ;
- Text [ en-US ] = "Ob~jects/Graphics" ;
- };
- ListBox LB_OBJGRF
- {
- HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_OBJGRF";
- Pos = MAP_APPFONT ( 84 , 83 ) ;
- Size = MAP_APPFONT ( 40 , 46 ) ;
- Border = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Show" ; Default ; > ;
- < "Hide" ; Default ; > ;
- };
- };
- FixedText FT_DIAGRAM
- {
- Pos = MAP_APPFONT ( 12 , 101 ) ;
- Size = MAP_APPFONT ( 68 , 8 ) ;
- Text [ en-US ] = "Cha~rts" ;
- };
- ListBox LB_DIAGRAM
- {
- HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DIAGRAM";
- Pos = MAP_APPFONT ( 84 , 99 ) ;
- Size = MAP_APPFONT ( 40 , 46 ) ;
- Border = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Show" ; Default ; > ;
- < "Hide" ; Default ; > ;
- };
-
- };
- FixedText FT_DRAW
- {
- Pos = MAP_APPFONT ( 12 , 117 ) ;
- Size = MAP_APPFONT ( 68 , 8 ) ;
- Text [ en-US ] = "~Drawing objects" ;
- };
- ListBox LB_DRAW
- {
- HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DRAW";
- Pos = MAP_APPFONT ( 84 , 115 ) ;
- Size = MAP_APPFONT ( 40 , 46 ) ;
- Border = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Show" ; Default ; > ;
- < "Hide" ; Default ; > ;
- };
-
- };
- FixedLine GB_ZOOM
- {
- Pos = MAP_APPFONT ( 6 , 132 ) ;
- Size = MAP_APPFONT ( 121 , 8 ) ;
- Text [ en-US ] = "Zoom";
- };
- CheckBox CB_SYNCZOOM
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_SYNCZOOM";
- Pos = MAP_APPFONT ( 12 , 143 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "S~ynchronize sheets" ;
- };
- FixedLine FL_SEPARATOR2
- {
- Pos = MAP_APPFONT ( 130 , 119 ) ;
- Size = MAP_APPFONT ( 1 , 62 ) ;
- };
- FixedLine GB_WINDOW
- {
- Pos = MAP_APPFONT ( 133 , 108 ) ;
- Size = MAP_APPFONT ( 121 , 8 ) ;
- Text [ en-US ] = "Window" ;
- };
- CheckBox CB_ROWCOLHEADER
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_ROWCOLHEADER";
- Pos = MAP_APPFONT ( 139 , 119 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Colu~mn/row headers" ;
- };
- CheckBox CB_HSCROLL
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_HSCROLL";
- Pos = MAP_APPFONT ( 139 , 132 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Hori~zontal scroll bar" ;
- };
- CheckBox CB_VSCROLL
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_VSCROLL";
- Pos = MAP_APPFONT ( 139 , 145 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Vertical scroll bar" ;
- };
- CheckBox CB_TBLREG
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_TBLREG";
- Pos = MAP_APPFONT ( 139 , 158 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "Sh~eet tabs" ;
- };
- CheckBox CB_OUTLINE
- {
- HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_OUTLINE";
- Pos = MAP_APPFONT ( 139 , 171 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Text [ en-US ] = "~Outline symbols" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
new file mode 100644
index 0000000..39847dd
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="TpViewPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="border_width">6</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="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">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="GtkComboBox" id="grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item>Show</item>
+ <item>Show on colored cells</item>
+ <item>Hide</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-ColorLB" id="color">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkCheckButton" id="break">
+ <property name="label" translatable="yes">_Page breaks</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">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="guideline">
+ <property name="label" translatable="yes">Helplines _while moving</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">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="grid_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Grid lines:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">grid</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="GtkLabel" id="color_label">
+ <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">_Color:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">color</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>
+ </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">Visual aids</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="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="GtkComboBox" id="objgrf">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item>Show</item>
+ <item>Hide</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="diagram">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item>Show</item>
+ <item>Hide</item>
+ </items>
+ </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="GtkComboBox" id="draw">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item>Show</item>
+ <item>Hide</item>
+ </items>
+ </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="objgrf_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ob_jects/Graphics:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">objgrf</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="GtkLabel" id="diagram_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Cha_rts:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">diagram</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="draw_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Drawing objects:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">draw</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">Objects</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>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">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="GtkCheckButton" id="synczoom">
+ <property name="label" translatable="yes">S_ynchronize sheets</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>
+ </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">Zoom</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">2</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="GtkBox" id="box3">
+ <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="GtkFrame" id="frame4">
+ <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="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">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">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="formula">
+ <property name="label" translatable="yes">_Formulas</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="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="nil">
+ <property name="label" translatable="yes">Zero val_ues</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="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="annot">
+ <property name="label" translatable="yes">_Comment indicator</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="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="value">
+ <property name="label" translatable="yes">Value h_ighlighting</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="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>
+ <child>
+ <object class="GtkCheckButton" id="anchor">
+ <property name="label" translatable="yes">_Anchor</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="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="clipmark">
+ <property name="label" translatable="yes">Te_xt overflow</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="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="rangefind">
+ <property name="label" translatable="yes">_Show references in color</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="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Display</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="frame5">
+ <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="alignment5">
+ <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="grid4">
+ <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="rowcolheader">
+ <property name="label" translatable="yes">Colu_mn/row headers</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="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="hscroll">
+ <property name="label" translatable="yes">Hori_zontal scroll bar</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="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="vscroll">
+ <property name="label" translatable="yes">_Vertical scroll bar</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="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="tblreg">
+ <property name="label" translatable="yes">Sh_eet tabs</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="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>
+ <child>
+ <object class="GtkCheckButton" id="outline">
+ <property name="label" translatable="yes">_Outline symbols</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="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Window</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">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list