[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2
Caolán McNamara
caolanm at redhat.com
Sat Aug 17 07:21:30 PDT 2013
cui/AllLangResTarget_cui.mk | 1
cui/UIConfig_cui.mk | 1
cui/source/inc/helpid.hrc | 2
cui/source/inc/textattr.hxx | 40 +--
cui/source/tabpages/textattr.cxx | 289 +++++++++++--------------
cui/source/tabpages/textattr.hrc | 40 ---
cui/source/tabpages/textattr.src | 216 -------------------
cui/uiconfig/ui/textattrtabpage.ui | 418 +++++++++++++++++++++++++++++++++++++
helpcontent2 | 2
9 files changed, 571 insertions(+), 438 deletions(-)
New commits:
commit 9799324dbaec0fa099ea351e50aa2e1f47a27459
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 15:20:47 2013 +0100
Updated core
Project: help f9847b72a14adb5ce6518c7815e69ed8fea807f2
diff --git a/helpcontent2 b/helpcontent2
index a1382cf..f9847b7 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a1382cf50529aba8391a426d74996819a7c49483
+Subproject commit f9847b72a14adb5ce6518c7815e69ed8fea807f2
commit 0a4e4263b3ef82e8f2de76867e6f589c85802d74
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date: Sat Aug 17 00:14:25 2013 -0300
Convert text attributes tab page to widget UI
Conflicts:
cui/UIConfig_cui.mk
Change-Id: I9332e159a4a4865aac42f601ff1d592fd94a84b5
Reviewed-on: https://gerrit.libreoffice.org/5468
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index a6855ea..8b1b8e3 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
cui/source/tabpages/textanim.src \
- cui/source/tabpages/textattr.src \
cui/source/tabpages/transfrm.src \
))
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8686015..9796018 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/splitcellsdialog \
cui/uiconfig/ui/storedwebconnectiondialog \
cui/uiconfig/ui/swpossizepage \
+ cui/uiconfig/ui/textattrtabpage \
cui/uiconfig/ui/textflowpage \
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/transparencytabpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 63b3502..bcba065 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -241,8 +241,6 @@
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
-#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
-#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"
#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 3684d72..56f6967 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -37,30 +37,22 @@ class SdrView;
class SvxTextAttrPage : public SvxTabPage
{
private:
- FixedLine aFlText;
- TriStateBox aTsbAutoGrowWidth;
- TriStateBox aTsbAutoGrowHeight;
- TriStateBox aTsbFitToSize;
- TriStateBox aTsbContour;
- TriStateBox aTsbWordWrapText;
- TriStateBox aTsbAutoGrowSize;
-
-
- FixedLine aFlDistance;
- FixedText aFtLeft;
- MetricField aMtrFldLeft;
- FixedText aFtRight;
- MetricField aMtrFldRight;
- FixedText aFtTop;
- MetricField aMtrFldTop;
- FixedText aFtBottom;
- MetricField aMtrFldBottom;
-
- FixedLine aFlSeparator;
-
- FixedLine aFlPosition;
- SvxRectCtl aCtlPosition;
- TriStateBox aTsbFullWidth;
+ TriStateBox* m_pTsbAutoGrowWidth;
+ TriStateBox* m_pTsbAutoGrowHeight;
+ TriStateBox* m_pTsbFitToSize;
+ TriStateBox* m_pTsbContour;
+ TriStateBox* m_pTsbWordWrapText;
+ TriStateBox* m_pTsbAutoGrowSize;
+
+ VclFrame* m_pFlDistance;
+ MetricField* m_pMtrFldLeft;
+ MetricField* m_pMtrFldRight;
+ MetricField* m_pMtrFldTop;
+ MetricField* m_pMtrFldBottom;
+
+ VclFrame* m_pFlPosition;
+ SvxRectCtl* m_pCtlPosition;
+ TriStateBox* m_pTsbFullWidth;
const SfxItemSet& rOutAttrs;
const SdrView* pView;
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 08ab94b..0060110 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -34,7 +34,6 @@
#include <svx/dialogs.hrc>
#include "textattr.hxx"
-#include "textattr.hrc"
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
#include <sfx2/request.hxx>
@@ -43,9 +42,11 @@
static sal_uInt16 pRanges[] =
{
- SDRATTR_MISC_FIRST, SDRATTR_TEXT_HORZADJUST,
- SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_AUTOGROWSIZE,
- 0
+ SDRATTR_MISC_FIRST
+ , SDRATTR_TEXT_HORZADJUST
+ , SDRATTR_TEXT_WORDWRAP
+ , SDRATTR_TEXT_AUTOGROWSIZE
+ , 0
};
/*************************************************************************
@@ -55,53 +56,44 @@ static sal_uInt16 pRanges[] =
\************************************************************************/
SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pWindow, CUI_RES( RID_SVXPAGE_TEXTATTR ),
- rInAttrs ),
-
- aFlText ( this, CUI_RES( FL_TEXT ) ),
- aTsbAutoGrowWidth ( this, CUI_RES( TSB_AUTOGROW_WIDTH ) ),
- aTsbAutoGrowHeight ( this, CUI_RES( TSB_AUTOGROW_HEIGHT ) ),
- aTsbFitToSize ( this, CUI_RES( TSB_FIT_TO_SIZE ) ),
- aTsbContour ( this, CUI_RES( TSB_CONTOUR ) ),
- aTsbWordWrapText( this, CUI_RES( TSB_WORDWRAP_TEXT ) ),
- aTsbAutoGrowSize( this, CUI_RES( TSB_AUTOGROW_SIZE ) ),
- aFlDistance ( this, CUI_RES( FL_DISTANCE ) ),
- aFtLeft ( this, CUI_RES( FT_LEFT ) ),
- aMtrFldLeft ( this, CUI_RES( MTR_FLD_LEFT ) ),
- aFtRight ( this, CUI_RES( FT_RIGHT ) ),
- aMtrFldRight ( this, CUI_RES( MTR_FLD_RIGHT ) ),
- aFtTop ( this, CUI_RES( FT_TOP ) ),
- aMtrFldTop ( this, CUI_RES( MTR_FLD_TOP ) ),
- aFtBottom ( this, CUI_RES( FT_BOTTOM ) ),
- aMtrFldBottom ( this, CUI_RES( MTR_FLD_BOTTOM ) ),
-
- aFlSeparator ( this, CUI_RES( FL_SEPARATOR ) ),
-
- aFlPosition ( this, CUI_RES( FL_POSITION ) ),
- aCtlPosition ( this, CUI_RES( CTL_POSITION ),
- RP_MM, 240, 100 ),
- aTsbFullWidth ( this, CUI_RES( TSB_FULL_WIDTH ) ),
-
- rOutAttrs ( rInAttrs )
+ SvxTabPage ( pWindow
+ ,"TextAttributesPage"
+ ,"cui/ui/textattrtabpage.ui"
+ , rInAttrs ),
+ rOutAttrs( rInAttrs )
{
- FreeResource();
+ get(m_pTsbAutoGrowWidth,"TSB_AUTOGROW_WIDTH");
+ get(m_pTsbAutoGrowHeight,"TSB_AUTOGROW_HEIGHT");
+ get(m_pTsbFitToSize,"TSB_FIT_TO_SIZE");
+ get(m_pTsbContour,"TSB_CONTOUR");
+ get(m_pTsbWordWrapText,"TSB_WORDWRAP_TEXT");
+ get(m_pTsbAutoGrowSize,"TSB_AUTOGROW_SIZE");
+ get(m_pFlDistance,"FL_DISTANCE");
+ get(m_pMtrFldLeft,"MTR_FLD_LEFT");
+ get(m_pMtrFldRight,"MTR_FLD_RIGHT");
+ get(m_pMtrFldTop,"MTR_FLD_TOP");
+ get(m_pMtrFldBottom,"MTR_FLD_BOTTOM");
+ get(m_pFlPosition,"FL_POSITION");
+ get(m_pCtlPosition,"CTL_POSITION");
+// RP_MM, 240, 100 ),
+ get(m_pTsbFullWidth,"TSB_FULL_WIDTH");
+
FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
- SetFieldUnit( aMtrFldLeft, eFUnit );
- SetFieldUnit( aMtrFldRight, eFUnit );
- SetFieldUnit( aMtrFldTop, eFUnit );
- SetFieldUnit( aMtrFldBottom, eFUnit );
+ SetFieldUnit( *m_pMtrFldLeft, eFUnit );
+ SetFieldUnit( *m_pMtrFldRight, eFUnit );
+ SetFieldUnit( *m_pMtrFldTop, eFUnit );
+ SetFieldUnit( *m_pMtrFldBottom, eFUnit );
Link aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
- aTsbAutoGrowWidth.SetClickHdl( aLink );
- aTsbAutoGrowHeight.SetClickHdl( aLink );
- aTsbFitToSize.SetClickHdl( aLink );
- aTsbContour.SetClickHdl( aLink );
+ m_pTsbAutoGrowWidth->SetClickHdl( aLink );
+ m_pTsbAutoGrowHeight->SetClickHdl( aLink );
+ m_pTsbFitToSize->SetClickHdl( aLink );
+ m_pTsbContour->SetClickHdl( aLink );
- aTsbFullWidth.SetClickHdl(
- LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) );
+ m_pTsbFullWidth->SetClickHdl(LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) );
- aCtlPosition.SetAccessibleRelationMemberOf( &aFlPosition );
+// aCtlPosition.SetAccessibleRelationMemberOf( &aFlPosition );
}
/*************************************************************************
@@ -133,11 +125,11 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
if( pItem )
{
long nValue = ( ( const SdrTextLeftDistItem* )pItem )->GetValue();
- SetMetricValue( aMtrFldLeft, nValue, eUnit );
+ SetMetricValue( *m_pMtrFldLeft, nValue, eUnit );
}
else
- aMtrFldLeft.SetText( String() );
- aMtrFldLeft.SaveValue();
+ m_pMtrFldLeft->SetText( "" );
+ m_pMtrFldLeft->SaveValue();
pItem = GetItem( rAttrs, SDRATTR_TEXT_RIGHTDIST );
if( !pItem )
@@ -145,11 +137,11 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
if( pItem )
{
long nValue = ( ( const SdrTextRightDistItem* )pItem )->GetValue();
- SetMetricValue( aMtrFldRight, nValue, eUnit );
+ SetMetricValue( *m_pMtrFldRight, nValue, eUnit );
}
else
- aMtrFldRight.SetText( String() );
- aMtrFldRight.SaveValue();
+ m_pMtrFldRight->SetText( "" );
+ m_pMtrFldRight->SaveValue();
pItem = GetItem( rAttrs, SDRATTR_TEXT_UPPERDIST );
if( !pItem )
@@ -157,11 +149,11 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
if( pItem )
{
long nValue = ( ( const SdrTextUpperDistItem* )pItem )->GetValue();
- SetMetricValue( aMtrFldTop, nValue, eUnit );
+ SetMetricValue( *m_pMtrFldTop, nValue, eUnit );
}
else
- aMtrFldTop.SetText( String() );
- aMtrFldTop.SaveValue();
+ m_pMtrFldTop->SetText( "" );
+ m_pMtrFldTop->SaveValue();
pItem = GetItem( rAttrs, SDRATTR_TEXT_LOWERDIST );
if( !pItem )
@@ -169,55 +161,55 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
if( pItem )
{
long nValue = ( ( const SdrTextLowerDistItem* )pItem )->GetValue();
- SetMetricValue( aMtrFldBottom, nValue, eUnit );
+ SetMetricValue( *m_pMtrFldBottom, nValue, eUnit );
}
else
- aMtrFldBottom.SetText( String() );
- aMtrFldBottom.SaveValue();
+ m_pMtrFldBottom->SetText( "" );
+ m_pMtrFldBottom->SaveValue();
// adjust to height
if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SFX_ITEM_DONTCARE )
{
- aTsbAutoGrowHeight.SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ).
+ m_pTsbAutoGrowHeight->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ).
GetValue() ? STATE_CHECK : STATE_NOCHECK );
- aTsbAutoGrowHeight.EnableTriState( sal_False );
+ m_pTsbAutoGrowHeight->EnableTriState( sal_False );
}
else
- aTsbAutoGrowHeight.SetState( STATE_DONTKNOW );
- aTsbAutoGrowHeight.SaveValue();
+ m_pTsbAutoGrowHeight->SetState( STATE_DONTKNOW );
+ m_pTsbAutoGrowHeight->SaveValue();
// adjust to width
if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SFX_ITEM_DONTCARE )
{
- aTsbAutoGrowWidth.SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWWIDTH ) ).
+ m_pTsbAutoGrowWidth->SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWWIDTH ) ).
GetValue() ? STATE_CHECK : STATE_NOCHECK );
- aTsbAutoGrowWidth.EnableTriState( sal_False );
+ m_pTsbAutoGrowWidth->EnableTriState( sal_False );
}
else
- aTsbAutoGrowWidth.SetState( STATE_DONTKNOW );
- aTsbAutoGrowWidth.SaveValue();
+ m_pTsbAutoGrowWidth->SetState( STATE_DONTKNOW );
+ m_pTsbAutoGrowWidth->SaveValue();
// autogrowsize
if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SFX_ITEM_DONTCARE )
{
- aTsbAutoGrowSize.SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ).
+ m_pTsbAutoGrowSize->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ).
GetValue() ? STATE_CHECK : STATE_NOCHECK );
- aTsbAutoGrowSize.EnableTriState( sal_False );
+ m_pTsbAutoGrowSize->EnableTriState( sal_False );
}
else
- aTsbAutoGrowSize.SetState( STATE_DONTKNOW );
- aTsbAutoGrowSize.SaveValue();
+ m_pTsbAutoGrowSize->SetState( STATE_DONTKNOW );
+ m_pTsbAutoGrowSize->SaveValue();
// wordwrap text
if ( rAttrs.GetItemState( SDRATTR_TEXT_WORDWRAP ) != SFX_ITEM_DONTCARE )
{
- aTsbWordWrapText.SetState( ( ( const SdrTextWordWrapItem& )rAttrs.Get( SDRATTR_TEXT_WORDWRAP ) ).
+ m_pTsbWordWrapText->SetState( ( ( const SdrTextWordWrapItem& )rAttrs.Get( SDRATTR_TEXT_WORDWRAP ) ).
GetValue() ? STATE_CHECK : STATE_NOCHECK );
- aTsbWordWrapText.EnableTriState( sal_False );
+ m_pTsbWordWrapText->EnableTriState( sal_False );
}
else
- aTsbWordWrapText.SetState( STATE_DONTKNOW );
- aTsbWordWrapText.SaveValue();
+ m_pTsbWordWrapText->SetState( STATE_DONTKNOW );
+ m_pTsbWordWrapText->SaveValue();
// #103516# Do the setup based on states of hor/ver adjust
@@ -232,7 +224,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)((const SdrTextHorzAdjustItem&)rAttrs.Get(SDRATTR_TEXT_HORZADJUST)).GetValue();
RECT_POINT eRP = RP_LB;
- aTsbFullWidth.EnableTriState( sal_False );
+ m_pTsbFullWidth->EnableTriState( sal_False );
// Translate item values into local anchor position.
switch (eTVA)
@@ -282,22 +274,21 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
{
// Move anchor to valid position.
ClickFullWidthHdl_Impl(NULL);
- aTsbFullWidth.SetState(STATE_CHECK);
+ m_pTsbFullWidth->SetState(STATE_CHECK);
}
- aCtlPosition.SetActualRP( eRP );
+ m_pCtlPosition->SetActualRP( eRP );
}
else
{
// VertAdjust or HorAdjust is not unequivocal
- aCtlPosition.Reset();
+ m_pCtlPosition->Reset();
- aCtlPosition.SetState(STATE_DONTKNOW);
- aCtlPosition.DoCompletelyDisable(sal_True);
+ m_pCtlPosition->SetState(STATE_DONTKNOW);
+ m_pCtlPosition->DoCompletelyDisable(sal_True);
- aTsbFullWidth.SetState(STATE_DONTKNOW);
- aTsbFullWidth.Enable( sal_False );
- aFlPosition.Enable( sal_False );
+ m_pTsbFullWidth->SetState(STATE_DONTKNOW);
+ m_pFlPosition->Enable( sal_False );
}
// adjust to border
@@ -305,22 +296,22 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
{
SdrFitToSizeType eFTS = (SdrFitToSizeType)
( ( const SdrTextFitToSizeTypeItem& )rAttrs.Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue();
- aTsbFitToSize.SetState( eFTS == SDRTEXTFIT_NONE ? STATE_NOCHECK : STATE_CHECK );
- aTsbFitToSize.EnableTriState( sal_False );
+ m_pTsbFitToSize->SetState( eFTS == SDRTEXTFIT_NONE ? STATE_NOCHECK : STATE_CHECK );
+ m_pTsbFitToSize->EnableTriState( sal_False );
}
else
- aTsbFitToSize.SetState( STATE_DONTKNOW );
- aTsbFitToSize.SaveValue();
+ m_pTsbFitToSize->SetState( STATE_DONTKNOW );
+ m_pTsbFitToSize->SaveValue();
if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE )
{
sal_Bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
- aTsbContour.SetState( bContour ? STATE_CHECK : STATE_NOCHECK );
- aTsbContour.EnableTriState( sal_False );
+ m_pTsbContour->SetState( bContour ? STATE_CHECK : STATE_NOCHECK );
+ m_pTsbContour->EnableTriState( sal_False );
}
else
- aTsbContour.SetState( STATE_DONTKNOW );
- aTsbContour.SaveValue();
+ m_pTsbContour->SetState( STATE_DONTKNOW );
+ m_pTsbContour->SaveValue();
ClickHdl_Impl( NULL );
}
@@ -340,62 +331,62 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
sal_Int32 nValue;
TriState eState;
- if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() )
+ if( m_pMtrFldLeft->GetText() != m_pMtrFldLeft->GetSavedValue() )
{
- nValue = GetCoreValue( aMtrFldLeft, eUnit );
+ nValue = GetCoreValue( *m_pMtrFldLeft, eUnit );
rAttrs.Put( SdrTextLeftDistItem( nValue ) );
}
- if( aMtrFldRight.GetText() != aMtrFldRight.GetSavedValue() )
+ if( m_pMtrFldRight->GetText() != m_pMtrFldRight->GetSavedValue() )
{
- nValue = GetCoreValue( aMtrFldRight, eUnit );
+ nValue = GetCoreValue( *m_pMtrFldRight, eUnit );
rAttrs.Put( SdrTextRightDistItem( nValue ) );
}
- if( aMtrFldTop.GetText() != aMtrFldTop.GetSavedValue() )
+ if( m_pMtrFldTop->GetText() != m_pMtrFldTop->GetSavedValue() )
{
- nValue = GetCoreValue( aMtrFldTop, eUnit );
+ nValue = GetCoreValue( *m_pMtrFldTop, eUnit );
rAttrs.Put( SdrTextUpperDistItem( nValue ) );
}
- if( aMtrFldBottom.GetText() != aMtrFldBottom.GetSavedValue() )
+ if( m_pMtrFldBottom->GetText() != m_pMtrFldBottom->GetSavedValue() )
{
- nValue = GetCoreValue( aMtrFldBottom, eUnit );
+ nValue = GetCoreValue( *m_pMtrFldBottom, eUnit );
rAttrs.Put( SdrTextLowerDistItem( nValue ) );
}
- eState = aTsbAutoGrowHeight.GetState();
- if( eState != aTsbAutoGrowHeight.GetSavedValue() )
+ eState = m_pTsbAutoGrowHeight->GetState();
+ if( eState != m_pTsbAutoGrowHeight->GetSavedValue() )
{
rAttrs.Put( SdrTextAutoGrowHeightItem( (sal_Bool) STATE_CHECK == eState ) );
}
- eState = aTsbAutoGrowWidth.GetState();
- if( eState != aTsbAutoGrowWidth.GetSavedValue() )
+ eState = m_pTsbAutoGrowWidth->GetState();
+ if( eState != m_pTsbAutoGrowWidth->GetSavedValue() )
{
rAttrs.Put( SdrTextAutoGrowWidthItem( (sal_Bool) STATE_CHECK == eState ) );
}
- eState = aTsbAutoGrowSize.GetState();
- if( eState != aTsbAutoGrowSize.GetSavedValue() )
+ eState = m_pTsbAutoGrowSize->GetState();
+ if( eState != m_pTsbAutoGrowSize->GetSavedValue() )
{
rAttrs.Put( SdrTextAutoGrowHeightItem( (sal_Bool) STATE_CHECK == eState ) );
}
- eState = aTsbWordWrapText.GetState();
- if( eState != aTsbWordWrapText.GetSavedValue() )
+ eState = m_pTsbWordWrapText->GetState();
+ if( eState != m_pTsbWordWrapText->GetSavedValue() )
{
rAttrs.Put( SdrTextWordWrapItem( (sal_Bool) STATE_CHECK == eState ) );
}
- eState = aTsbContour.GetState();
- if( eState != aTsbContour.GetSavedValue() )
+ eState = m_pTsbContour->GetState();
+ if( eState != m_pTsbContour->GetSavedValue() )
{
rAttrs.Put( SdrTextContourFrameItem( (sal_Bool) STATE_CHECK == eState ) );
}
- eState = aTsbFitToSize.GetState();
- if( eState != aTsbFitToSize.GetSavedValue() )
+ eState = m_pTsbFitToSize->GetState();
+ if( eState != m_pTsbFitToSize->GetSavedValue() )
{
SdrFitToSizeType eFTS;
switch( eState )
@@ -409,7 +400,7 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
}
// centered
- RECT_POINT eRP = aCtlPosition.GetActualRP();
+ RECT_POINT eRP = m_pCtlPosition->GetActualRP();
SdrTextVertAdjust eTVA, eOldTVA;
SdrTextHorzAdjust eTHA, eOldTHA;
@@ -437,11 +428,11 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
}
// #103516# Do not change values if adjust controls were disabled.
- sal_Bool bIsDisabled(aCtlPosition.IsCompletelyDisabled());
+ sal_Bool bIsDisabled(m_pCtlPosition->IsCompletelyDisabled());
if(!bIsDisabled)
{
- if( aTsbFullWidth.GetState() == STATE_CHECK )
+ if( m_pTsbFullWidth->GetState() == STATE_CHECK )
{
if (IsTextDirectionLeftToRight())
eTHA = SDRTEXTHORZADJUST_BLOCK;
@@ -515,12 +506,12 @@ void SvxTextAttrPage::Construct()
}
}
}
- aTsbAutoGrowHeight.Enable( bAutoGrowHeightEnabled );
- aTsbAutoGrowWidth.Enable( bAutoGrowWidthEnabled );
- aTsbFitToSize.Enable( bFitToSizeEnabled );
- aTsbContour.Enable( bContourEnabled );
- aTsbAutoGrowSize.Enable( bAutoGrowSizeEnabled );
- aTsbWordWrapText.Enable( bWordWrapTextEnabled );
+ m_pTsbAutoGrowHeight->Enable( bAutoGrowHeightEnabled );
+ m_pTsbAutoGrowWidth->Enable( bAutoGrowWidthEnabled );
+ m_pTsbFitToSize->Enable( bFitToSizeEnabled );
+ m_pTsbContour->Enable( bContourEnabled );
+ m_pTsbAutoGrowSize->Enable( bAutoGrowSizeEnabled );
+ m_pTsbWordWrapText->Enable( bWordWrapTextEnabled );
}
/*************************************************************************
@@ -544,7 +535,7 @@ sal_uInt16* SvxTextAttrPage::GetRanges()
*/
void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP )
{
- if (aTsbFullWidth.GetState() == STATE_CHECK)
+ if (m_pTsbFullWidth->GetState() == STATE_CHECK)
{
// Depending on write direction and currently checked anchor we have
// to uncheck the "full width" button.
@@ -557,7 +548,7 @@ void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP )
case RP_RT:
case RP_RM:
case RP_RB:
- aTsbFullWidth.SetState( STATE_NOCHECK );
+ m_pTsbFullWidth->SetState( STATE_NOCHECK );
break;
default: ;//prevent warning
}
@@ -570,7 +561,7 @@ void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP )
case RP_LB:
case RP_MB:
case RP_RB:
- aTsbFullWidth.SetState( STATE_NOCHECK );
+ m_pTsbFullWidth->SetState( STATE_NOCHECK );
break;
default: ;//prevent warning
}
@@ -589,26 +580,26 @@ void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP )
*/
IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
{
- if( aTsbFullWidth.GetState() == STATE_CHECK )
+ if( m_pTsbFullWidth->GetState() == STATE_CHECK )
{
if (IsTextDirectionLeftToRight())
{
// Move text anchor to horizontal middle axis.
- switch( aCtlPosition.GetActualRP() )
+ switch( m_pCtlPosition->GetActualRP() )
{
case RP_LT:
case RP_RT:
- aCtlPosition.SetActualRP( RP_MT );
+ m_pCtlPosition->SetActualRP( RP_MT );
break;
case RP_LM:
case RP_RM:
- aCtlPosition.SetActualRP( RP_MM );
+ m_pCtlPosition->SetActualRP( RP_MM );
break;
case RP_LB:
case RP_RB:
- aCtlPosition.SetActualRP( RP_MB );
+ m_pCtlPosition->SetActualRP( RP_MB );
break;
default: ;//prevent warning
}
@@ -616,21 +607,21 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
else
{
// Move text anchor to vertical middle axis.
- switch( aCtlPosition.GetActualRP() )
+ switch( m_pCtlPosition->GetActualRP() )
{
case RP_LT:
case RP_LB:
- aCtlPosition.SetActualRP( RP_LM );
+ m_pCtlPosition->SetActualRP( RP_LM );
break;
case RP_MT:
case RP_MB:
- aCtlPosition.SetActualRP( RP_MM );
+ m_pCtlPosition->SetActualRP( RP_MM );
break;
case RP_RT:
case RP_RB:
- aCtlPosition.SetActualRP( RP_RM );
+ m_pCtlPosition->SetActualRP( RP_RM );
break;
default: ;//prevent warning
}
@@ -647,44 +638,36 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl)
{
- sal_Bool bAutoGrowWidth = aTsbAutoGrowWidth.GetState() == STATE_CHECK;
- sal_Bool bAutoGrowHeight = aTsbAutoGrowHeight.GetState() == STATE_CHECK;
- sal_Bool bFitToSize = aTsbFitToSize.GetState() == STATE_CHECK;
- sal_Bool bContour = aTsbContour.GetState() == STATE_CHECK;
+ sal_Bool bAutoGrowWidth = m_pTsbAutoGrowWidth->GetState() == STATE_CHECK;
+ sal_Bool bAutoGrowHeight = m_pTsbAutoGrowHeight->GetState() == STATE_CHECK;
+ sal_Bool bFitToSize = m_pTsbFitToSize->GetState() == STATE_CHECK;
+ sal_Bool bContour = m_pTsbContour->GetState() == STATE_CHECK;
- aTsbContour.Enable( !bFitToSize &&
+ m_pTsbContour->Enable( !bFitToSize &&
!( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) &&
bContourEnabled );
- aTsbAutoGrowWidth.Enable( !bFitToSize &&
+ m_pTsbAutoGrowWidth->Enable( !bFitToSize &&
!( bContour && bContourEnabled ) &&
bAutoGrowWidthEnabled );
- aTsbAutoGrowHeight.Enable( !bFitToSize &&
+ m_pTsbAutoGrowHeight->Enable( !bFitToSize &&
!( bContour && bContourEnabled ) &&
bAutoGrowHeightEnabled );
- aTsbFitToSize.Enable( !( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) &&
+ m_pTsbFitToSize->Enable( !( ( bAutoGrowWidth && bAutoGrowWidthEnabled ) || ( bAutoGrowHeight && bAutoGrowHeightEnabled ) ) &&
!( bContour && bContourEnabled ) &&
bFitToSizeEnabled );
// #101901# enable/disable metric fields and decorations dependent of contour
- aMtrFldLeft.Enable(!bContour);
- aMtrFldRight.Enable(!bContour);
- aMtrFldTop.Enable(!bContour);
- aMtrFldBottom.Enable(!bContour);
- aFlDistance.Enable(!bContour);
- aFtLeft.Enable(!bContour);
- aFtRight.Enable(!bContour);
- aFtTop.Enable(!bContour);
- aFtBottom.Enable(!bContour);
+ m_pFlDistance->Enable(!bContour);
if( bContour && bContourEnabled )
{
- aMtrFldLeft.SetValue( 0 );
- aMtrFldRight.SetValue( 0 );
- aMtrFldTop.SetValue( 0 );
- aMtrFldBottom.SetValue( 0 );
+ m_pMtrFldLeft->SetValue( 0 );
+ m_pMtrFldRight->SetValue( 0 );
+ m_pMtrFldTop->SetValue( 0 );
+ m_pMtrFldBottom->SetValue( 0 );
}
// #103516# Do the setup based on states of hor/ver adjust
@@ -693,9 +676,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl)
sal_Bool bHorAndVer(SFX_ITEM_DONTCARE == eVState || SFX_ITEM_DONTCARE == eHState);
// #83698# enable/disable text anchoring dependent of contour
- aCtlPosition.Enable(!bContour && !bHorAndVer);
- aTsbFullWidth.Enable(!bContour && !bHorAndVer);
- aFlPosition.Enable(!bContour && !bHorAndVer);
+ m_pFlPosition->Enable(!bContour && !bHorAndVer);
return( 0L );
}
diff --git a/cui/source/tabpages/textattr.hrc b/cui/source/tabpages/textattr.hrc
deleted file mode 100644
index 7b1cf42..0000000
--- a/cui/source/tabpages/textattr.hrc
+++ /dev/null
@@ -1,40 +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 .
- */
-#define FL_TEXT 2
-#define FL_DISTANCE 1
-#define FL_POSITION 3
-#define FL_SEPARATOR 4
-#define TSB_AUTOGROW_HEIGHT 1
-#define TSB_AUTOGROW_WIDTH 2
-#define TSB_FIT_TO_SIZE 3
-#define TSB_FULL_WIDTH 4
-#define TSB_CONTOUR 5
-#define TSB_WORDWRAP_TEXT 6
-#define TSB_AUTOGROW_SIZE 7
-#define CTL_POSITION 1
-#define FT_LEFT 1
-#define MTR_FLD_LEFT 1
-#define FT_RIGHT 2
-#define MTR_FLD_RIGHT 2
-#define FT_TOP 3
-#define MTR_FLD_TOP 3
-#define FT_BOTTOM 4
-#define MTR_FLD_BOTTOM 4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
deleted file mode 100644
index bb088ee..0000000
--- a/cui/source/tabpages/textattr.src
+++ /dev/null
@@ -1,216 +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 <svtools/controldims.hrc>
-#include <cuires.hrc>
-#include "textattr.hrc"
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
- // RID_SVXPAGE_TEXTATTR --------------------------------------------------
-TabPage RID_SVXPAGE_TEXTATTR
-{
- HelpId = HID_PAGE_TEXTATTR ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Text [ en-US ] = "Text" ;
- FixedLine FL_TEXT
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Text" ;
- };
- TriStateBox TSB_AUTOGROW_WIDTH
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
- Text [ en-US ] = "Fit wi~dth to text" ;
- };
- TriStateBox TSB_AUTOGROW_HEIGHT
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 28 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
- Text [ en-US ] = "Fit h~eight to text" ;
- };
- TriStateBox TSB_FIT_TO_SIZE
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
- Text [ en-US ] = "~Fit to frame" ;
- };
- TriStateBox TSB_CONTOUR
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
- Text [ en-US ] = "~Adjust to contour" ;
- };
- TriStateBox TSB_WORDWRAP_TEXT
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT";
- TabStop = TRUE;
- Pos = MAP_APPFONT( 132, 14 ) ;
- Size = MAP_APPFONT( 127 , 10 ) ;
- Text [ en-US ] = "~Word wrap text in shape";
- };
- TriStateBox TSB_AUTOGROW_SIZE
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE";
- TabStop = TRUE;
- Pos = MAP_APPFONT( 132, 28 );
- Size = MAP_APPFONT( 127 , 10 );
- Text [ en-US ] = "~Resize shape to fit text";
- };
- FixedLine FL_DISTANCE
- {
- Pos = MAP_APPFONT ( 6 , 72 ) ;
- Size = MAP_APPFONT ( 114 , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Spacing to borders" ;
- };
- FixedText FT_LEFT
- {
- Pos = MAP_APPFONT ( 12 , 85 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Left" ;
- };
- FixedText FT_RIGHT
- {
- Pos = MAP_APPFONT ( 12 , 101 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Right" ;
- };
- FixedText FT_TOP
- {
- Pos = MAP_APPFONT ( 12 , 117 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Top" ;
- };
- FixedText FT_BOTTOM
- {
- Pos = MAP_APPFONT ( 12 , 133 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Bottom" ;
- };
- MetricField MTR_FLD_LEFT
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 69 , 83 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- Minimum = -10000 ;
- First = -10000 ;
- Maximum = 10000 ;
- Last = 10000 ;
- SpinSize = 10 ;
- };
- MetricField MTR_FLD_RIGHT
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 69 , 99 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- Minimum = -10000 ;
- First = -10000 ;
- Maximum = 10000 ;
- Last = 10000 ;
- SpinSize = 10 ;
- };
- MetricField MTR_FLD_TOP
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 69 , 115 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- Minimum = -10000 ;
- First = -10000 ;
- Maximum = 10000 ;
- Last = 10000 ;
- SpinSize = 10 ;
- };
- MetricField MTR_FLD_BOTTOM
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 69 , 131 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- Minimum = -10000 ;
- First = -10000 ;
- Maximum = 10000 ;
- Last = 10000 ;
- SpinSize = 10 ;
- };
- FixedLine FL_SEPARATOR
- {
- Pos = MAP_APPFONT ( 121 , 83 ) ;
- Size = MAP_APPFONT ( RSC_CD_FIXEDLINE_WIDTH , 66 ) ;
- Vert = TRUE;
- };
- FixedLine FL_POSITION
- {
- Pos = MAP_APPFONT ( 126 , 72 ) ;
- Size = MAP_APPFONT ( 128 , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Text anchor" ;
- };
- Control CTL_POSITION
- {
- HelpId = HID_TEXTATTR_CTL_POSITION ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 132 , 83 ) ;
- Size = MAP_APPFONT ( 116 , 52 ) ;
- TabStop = TRUE ;
- };
- TriStateBox TSB_FULL_WIDTH
- {
- HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 132 , 139 ) ;
- Size = MAP_APPFONT ( 116 , 10 ) ;
- Text [ en-US ] = "Full ~width" ;
- };
-};
- // ********************************************************************** EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui
new file mode 100644
index 0000000..dea4308
--- /dev/null
+++ b/cui/uiconfig/ui/textattrtabpage.ui
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires LibreOffice 1.0 -->
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">-100</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="TextAttributesPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</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="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="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="TSB_AUTOGROW_WIDTH">
+ <property name="label" translatable="yes">Fit wi_dth to text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</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="TSB_AUTOGROW_HEIGHT">
+ <property name="label" translatable="yes">Fit h_eight to text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</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="TSB_FIT_TO_SIZE">
+ <property name="label" translatable="yes">_Fit to frame</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</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="TSB_CONTOUR">
+ <property name="label" translatable="yes">_Adjust to contour</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</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="TSB_WORDWRAP_TEXT">
+ <property name="label" translatable="yes">_Word wrap text in shape</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</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="TSB_AUTOGROW_SIZE">
+ <property name="label" translatable="yes">_Resize shape to fit text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</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>
+ </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="xalign">0</property>
+ <property name="label" translatable="yes">Text</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>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkFrame" id="FL_DISTANCE">
+ <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="alignment2">
+ <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="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Left</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_LEFT: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="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Right</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_RIGHT:0,00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Top</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_TOP:0,00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Bottom</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_BOTTOM:0,00cm</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="GtkSpinButton" id="MTR_FLD_LEFT:0,00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="MTR_FLD_RIGHT:0,00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkSpinButton" id="MTR_FLD_TOP:0,00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MTR_FLD_BOTTOM:0,00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Spacing to borders</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="FL_POSITION">
+ <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="alignment3">
+ <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="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="svxlo-SvxRectCtl" id="CTL_POSITION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="TSB_FULL_WIDTH">
+ <property name="label" translatable="yes">Full _width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">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">Text anchor</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