[Libreoffice-commits] core.git: include/svx sd/source svx/AllLangResTarget_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
Csikós Tamás
csks.tomi at gmail.com
Mon Jul 8 07:48:29 PDT 2013
include/svx/optgrid.hxx | 55 +--
sd/source/ui/dlg/tpoption.cxx | 69 +--
svx/AllLangResTarget_svx.mk | 1
svx/UIConfig_svx.mk | 1
svx/source/dialog/optgrid.cxx | 182 ++++------
svx/source/dialog/optgrid.hrc | 58 ---
svx/source/dialog/optgrid.src | 332 ------------------
svx/uiconfig/ui/optgridpage.ui | 717 +++++++++++++++++++++++++++++++++++++++++
8 files changed, 842 insertions(+), 573 deletions(-)
New commits:
commit 3cb6587abbf6888ac9fb3b0cccc9a5aa0dc29b55
Author: Csikós Tamás <csks.tomi at gmail.com>
Date: Sun Jul 7 13:40:53 2013 +0200
modern .ui widgetlayout for optgrid
Change-Id: Ia84541a8ba2e09ca89962e1ed477b90819cc3f48
Reviewed-on: https://gerrit.libreoffice.org/4755
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 777a61a..9da5493 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -111,46 +111,29 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet );
private:
- CheckBox aCbxUseGridsnap;
- CheckBox aCbxGridVisible;
+ CheckBox* pCbxUseGridsnap;
+ CheckBox* pCbxGridVisible;
- FixedLine aFlResolution;
- FixedText aFtDrawX;
- MetricField aMtrFldDrawX;
- FixedText aFtDrawY;
- MetricField aMtrFldDrawY;
+ MetricField* pMtrFldDrawX;
+ MetricField* pMtrFldDrawY;
- FixedLine aFlDivision;
- FixedText aFtDivisionX;
- NumericField aNumFldDivisionX;
- FixedText aDivisionPointX;
-
- FixedText aFtDivisionY;
- NumericField aNumFldDivisionY;
- FixedText aDivisionPointY;
-
- CheckBox aCbxSynchronize;
- FixedLine aGrpDrawGrid;
+ NumericField* pNumFldDivisionX;
+ NumericField* pNumFldDivisionY;
+ CheckBox* pCbxSynchronize;
protected:
- //these controls are used in draw and impress
- FixedLine aGrpSnap;
- CheckBox aCbxSnapHelplines;
- CheckBox aCbxSnapBorder;
- CheckBox aCbxSnapFrame;
- CheckBox aCbxSnapPoints;
- FixedText aFtSnapArea;
- MetricField aMtrFldSnapArea;
-
- FixedLine aSeparatorFL;
-
- FixedLine aGrpOrtho;
- CheckBox aCbxOrtho;
- CheckBox aCbxBigOrtho;
- CheckBox aCbxRotate;
- MetricField aMtrFldAngle;
- FixedText aFtBezAngle;
- MetricField aMtrFldBezAngle;
+ //these controls are used in draw and impress
+ CheckBox* pCbxSnapHelplines;
+ CheckBox* pCbxSnapBorder;
+ CheckBox* pCbxSnapFrame;
+ CheckBox* pCbxSnapPoints;
+ MetricField* pMtrFldSnapArea;
+
+ CheckBox* pCbxOrtho;
+ CheckBox* pCbxBigOrtho;
+ CheckBox* pCbxRotate;
+ MetricField* pMtrFldAngle;
+ MetricField* pMtrFldBezAngle;
private:
sal_Bool bAttrModified;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index a0b7cba..3e32ed3 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -49,21 +49,16 @@ using namespace ::com::sun::star::uno;
SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ) :
SvxGridTabPage(pParent, rInAttrs)
{
- aGrpSnap.Show();
- aCbxSnapHelplines.Show();
- aCbxSnapBorder.Show();
- aCbxSnapFrame.Show();
- aCbxSnapPoints.Show();
- aFtSnapArea.Show();
- aMtrFldSnapArea.Show();
- aGrpOrtho.Show();
- aCbxOrtho.Show();
- aCbxBigOrtho.Show();
- aCbxRotate.Show();
- aMtrFldAngle.Show();
- aFtBezAngle.Show();
- aMtrFldBezAngle.Show();
- aSeparatorFL.Show();
+ pCbxSnapHelplines->Show();
+ pCbxSnapBorder->Show();
+ pCbxSnapFrame->Show();
+ pCbxSnapPoints->Show();
+ pMtrFldSnapArea->Show();
+ pCbxOrtho->Show();
+ pCbxBigOrtho->Show();
+ pCbxRotate->Show();
+ pMtrFldAngle->Show();
+ pMtrFldBezAngle->Show();
}
// -----------------------------------------------------------------------
@@ -79,16 +74,16 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
SvxGridTabPage::FillItemSet(rAttrs);
SdOptionsSnapItem aOptsItem( ATTR_OPTIONS_SNAP );
- aOptsItem.GetOptionsSnap().SetSnapHelplines( aCbxSnapHelplines.IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapBorder( aCbxSnapBorder.IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapFrame( aCbxSnapFrame.IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapPoints( aCbxSnapPoints.IsChecked() );
- aOptsItem.GetOptionsSnap().SetOrtho( aCbxOrtho.IsChecked() );
- aOptsItem.GetOptionsSnap().SetBigOrtho( aCbxBigOrtho.IsChecked() );
- aOptsItem.GetOptionsSnap().SetRotate( aCbxRotate.IsChecked() );
- aOptsItem.GetOptionsSnap().SetSnapArea( (sal_Int16) aMtrFldSnapArea.GetValue() );
- aOptsItem.GetOptionsSnap().SetAngle( (sal_Int16) aMtrFldAngle.GetValue() );
- aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (sal_Int16) aMtrFldBezAngle.GetValue() );
+ aOptsItem.GetOptionsSnap().SetSnapHelplines( pCbxSnapHelplines->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetSnapBorder( pCbxSnapBorder->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetSnapFrame( pCbxSnapFrame->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetSnapPoints( pCbxSnapPoints->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetOrtho( pCbxOrtho->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetBigOrtho( pCbxBigOrtho->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetRotate( pCbxRotate->IsChecked() );
+ aOptsItem.GetOptionsSnap().SetSnapArea( (sal_Int16) pMtrFldSnapArea->GetValue() );
+ aOptsItem.GetOptionsSnap().SetAngle( (sal_Int16) pMtrFldAngle->GetValue() );
+ aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (sal_Int16) pMtrFldBezAngle->GetValue() );
rAttrs.Put( aOptsItem );
@@ -106,18 +101,18 @@ void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs )
SdOptionsSnapItem aOptsItem( (const SdOptionsSnapItem&) rAttrs.
Get( ATTR_OPTIONS_SNAP ) );
- aCbxSnapHelplines.Check( aOptsItem.GetOptionsSnap().IsSnapHelplines() );
- aCbxSnapBorder.Check( aOptsItem.GetOptionsSnap().IsSnapBorder() );
- aCbxSnapFrame.Check( aOptsItem.GetOptionsSnap().IsSnapFrame() );
- aCbxSnapPoints.Check( aOptsItem.GetOptionsSnap().IsSnapPoints() );
- aCbxOrtho.Check( aOptsItem.GetOptionsSnap().IsOrtho() );
- aCbxBigOrtho.Check( aOptsItem.GetOptionsSnap().IsBigOrtho() );
- aCbxRotate.Check( aOptsItem.GetOptionsSnap().IsRotate() );
- aMtrFldSnapArea.SetValue( aOptsItem.GetOptionsSnap().GetSnapArea() );
- aMtrFldAngle.SetValue( aOptsItem.GetOptionsSnap().GetAngle() );
- aMtrFldBezAngle.SetValue( aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle() );
-
- aCbxRotate.GetClickHdl().Call(0);
+ pCbxSnapHelplines->Check( aOptsItem.GetOptionsSnap().IsSnapHelplines() );
+ pCbxSnapBorder->Check( aOptsItem.GetOptionsSnap().IsSnapBorder() );
+ pCbxSnapFrame->Check( aOptsItem.GetOptionsSnap().IsSnapFrame() );
+ pCbxSnapPoints->Check( aOptsItem.GetOptionsSnap().IsSnapPoints() );
+ pCbxOrtho->Check( aOptsItem.GetOptionsSnap().IsOrtho() );
+ pCbxBigOrtho->Check( aOptsItem.GetOptionsSnap().IsBigOrtho() );
+ pCbxRotate->Check( aOptsItem.GetOptionsSnap().IsRotate() );
+ pMtrFldSnapArea->SetValue( aOptsItem.GetOptionsSnap().GetSnapArea() );
+ pMtrFldAngle->SetValue( aOptsItem.GetOptionsSnap().GetAngle() );
+ pMtrFldBezAngle->SetValue( aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle() );
+
+ pCbxRotate->GetClickHdl().Call(0);
}
// -----------------------------------------------------------------------
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index adc7f97..270570a 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/langbox.src \
svx/source/dialog/language.src \
svx/source/dialog/linkwarn.src \
- svx/source/dialog/optgrid.src \
svx/source/dialog/passwd.src \
svx/source/dialog/prtqry.src \
svx/source/dialog/ruler.src \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f293a0d..8e842a8 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 664c70e..662f4ec 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -26,7 +26,6 @@
#include <svx/dialmgr.hxx>
#include "svx/optgrid.hxx"
#include <svx/dialogs.hrc>
-#include "optgrid.hrc"
#include "svx/dlgutil.hxx"
// local functions
@@ -129,92 +128,57 @@ SfxItemPresentation SvxGridItem::GetPresentation
// TabPage Screen Settings
SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
- SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRID ), rCoreSet ),
-
- aCbxUseGridsnap ( this, SVX_RES( CBX_USE_GRIDSNAP ) ),
- aCbxGridVisible ( this, SVX_RES( CBX_GRID_VISIBLE ) ),
-
- aFlResolution ( this, SVX_RES( FL_RESOLUTION ) ),
- aFtDrawX ( this, SVX_RES( FT_DRAW_X ) ),
- aMtrFldDrawX ( this, SVX_RES( MTR_FLD_DRAW_X ) ),
- aFtDrawY ( this, SVX_RES( FT_DRAW_Y ) ),
- aMtrFldDrawY ( this, SVX_RES( MTR_FLD_DRAW_Y ) ),
-
- aFlDivision ( this, SVX_RES( FL_DIVISION ) ),
- aFtDivisionX( this, SVX_RES( FT_DIVISION_X) ),
- aNumFldDivisionX( this, SVX_RES( NUM_FLD_DIVISION_X ) ),
- aDivisionPointX( this, SVX_RES( FT_HORZ_POINTS) ),
-
- aFtDivisionY( this, SVX_RES( FT_DIVISION_Y) ),
- aNumFldDivisionY( this, SVX_RES( NUM_FLD_DIVISION_Y ) ),
- aDivisionPointY( this, SVX_RES( FT_VERT_POINTS) ),
-
- aCbxSynchronize ( this, SVX_RES( CBX_SYNCHRONIZE ) ),
- aGrpDrawGrid ( this, SVX_RES( GRP_DRAWGRID ) ),
-
- aGrpSnap ( this, SVX_RES( GRP_SNAP ) ),
- aCbxSnapHelplines ( this, SVX_RES( CBX_SNAP_HELPLINES ) ),
- aCbxSnapBorder ( this, SVX_RES( CBX_SNAP_BORDER ) ),
- aCbxSnapFrame ( this, SVX_RES( CBX_SNAP_FRAME ) ),
- aCbxSnapPoints ( this, SVX_RES( CBX_SNAP_POINTS ) ),
- aFtSnapArea ( this, SVX_RES( FT_SNAP_AREA ) ),
- aMtrFldSnapArea ( this, SVX_RES( MTR_FLD_SNAP_AREA ) ),
-
- aSeparatorFL ( this, SVX_RES( FL_SEPARATOR ) ),
-
- aGrpOrtho ( this, SVX_RES( GRP_ORTHO ) ),
- aCbxOrtho ( this, SVX_RES( CBX_ORTHO ) ),
- aCbxBigOrtho ( this, SVX_RES( CBX_BIGORTHO ) ),
- aCbxRotate ( this, SVX_RES( CBX_ROTATE ) ),
- aMtrFldAngle ( this, SVX_RES( MTR_FLD_ANGLE ) ),
- aFtBezAngle ( this, SVX_RES( FT_BEZ_ANGLE ) ),
- aMtrFldBezAngle ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ),
-
+ SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", rCoreSet ),
bAttrModified( sal_False )
{
+ get(pCbxUseGridsnap,"usegridsnap");
+ get(pCbxGridVisible,"gridvisible");
+ get(pMtrFldDrawX,"mtrflddrawx");
+ get(pMtrFldDrawY,"mtrflddrawy");
+ get(pNumFldDivisionX,"numflddivisionx");
+ get(pNumFldDivisionY,"numflddivisiony");
+ get(pCbxSynchronize,"synchronize");
+
+ get(pCbxSnapHelplines,"snaphelplines");
+ get(pCbxSnapBorder,"snapborder");
+ get(pCbxSnapFrame,"snapframe");
+ get(pCbxSnapPoints,"snappoints");
+ get(pMtrFldSnapArea,"mtrfldsnaparea");
+ get(pCbxOrtho,"ortho");
+ get(pCbxBigOrtho,"bigortho");
+ get(pCbxRotate,"rotate");
+ get(pMtrFldAngle,"mtrfldangle");
+ get(pMtrFldBezAngle,"mtrfldbezangle");
+
// This page requires exchange Support
SetExchangeSupport();
- FreeResource();
-
- aDivisionPointY.SetText(aDivisionPointX.GetText());
// Set Metrics
FieldUnit eFUnit = GetModuleFieldUnit( rCoreSet );
long nFirst, nLast, nMin, nMax;
- lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
- lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
+ lcl_GetMinMax(*pMtrFldDrawX , nFirst, nLast, nMin, nMax);
+ SetFieldUnit( *pMtrFldDrawX , eFUnit, sal_True );
+ lcl_SetMinMax(*pMtrFldDrawX , nFirst, nLast, nMin, nMax);
- lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
- lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
+ lcl_GetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
+ SetFieldUnit( *pMtrFldDrawY, eFUnit, sal_True );
+ lcl_SetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
- aCbxRotate.SetClickHdl( LINK( this, SvxGridTabPage, ClickRotateHdl_Impl ) );
+ pCbxRotate->SetClickHdl( LINK( this, SvxGridTabPage, ClickRotateHdl_Impl ) );
Link aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl );
- aCbxUseGridsnap.SetClickHdl( aLink );
- aCbxSynchronize.SetClickHdl( aLink );
- aCbxGridVisible.SetClickHdl( aLink );
- aMtrFldDrawX.SetModifyHdl(
+ pCbxUseGridsnap->SetClickHdl( aLink );
+ pCbxSynchronize->SetClickHdl( aLink );
+ pCbxGridVisible->SetClickHdl( aLink );
+ pMtrFldDrawX->SetModifyHdl(
LINK( this, SvxGridTabPage, ChangeDrawHdl_Impl ) );
- aMtrFldDrawY.SetModifyHdl(
+ pMtrFldDrawY->SetModifyHdl(
LINK( this, SvxGridTabPage, ChangeDrawHdl_Impl ) );
- aNumFldDivisionX.SetModifyHdl(
+ pNumFldDivisionX->SetModifyHdl(
LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
- aNumFldDivisionY.SetModifyHdl(
+ pNumFldDivisionY->SetModifyHdl(
LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
-
- OUString sFlResolution( aFlResolution.GetDisplayText() );
- OUString sFtDrawX(aFtDrawX.GetDisplayText());
- OUString sFtDrawY(aFtDrawY.GetDisplayText());
- aMtrFldDrawX.SetAccessibleName( sFtDrawX + sFlResolution );
- aMtrFldDrawY.SetAccessibleName( sFtDrawY + sFlResolution );
- OUString sFlDivision( aFlDivision.GetDisplayText() );
- OUString sFtDivisionX(aFtDivisionX.GetDisplayText());
- OUString sFtDivisionY(aFtDivisionY.GetDisplayText());
- aNumFldDivisionX.SetAccessibleName( sFtDivisionX + sFlDivision );
- aNumFldDivisionY.SetAccessibleName( sFtDivisionY + sFlDivision );
}
//------------------------------------------------------------------------
@@ -232,19 +196,19 @@ sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
{
SvxGridItem aGridItem( SID_ATTR_GRID_OPTIONS );
- aGridItem.bUseGridsnap = aCbxUseGridsnap.IsChecked();
- aGridItem.bSynchronize = aCbxSynchronize.IsChecked();
- aGridItem.bGridVisible = aCbxGridVisible.IsChecked();
+ aGridItem.bUseGridsnap = pCbxUseGridsnap->IsChecked();
+ aGridItem.bSynchronize = pCbxSynchronize->IsChecked();
+ aGridItem.bGridVisible = pCbxGridVisible->IsChecked();
SfxMapUnit eUnit =
rCoreSet.GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) );
- long nX =GetCoreValue( aMtrFldDrawX, eUnit );
- long nY = GetCoreValue( aMtrFldDrawY, eUnit );
+ long nX =GetCoreValue( *pMtrFldDrawX, eUnit );
+ long nY = GetCoreValue( *pMtrFldDrawY, eUnit );
aGridItem.nFldDrawX = (sal_uInt32) nX;
aGridItem.nFldDrawY = (sal_uInt32) nY;
- aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1);
- aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1);
+ aGridItem.nFldDivisionX = static_cast<long>(pNumFldDivisionX->GetValue()-1);
+ aGridItem.nFldDivisionY = static_cast<long>(pNumFldDivisionY->GetValue()-1);
rCoreSet.Put( aGridItem );
}
@@ -261,20 +225,20 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
(const SfxPoolItem**)&pAttr ))
{
const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr;
- aCbxUseGridsnap.Check( pGridAttr->bUseGridsnap == 1 );
- aCbxSynchronize.Check( pGridAttr->bSynchronize == 1 );
- aCbxGridVisible.Check( pGridAttr->bGridVisible == 1 );
+ pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap == 1 );
+ pCbxSynchronize->Check( pGridAttr->bSynchronize == 1 );
+ pCbxGridVisible->Check( pGridAttr->bGridVisible == 1 );
SfxMapUnit eUnit =
rSet.GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) );
- SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
- SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
+ SetMetricValue( *pMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
+ SetMetricValue( *pMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
- aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX+1 );
- aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY+1 );
+ pNumFldDivisionX->SetValue( pGridAttr->nFldDivisionX+1 );
+ pNumFldDivisionY->SetValue( pGridAttr->nFldDivisionY+1 );
}
- ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
+ ChangeGridsnapHdl_Impl( pCbxUseGridsnap );
bAttrModified = sal_False;
}
@@ -287,9 +251,9 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
(const SfxPoolItem**)&pAttr ))
{
const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr;
- aCbxUseGridsnap.Check( pGridAttr->bUseGridsnap == 1 );
+ pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap == 1 );
- ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
+ ChangeGridsnapHdl_Impl( pCbxUseGridsnap );
}
// Metric Change if necessary (as TabPage is in the dialog, where the
@@ -301,23 +265,23 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
FieldUnit eFUnit = (FieldUnit)(long)pItem->GetValue();
- if( eFUnit != aMtrFldDrawX.GetUnit() )
+ if( eFUnit != pMtrFldDrawX->GetUnit() )
{
// Set Metrics
long nFirst, nLast, nMin, nMax;
- long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) ));
+ long nVal = static_cast<long>(pMtrFldDrawX->Denormalize( pMtrFldDrawX->GetValue( FUNIT_TWIP ) ));
- lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
- lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
+ lcl_GetMinMax(*pMtrFldDrawX, nFirst, nLast, nMin, nMax);
+ SetFieldUnit( *pMtrFldDrawX, eFUnit, sal_True );
+ lcl_SetMinMax(*pMtrFldDrawX, nFirst, nLast, nMin, nMax);
- aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP );
+ pMtrFldDrawX->SetValue( pMtrFldDrawX->Normalize( nVal ), FUNIT_TWIP );
- nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) ));
- lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
- lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
- aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP );
+ nVal = static_cast<long>(pMtrFldDrawY->Denormalize( pMtrFldDrawY->GetValue( FUNIT_TWIP ) ));
+ lcl_GetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
+ SetFieldUnit(*pMtrFldDrawY, eFUnit, sal_True );
+ lcl_SetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
+ pMtrFldDrawY->SetValue( pMtrFldDrawY->Normalize( nVal ), FUNIT_TWIP );
}
}
@@ -334,12 +298,12 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet )
IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
{
bAttrModified = sal_True;
- if( aCbxSynchronize.IsChecked() )
+ if( pCbxSynchronize->IsChecked() )
{
- if(pField == &aMtrFldDrawX)
- aMtrFldDrawY.SetValue( aMtrFldDrawX.GetValue() );
+ if(pField == pMtrFldDrawX)
+ pMtrFldDrawY->SetValue( pMtrFldDrawX->GetValue() );
else
- aMtrFldDrawX.SetValue( aMtrFldDrawY.GetValue() );
+ pMtrFldDrawX->SetValue( pMtrFldDrawY->GetValue() );
}
return 0;
}
@@ -347,10 +311,10 @@ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl)
{
- if( aCbxRotate.IsChecked() )
- aMtrFldAngle.Enable();
+ if( pCbxRotate->IsChecked() )
+ pMtrFldAngle->Enable();
else
- aMtrFldAngle.Disable();
+ pMtrFldAngle->Disable();
return( 0L );
}
@@ -360,12 +324,12 @@ IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl)
IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
{
bAttrModified = sal_True;
- if( aCbxSynchronize.IsChecked() )
+ if( pCbxSynchronize->IsChecked() )
{
- if(&aNumFldDivisionX == pField)
- aNumFldDivisionY.SetValue( aNumFldDivisionX.GetValue() );
+ if(pNumFldDivisionX == pField)
+ pNumFldDivisionY->SetValue( pNumFldDivisionX->GetValue() );
else
- aNumFldDivisionX.SetValue( aNumFldDivisionY.GetValue() );
+ pNumFldDivisionX->SetValue( pNumFldDivisionY->GetValue() );
}
return 0;
}
diff --git a/svx/source/dialog/optgrid.hrc b/svx/source/dialog/optgrid.hrc
deleted file mode 100644
index d48eb1f..0000000
--- a/svx/source/dialog/optgrid.hrc
+++ /dev/null
@@ -1,58 +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 .
- */
-#ifndef _SVX_OPTGRID_HRC
-#define _SVX_OPTGRID_HRC
-
-//Grid-Page
-#define GRP_DRAWGRID 2
-#define CBX_USE_GRIDSNAP 4
-#define CBX_SYNCHRONIZE 5
-#define CBX_SNAPGRID 7
-#define CBX_GRID_VISIBLE 8
-#define MTR_FLD_DRAW_Y 9
-#define MTR_FLD_DRAW_X 12
-#define NUM_FLD_DIVISION_X 13
-#define NUM_FLD_DIVISION_Y 14
-#define FT_DRAW_X 17
-#define FT_DRAW_Y 18
-#define FL_RESOLUTION 19
-#define FL_DIVISION 20
-#define FT_VERT_POINTS 21
-#define FT_HORZ_POINTS 22
-#define FT_DIVISION_Y 23
-#define FT_DIVISION_X 24
-#define CBX_SNAP_HELPLINES 25
-#define CBX_SNAP_BORDER 26
-#define CBX_SNAP_FRAME 27
-#define CBX_SNAP_POINTS 28
-#define FT_SNAP_AREA 29
-#define MTR_FLD_SNAP_AREA 30
-#define GRP_SNAP 31
-#define CBX_ORTHO 32
-#define CBX_BIGORTHO 33
-#define CBX_ROTATE 34
-#define MTR_FLD_ANGLE 35
-#define FT_BEZ_ANGLE 36
-#define MTR_FLD_BEZ_ANGLE 37
-#define GRP_ORTHO 38
-#define FL_SEPARATOR 39
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src
deleted file mode 100644
index 306cb42..0000000
--- a/svx/source/dialog/optgrid.src
+++ /dev/null
@@ -1,332 +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 <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-#include "optgrid.hrc"
-
-TabPage RID_SVXPAGE_GRID
-{
- HelpId = HID_OPTIONS_GRID ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedLine GRP_DRAWGRID
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Grid" ;
- };
- CheckBox CBX_USE_GRIDSNAP
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 204 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Sn~ap to grid" ;
- };
- CheckBox CBX_GRID_VISIBLE
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE";
- Pos = MAP_APPFONT ( 12 , 27 ) ;
- Size = MAP_APPFONT ( 204 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "V~isible grid" ;
- };
- FixedLine FL_RESOLUTION
- {
- Pos = MAP_APPFONT ( 6 , 45 ) ;
- Size = MAP_APPFONT ( 120 , 8 ) ;
- Text [ en-US ] = "Resolution" ;
- };
- FixedText FT_DRAW_X
- {
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "H~orizontal";
- };
- FixedText FT_DRAW_Y
- {
- Pos = MAP_APPFONT ( 12 , 71 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Vertical";
- };
- MetricField MTR_FLD_DRAW_X
- {
- HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 75 , 54 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 10 ;
- First = 10 ;
- Maximum = 10000 ;
- Last = 10000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 50 ;
- };
- MetricField MTR_FLD_DRAW_Y
- {
- HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 75 , 69 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 10 ;
- First = 10 ;
- Maximum = 10000 ;
- Last = 10000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 50 ;
- };
- FixedLine FL_DIVISION
- {
- Pos = MAP_APPFONT ( 130 , 45 ) ;
- Size = MAP_APPFONT ( 124 , 8 ) ;
- Text [ en-US ] = "Subdivision" ;
- };
- FixedText FT_DIVISION_X
- {
- Pos = MAP_APPFONT ( 136 , 56 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Horizont~al";
- };
- FixedText FT_DIVISION_Y
- {
- Pos = MAP_APPFONT ( 136 , 71 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "V~ertical";
- };
- NumericField NUM_FLD_DIVISION_X
- {
- HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 195 , 54 ) ;
- Size = MAP_APPFONT ( 25 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 99 ;
- Last = 99 ;
- StrictFormat = TRUE ;
- SpinSize = 1 ;
- };
- FixedText FT_HORZ_POINTS
- {
- Pos = MAP_APPFONT ( 223 , 56 ) ;
- Size = MAP_APPFONT ( 29 , 8 ) ;
- Text [ en-US ] = "space(s)" ;
- };
- NumericField NUM_FLD_DIVISION_Y
- {
- HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 195 , 69 ) ;
- Size = MAP_APPFONT ( 25 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 99 ;
- Last = 99 ;
- StrictFormat = TRUE ;
- SpinSize = 1 ;
- };
- FixedText FT_VERT_POINTS
- {
- Pos = MAP_APPFONT ( 223 , 71 ) ;
- Size = MAP_APPFONT ( 29 , 8 ) ;
-
- };
- CheckBox CBX_SYNCHRONIZE
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE";
- Pos = MAP_APPFONT ( 12 , 84 ) ;
- Size = MAP_APPFONT ( 127 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Synchronize a~xes" ;
- };
- FixedLine GRP_SNAP
- {
- Pos = MAP_APPFONT ( 6 , 100 ) ;
- Size = MAP_APPFONT ( 120 , 8 ) ;
- Hide = TRUE;
- Text [ en-US ] = "Snap" ;
- };
-
- CheckBox CBX_SNAP_HELPLINES
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES";
- Pos = MAP_APPFONT ( 12 , 111 ) ;
- Size = MAP_APPFONT ( 106 , 10 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Text [ en-US ] = "To snap lines" ;
- };
- CheckBox CBX_SNAP_BORDER
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER";
- Hide = TRUE;
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 125 ) ;
- Size = MAP_APPFONT ( 106 , 10 ) ;
- Text [ en-US ] = "To the ~page margins" ;
- };
- CheckBox CBX_SNAP_FRAME
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME";
- Pos = MAP_APPFONT ( 12 , 139 ) ;
- Size = MAP_APPFONT ( 106 , 10 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Text [ en-US ] = "To object ~frame" ;
- };
- CheckBox CBX_SNAP_POINTS
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS";
- Pos = MAP_APPFONT ( 12 , 153 ) ;
- Size = MAP_APPFONT ( 106 , 10 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Text [ en-US ] = "To obje~ct points" ;
- };
- FixedText FT_SNAP_AREA
- {
- Pos = MAP_APPFONT ( 12 , 169 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- Hide = TRUE;
- Text [ en-US ] = "~Snap range" ;
- };
- MetricField MTR_FLD_SNAP_AREA
- {
- HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 83 , 167 ) ;
- Size = MAP_APPFONT ( 35 , 12 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 50 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- First = 1 ;
- Last = 999 ;
- CustomUnitText [ en-US ] = " Pixels" ;
- };
- FixedLine FL_SEPARATOR
- {
- Pos = MAP_APPFONT ( 127 , 111 ) ;
- Size = MAP_APPFONT ( 4 , 68 ) ;
- Hide = TRUE;
- Vert = TRUE;
- };
- FixedLine GRP_ORTHO
- {
- Pos = MAP_APPFONT ( 130 , 100 ) ;
- Size = MAP_APPFONT ( 124 , 8 ) ;
- Hide = TRUE;
- Text [ en-US ] = "Snap position" ;
- };
- CheckBox CBX_ORTHO
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO";
- Pos = MAP_APPFONT ( 136 , 111 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Text [ en-US ] = "~When creating or moving objects" ;
- };
- CheckBox CBX_BIGORTHO
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO";
- Pos = MAP_APPFONT ( 136 , 125 ) ;
- Size = MAP_APPFONT ( 112 , 10 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Text [ en-US ] = "~Extend edges" ;
- };
- CheckBox CBX_ROTATE
- {
- HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE";
- Pos = MAP_APPFONT ( 136 , 139 ) ;
- // 136, 111
- Size = MAP_APPFONT ( 55 , 10 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Text [ en-US ] = "When ro~tating" ;
- };
- MetricField MTR_FLD_ANGLE
- {
- HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 194 , 137 ) ;
- // 190, 111
- Size = MAP_APPFONT ( 54 , 12 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 18000 ;
- Last = 18000 ;
- DecimalDigits = 2 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- SpinSize = 500 ;
- CustomUnitText [ en-US ] = " degrees" ;
- };
- FixedText FT_BEZ_ANGLE
- {
- Pos = MAP_APPFONT ( 136 , 156 ) ;
- Size = MAP_APPFONT ( 55 , 10 ) ;
- Hide = TRUE;
- Text [ en-US ] = "Point reducti~on" ;
- };
- MetricField MTR_FLD_BEZ_ANGLE
- {
- HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 194 , 154 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
- Hide = TRUE;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 9000 ;
- Last = 9000 ;
- DecimalDigits = 2 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- SpinSize = 500 ;
- CustomUnitText [ en-US ] = " degrees" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui
new file mode 100644
index 0000000..db71011
--- /dev/null
+++ b/svx/uiconfig/ui/optgridpage.ui
@@ -0,0 +1,717 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">3.9399999999999999</property>
+ <property name="value">1</property>
+ <property name="step_increment">0.20000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">99</property>
+ <property name="value">2</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">50</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">180</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">90</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="OptGridPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="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="usegridsnap">
+ <property name="label" translatable="yes">_Snap to grid</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="gridvisible">
+ <property name="label" translatable="yes">_Visible grid</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>
+ </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">Grid</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="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <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="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="GtkSpinButton" id="mtrflddrawx:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="digits">2</property>
+ </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="GtkSpinButton" id="mtrflddrawy:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</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="GtkLabel" id="flddrawx">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">H_orizontal:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">mtrflddrawx:0.00cm</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="flddrawy">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Vertical:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">mtrflddrawy: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="GtkCheckButton" id="synchronize">
+ <property name="label" translatable="yes">Synchronize a_xes</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">2</property>
+ <property name="width">2</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">Resolution</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="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="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="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkSpinButton" id="numflddivisionx">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment2</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="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">space(s)</property>
+ </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>
+ </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="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkSpinButton" id="numflddivisiony">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment2</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="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">space(s)</property>
+ </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>
+ </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="divisionx">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Horizont_al:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">numflddivisionx</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="divisiony">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">V_ertical:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">numflddivisiony</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="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Subdivision</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>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</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="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="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="snaphelplines">
+ <property name="label" translatable="yes">To snap lines</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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="snapborder">
+ <property name="label" translatable="yes">To the _page margins</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="snapframe">
+ <property name="label" translatable="yes">To object _frame</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="snappoints">
+ <property name="label" translatable="yes">To obje_ct points</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>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <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="GtkSpinButton" id="mtrfldsnaparea:0 Pixels">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment3</property>
+ </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="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Snap range</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">mtrfldsnaparea:0 Pixels</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>
+ </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="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Snap</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="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="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <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="GtkCheckButton" id="ortho">
+ <property name="label" translatable="yes">_When creating or moving objects</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="bigortho">
+ <property name="label" translatable="yes">_Extend edges</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="GtkGrid" id="grid9">
+ <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="GtkSpinButton" id="mtrfldangle:0.00 degrees">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment4</property>
+ <property name="digits">2</property>
+ </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="GtkCheckButton" id="rotate">
+ <property name="label" translatable="yes">When ro_tating</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="GtkSpinButton" id="mtrfldbezangle:0.00 degrees">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment5</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="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Point reducti_on</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">mtrfldbezangle:0.00 degrees</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>
+ <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="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Snap position</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">2</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list