[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
Caolán McNamara
caolanm at redhat.com
Sun Jan 5 14:43:40 PST 2014
cui/UIConfig_cui.mk | 1
cui/source/inc/helpid.hrc | 2
cui/source/inc/labdlg.hxx | 40 +---
cui/source/tabpages/labdlg.cxx | 278 +++++++++++++---------------
cui/source/tabpages/labdlg.hrc | 29 ---
cui/source/tabpages/labdlg.src | 168 -----------------
cui/uiconfig/ui/calloutpage.ui | 396 +++++++++++++++++++++++++++++++++++++++++
7 files changed, 548 insertions(+), 366 deletions(-)
New commits:
commit 79283929ac9b8e56516b70c8381e0c31f1c68645
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 5 20:42:57 2014 +0000
convert callout tabpage to .ui
Change-Id: I7f13a14d44cdb9be22cc2e9c6cad02f273729088
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 9a3b15a..b5dfe0d 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/borderbackgrounddialog \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/breaknumberoption \
+ cui/uiconfig/ui/calloutpage \
cui/uiconfig/ui/cellalignment \
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 7fdbb6c..c1262d5 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -205,8 +205,6 @@
#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"
-#define HID_CAPTION "CUI_HID_CAPTION"
-#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE"
#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index dcc08a8..2d049d6 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -33,27 +33,26 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3;
class SvxCaptionTabPage : public SfxTabPage
{
private:
- ValueSet aCT_CAPTTYPE;
- FixedText aFT_ABSTAND;
- MetricField aMF_ABSTAND;
- FixedText aFT_ANSATZ;
- ListBox aLB_ANSATZ;
- FixedText aFT_UM;
- MetricField aMF_ANSATZ;
- FixedText aFT_ANSATZ_REL;
- ListBox aLB_ANSATZ_REL;
- FixedText aFT_LAENGE;
- MetricField aMF_LAENGE;
- CheckBox aCB_LAENGE;
-
- Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
-
- OUString aStrHorzList;
- OUString aStrVertList;
-
- short nCaptionType;
+ ValueSet* m_pCT_CAPTTYPE;
+ MetricField* m_pMF_ABSTAND;
+ ListBox* m_pLB_ANSATZ;
+ FixedText* m_pFT_UM;
+ MetricField* m_pMF_ANSATZ;
+ FixedText* m_pFT_ANSATZ_REL;
+ ListBox* m_pLB_ANSATZ_REL;
+ FixedText* m_pFT_LAENGE;
+ MetricField* m_pMF_LAENGE;
+ CheckBox* m_pCB_LAENGE;
+
+ Image m_aBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
+
+ std::vector<OUString> m_aStrHorzList;
+ std::vector<OUString> m_aStrVertList;
+ std::vector<OUString> m_aLineTypes;
+
+ short nCaptionType;
sal_Int32 nGap;
- short nEscDir;
+ short nEscDir;
sal_Bool bEscRel;
sal_Int32 nEscAbs;
sal_Int32 nEscRel;
@@ -75,7 +74,6 @@ private:
public:
SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- virtual ~SvxCaptionTabPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
static sal_uInt16* GetRanges();
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 5c28178..41bc3d7 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -50,6 +50,10 @@
#define AT_MITTE 1
#define AT_UNTEN 2
+#define BMP_CAPTTYPE_1 1
+#define BMP_CAPTTYPE_2 2
+#define BMP_CAPTTYPE_3 3
+
// static ----------------------------------------------------------------
static sal_uInt16 pCaptionRanges[] =
@@ -70,71 +74,60 @@ static sal_uInt16 pCaptionRanges[] =
// -----------------------------------------------------------------------
SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_CAPTION ), rInAttrs ),
-
- aCT_CAPTTYPE( this, CUI_RES( CT_CAPTTYPE ) ),
- aFT_ABSTAND( this, CUI_RES( FT_ABSTAND ) ),
- aMF_ABSTAND( this, CUI_RES( MF_ABSTAND ) ),
- aFT_ANSATZ( this, CUI_RES( FT_ANSATZ ) ),
- aLB_ANSATZ( this, CUI_RES( LB_ANSATZ ) ),
- aFT_UM( this, CUI_RES( FT_UM ) ),
- aMF_ANSATZ( this, CUI_RES( MF_ANSATZ ) ),
- aFT_ANSATZ_REL( this, CUI_RES( FT_ANSATZ_REL ) ),
- aLB_ANSATZ_REL( this, CUI_RES( LB_ANSATZ_REL ) ),
- aFT_LAENGE( this, CUI_RES( FT_LAENGE ) ),
- aMF_LAENGE( this, CUI_RES( MF_LAENGE ) ),
- aCB_LAENGE( this, CUI_RES( CB_LAENGE ) ),
-
- aStrHorzList( CUI_RES(STR_HORZ_LIST) ),
- aStrVertList( CUI_RES(STR_VERT_LIST) ),
-
- rOutAttrs ( rInAttrs )
+ : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", rInAttrs)
+ , rOutAttrs(rInAttrs)
{
- //------------correct positions-------------------------
- aFT_ANSATZ_REL.SetPosPixel( aFT_UM.GetPosPixel() );
- aLB_ANSATZ_REL.SetPosPixel(
- Point(
- aFT_ANSATZ_REL.GetPosPixel().X()+aFT_ANSATZ_REL.GetSizePixel().Width()+6,
- aLB_ANSATZ.GetPosPixel().Y() )
- );
-
- aMF_ANSATZ.SetPosPixel(
- Point(
- aFT_UM.GetPosPixel().X()+aFT_UM.GetSizePixel().Width()+6,
- aLB_ANSATZ.GetPosPixel().Y() )
- );
-
- sal_uInt16 nBitmap;
- for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
- mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA );
+ get(m_pCT_CAPTTYPE, "valueset");
+
+ Size aSize(m_pCT_CAPTTYPE->LogicToPixel(Size(187, 38), MAP_APPFONT));
+ m_pCT_CAPTTYPE->set_width_request(aSize.Width());
+ m_pCT_CAPTTYPE->set_height_request(aSize.Height());
+
+ get(m_pMF_ABSTAND, "spacing");
+ get(m_pLB_ANSATZ, "extension");
+ get(m_pFT_UM, "byft");
+ get(m_pMF_ANSATZ, "by");
+ get(m_pFT_ANSATZ_REL, "positionft");
+ get(m_pLB_ANSATZ_REL, "position");
+
+ assert(m_pLB_ANSATZ_REL->GetEntryCount() == 6);
+ for (int i = 0; i < 3; ++i)
+ m_aStrHorzList.push_back(m_pLB_ANSATZ_REL->GetEntry(i));
+ for (int i = 3; i < 6; ++i)
+ m_aStrVertList.push_back(m_pLB_ANSATZ_REL->GetEntry(i));
+ m_pLB_ANSATZ_REL->Clear();
+
+ ListBox *pLineTypes = get<ListBox>("linetypes");
+ assert(pLineTypes->GetEntryCount() == 3);
+ for (int i = 0; i < 3; ++i)
+ m_aLineTypes.push_back(pLineTypes->GetEntry(i));
+
+ get(m_pFT_LAENGE, "lengthft");
+ get(m_pMF_LAENGE, "length");
+ get(m_pCB_LAENGE, "optimal");
+
+ for(sal_uInt16 nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; ++nBitmap)
+ {
+ FixedImage *pImage = get<FixedImage>(OString("legtyp") + OString::number(nBitmap+1));
+ m_aBmpCapTypes[nBitmap] = pImage->GetImage();
+ }
//------------install ValueSet--------------------------
- aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD );
- aCT_CAPTTYPE.SetColCount(5);//XXX
- aCT_CAPTTYPE.SetLineCount(1);
- aCT_CAPTTYPE.SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
+ m_pCT_CAPTTYPE->SetStyle( m_pCT_CAPTTYPE->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD );
+ m_pCT_CAPTTYPE->SetColCount(5);//XXX
+ m_pCT_CAPTTYPE->SetLineCount(1);
+ m_pCT_CAPTTYPE->SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
Image aImage;
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_1, aImage, OUString(CUI_RES(STR_CAPTTYPE_1)));
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_2, aImage, OUString(CUI_RES(STR_CAPTTYPE_2)));
- aCT_CAPTTYPE.InsertItem(BMP_CAPTTYPE_3, aImage, OUString(CUI_RES(STR_CAPTTYPE_3)));
+ m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_1, aImage, m_aLineTypes[0]);
+ m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_2, aImage, m_aLineTypes[1]);
+ m_pCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_3, aImage, m_aLineTypes[2]);
FillValueSet();
- aLB_ANSATZ.SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzSelectHdl_Impl));
- aLB_ANSATZ_REL.SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzRelSelectHdl_Impl));
- aCB_LAENGE.SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl));
-
- FreeResource();
-}
-
-// -----------------------------------------------------------------------
-
-SvxCaptionTabPage::~SvxCaptionTabPage()
-{
- sal_uInt16 nBitmap;
- for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
- delete mpBmpCapTypes[nBitmap];
+ m_pLB_ANSATZ->SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzSelectHdl_Impl));
+ m_pLB_ANSATZ_REL->SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzRelSelectHdl_Impl));
+ m_pCB_LAENGE->SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl));
}
// -----------------------------------------------------------------------
@@ -154,14 +147,14 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
SfxMapUnit eUnit;
- nCaptionType = aCT_CAPTTYPE.GetSelectItemId()-1;
+ nCaptionType = m_pCT_CAPTTYPE->GetSelectItemId()-1;
_rOutAttrs.Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) );
- if( aMF_ABSTAND.IsValueModified() )
+ if( m_pMF_ABSTAND->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONGAP ) );
- _rOutAttrs.Put( SdrCaptionGapItem( GetCoreValue(aMF_ABSTAND, eUnit ) ) );
+ _rOutAttrs.Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) );
}
// special treatment!!! XXX
@@ -176,14 +169,14 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
_rOutAttrs.Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) );
- bEscRel = aLB_ANSATZ_REL.IsVisible();
+ bEscRel = m_pLB_ANSATZ_REL->IsVisible();
_rOutAttrs.Put( SdrCaptionEscIsRelItem( bEscRel ) );
if( bEscRel )
{
long nVal = 0;
- switch( aLB_ANSATZ_REL.GetSelectEntryPos() )
+ switch( m_pLB_ANSATZ_REL->GetSelectEntryPos() )
{
case AT_OBEN: nVal=0;break;
case AT_MITTE: nVal=5000;break;
@@ -193,22 +186,22 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
}
else
{
- if( aMF_ANSATZ.IsValueModified() )
+ if( m_pMF_ANSATZ->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONESCABS ) );
- _rOutAttrs.Put( SdrCaptionEscAbsItem( GetCoreValue(aMF_ANSATZ, eUnit ) ) );
+ _rOutAttrs.Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) );
}
}
- bFitLineLen = aCB_LAENGE.IsChecked();
+ bFitLineLen = m_pCB_LAENGE->IsChecked();
_rOutAttrs.Put( SdrCaptionFitLineLenItem( bFitLineLen ) );
if( ! bFitLineLen )
{
- if( aMF_LAENGE.IsValueModified() )
+ if( m_pMF_LAENGE->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONLINELEN ) );
- _rOutAttrs.Put( SdrCaptionLineLenItem( GetCoreValue(aMF_LAENGE, eUnit ) ) );
+ _rOutAttrs.Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) );
}
}
@@ -235,9 +228,9 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
break;
default: ;//prevent warning
}
- SetFieldUnit( aMF_ABSTAND, eFUnit );
- SetFieldUnit( aMF_ANSATZ, eFUnit );
- SetFieldUnit( aMF_LAENGE, eFUnit );
+ SetFieldUnit( *m_pMF_ABSTAND, eFUnit );
+ SetFieldUnit( *m_pMF_ANSATZ, eFUnit );
+ SetFieldUnit( *m_pMF_LAENGE, eFUnit );
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
@@ -248,8 +241,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nWhich = GetWhich( SDRATTR_CAPTIONESCABS );
eUnit = pPool->GetMetric( nWhich );
nEscAbs = ( ( const SdrCaptionEscAbsItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
- SetMetricValue( aMF_ANSATZ, nEscAbs, eUnit );
- nEscAbs = static_cast<long>(aMF_ANSATZ.GetValue());
+ SetMetricValue( *m_pMF_ANSATZ, nEscAbs, eUnit );
+ nEscAbs = static_cast<long>(m_pMF_ANSATZ->GetValue());
nWhich = GetWhich( SDRATTR_CAPTIONESCREL );
nEscRel = (long)( ( const SdrCaptionEscRelItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
@@ -258,15 +251,15 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nWhich = GetWhich( SDRATTR_CAPTIONLINELEN );
eUnit = pPool->GetMetric( nWhich );
nLineLen = ( ( const SdrCaptionLineLenItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
- SetMetricValue( aMF_LAENGE, nLineLen, eUnit );
- nLineLen = static_cast<long>(aMF_LAENGE.GetValue());
+ SetMetricValue( *m_pMF_LAENGE, nLineLen, eUnit );
+ nLineLen = static_cast<long>(m_pMF_LAENGE->GetValue());
//------- distance to box ----------
nWhich = GetWhich( SDRATTR_CAPTIONGAP );
eUnit = pPool->GetMetric( nWhich );
nGap = ( ( const SdrCaptionGapItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
- SetMetricValue( aMF_ABSTAND, nGap, eUnit );
- nGap = static_cast<long>(aMF_ABSTAND.GetValue());
+ SetMetricValue( *m_pMF_ABSTAND, nGap, eUnit );
+ nGap = static_cast<long>(m_pMF_ABSTAND->GetValue());
nCaptionType = (short)( ( const SdrCaptionTypeItem& ) rOutAttrs.Get( GetWhich( SDRATTR_CAPTIONTYPE ) ) ).GetValue();
bFitLineLen = ( ( const SfxBoolItem& ) rOutAttrs.Get( GetWhich( SDRATTR_CAPTIONFITLINELEN ) ) ).GetValue();
@@ -286,7 +279,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nAnsatzRelPos=AT_MITTE;
nAnsatzTypePos=AZ_OPTIMAL;
- aMF_ABSTAND.SetValue( nGap );
+ m_pMF_ABSTAND->SetValue( nGap );
if( nEscDir == SDRCAPT_ESCHORIZONTAL )
{
@@ -301,7 +294,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
else
{
nAnsatzTypePos = AZ_VON_OBEN;
- aMF_ANSATZ.SetValue( nEscAbs );
+ m_pMF_ANSATZ->SetValue( nEscAbs );
}
}
else if( nEscDir == SDRCAPT_ESCVERTICAL )
@@ -317,7 +310,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
else
{
nAnsatzTypePos = AZ_VON_LINKS;
- aMF_ANSATZ.SetValue( nEscAbs );
+ m_pMF_ANSATZ->SetValue( nEscAbs );
}
}
else if( nEscDir == SDRCAPT_ESCBESTFIT )
@@ -325,13 +318,13 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nAnsatzTypePos = AZ_OPTIMAL;
}
- aCB_LAENGE.Check( bFitLineLen );
- aMF_LAENGE.SetValue( nLineLen );
+ m_pCB_LAENGE->Check( bFitLineLen );
+ m_pMF_LAENGE->SetValue( nLineLen );
- aLB_ANSATZ.SelectEntryPos( nAnsatzTypePos );
+ m_pLB_ANSATZ->SelectEntryPos( nAnsatzTypePos );
SetupAnsatz_Impl( nAnsatzTypePos );
- aCT_CAPTTYPE.SelectItem( nCaptionType+1 ); // Enum starts at 0!
+ m_pCT_CAPTTYPE->SelectItem( nCaptionType+1 ); // Enum starts at 0!
SetupType_Impl( nCaptionType+1 );
}
@@ -354,61 +347,55 @@ sal_uInt16* SvxCaptionTabPage::GetRanges()
void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
{
- sal_Int32 nCnt=0, nIdx=0;
-
switch( nType )
{
case AZ_OPTIMAL:
-// aMF_ANSATZ.Hide(); //XXX in case of OPTIMAL also absolute values are taken
-// aFT_UM.Hide();
- aMF_ANSATZ.Show();
- aFT_UM.Show();
- aFT_ANSATZ_REL.Hide();
- aLB_ANSATZ_REL.Hide();
+ m_pMF_ANSATZ->Show();
+ m_pFT_UM->Show();
+ m_pFT_ANSATZ_REL->Hide();
+ m_pLB_ANSATZ_REL->Hide();
nEscDir = SDRCAPT_ESCBESTFIT;
break;
case AZ_VON_OBEN:
- aMF_ANSATZ.Show();
- aFT_UM.Show();
- aFT_ANSATZ_REL.Hide();
- aLB_ANSATZ_REL.Hide();
+ m_pMF_ANSATZ->Show();
+ m_pFT_UM->Show();
+ m_pFT_ANSATZ_REL->Hide();
+ m_pLB_ANSATZ_REL->Hide();
nEscDir = SDRCAPT_ESCHORIZONTAL;
break;
case AZ_VON_LINKS:
- aMF_ANSATZ.Show();
- aFT_UM.Show();
- aFT_ANSATZ_REL.Hide();
- aLB_ANSATZ_REL.Hide();
+ m_pMF_ANSATZ->Show();
+ m_pFT_UM->Show();
+ m_pFT_ANSATZ_REL->Hide();
+ m_pLB_ANSATZ_REL->Hide();
nEscDir = SDRCAPT_ESCVERTICAL;
break;
case AZ_HORIZONTAL:
- aLB_ANSATZ_REL.Clear();
- nCnt = comphelper::string::getTokenCount(aStrHorzList, ';');
- for( nIdx=0 ; nIdx<nCnt ; nIdx++ )
- aLB_ANSATZ_REL.InsertEntry( aStrHorzList.getToken(nIdx, ';') );
- aLB_ANSATZ_REL.SelectEntryPos( nAnsatzRelPos );
-
- aMF_ANSATZ.Hide();
- aFT_UM.Hide();
- aFT_ANSATZ_REL.Show();
- aLB_ANSATZ_REL.Show();
+ m_pLB_ANSATZ_REL->Clear();
+ for (size_t i = 0 ; i < m_aStrHorzList.size(); ++i)
+ m_pLB_ANSATZ_REL->InsertEntry(m_aStrHorzList[i]);
+ m_pLB_ANSATZ_REL->SelectEntryPos(nAnsatzRelPos);
+
+ m_pMF_ANSATZ->Hide();
+ m_pFT_UM->Hide();
+ m_pFT_ANSATZ_REL->Show();
+ m_pLB_ANSATZ_REL->Show();
nEscDir = SDRCAPT_ESCHORIZONTAL;
break;
case AZ_VERTIKAL:
- aLB_ANSATZ_REL.Clear();
- nCnt = comphelper::string::getTokenCount(aStrVertList, ';');
- for( nIdx=0 ; nIdx<nCnt ; nIdx++ )
- aLB_ANSATZ_REL.InsertEntry( aStrVertList.getToken(nIdx, ';') );
- aLB_ANSATZ_REL.SelectEntryPos( nAnsatzRelPos );
-
- aMF_ANSATZ.Hide();
- aFT_UM.Hide();
- aFT_ANSATZ_REL.Show();
- aLB_ANSATZ_REL.Show();
+ m_pLB_ANSATZ_REL->Clear();
+ for (size_t i = 0 ; i < m_aStrVertList.size(); ++i)
+ m_pLB_ANSATZ_REL->InsertEntry(m_aStrVertList[i]);
+ m_pLB_ANSATZ_REL->SelectEntryPos(nAnsatzRelPos);
+
+ m_pMF_ANSATZ->Hide();
+ m_pFT_UM->Hide();
+ m_pFT_ANSATZ_REL->Show();
+ m_pLB_ANSATZ_REL->Show();
nEscDir = SDRCAPT_ESCVERTICAL;
break;
}
@@ -418,9 +405,9 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox )
{
- if( pListBox == &aLB_ANSATZ )
+ if (pListBox == m_pLB_ANSATZ)
{
- SetupAnsatz_Impl( aLB_ANSATZ.GetSelectEntryPos() );
+ SetupAnsatz_Impl( m_pLB_ANSATZ->GetSelectEntryPos() );
}
return 0;
}
@@ -430,9 +417,9 @@ IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListB
IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
{
- if( pListBox == &aLB_ANSATZ_REL )
+ if (pListBox == m_pLB_ANSATZ_REL)
{
- nAnsatzRelPos = aLB_ANSATZ_REL.GetSelectEntryPos();
+ nAnsatzRelPos = m_pLB_ANSATZ_REL->GetSelectEntryPos();
}
return 0;
}
@@ -442,17 +429,17 @@ IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pLi
IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
{
- if( pButton == &aCB_LAENGE )
+ if (pButton == m_pCB_LAENGE)
{
- if( aCB_LAENGE.IsChecked() || ! aCB_LAENGE.IsEnabled() )
+ if( m_pCB_LAENGE->IsChecked() || ! m_pCB_LAENGE->IsEnabled() )
{
- aFT_LAENGE.Disable();
- aMF_LAENGE.Disable();
+ m_pFT_LAENGE->Disable();
+ m_pMF_LAENGE->Disable();
}
else
{
- aFT_LAENGE.Enable();
- aMF_LAENGE.Enable();
+ m_pFT_LAENGE->Enable();
+ m_pMF_LAENGE->Enable();
}
}
return 0;
@@ -462,7 +449,7 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
{
- SetupType_Impl( aCT_CAPTTYPE.GetSelectItemId() );
+ SetupType_Impl( m_pCT_CAPTTYPE->GetSelectItemId() );
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
@@ -474,27 +461,27 @@ void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType )
switch( nType-1 )
{
case SDRCAPT_TYPE1:
- aFT_LAENGE.Disable();
- aCB_LAENGE.Disable();
- LineOptHdl_Impl( &aCB_LAENGE );
+ m_pFT_LAENGE->Disable();
+ m_pCB_LAENGE->Disable();
+ LineOptHdl_Impl( m_pCB_LAENGE );
break;
case SDRCAPT_TYPE2:
- aFT_LAENGE.Disable();
- aCB_LAENGE.Disable();
- LineOptHdl_Impl( &aCB_LAENGE );
+ m_pFT_LAENGE->Disable();
+ m_pCB_LAENGE->Disable();
+ LineOptHdl_Impl( m_pCB_LAENGE );
break;
case SDRCAPT_TYPE3:
- aFT_LAENGE.Enable();
- aCB_LAENGE.Enable();
- LineOptHdl_Impl( &aCB_LAENGE );
+ m_pFT_LAENGE->Enable();
+ m_pCB_LAENGE->Enable();
+ LineOptHdl_Impl( m_pCB_LAENGE );
break;
case SDRCAPT_TYPE4:
- aFT_LAENGE.Enable();
- aCB_LAENGE.Enable();
- LineOptHdl_Impl( &aCB_LAENGE );
+ m_pFT_LAENGE->Enable();
+ m_pCB_LAENGE->Enable();
+ LineOptHdl_Impl( m_pCB_LAENGE );
break;
}
}
@@ -513,10 +500,9 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt )
void SvxCaptionTabPage::FillValueSet()
{
- Image** ppBitmaps = mpBmpCapTypes;
- aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_1, *(ppBitmaps[0]) );
- aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_2, *(ppBitmaps[1]) );
- aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_3, *(ppBitmaps[2]) );
+ m_pCT_CAPTTYPE->SetItemImage(BMP_CAPTTYPE_1, m_aBmpCapTypes[0] );
+ m_pCT_CAPTTYPE->SetItemImage(BMP_CAPTTYPE_2, m_aBmpCapTypes[1] );
+ m_pCT_CAPTTYPE->SetItemImage(BMP_CAPTTYPE_3, m_aBmpCapTypes[2] );
}
//========================================================================
diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index acd7e72..2cc565e 100644
--- a/cui/source/tabpages/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -23,33 +23,4 @@
#define BTN_CANCEL 1
#define BTN_HELP 1
-#define FT_ABSTAND 1
-#define FT_ANSATZ 3
-#define FT_LAENGE 4
-#define FT_UM 5
-#define FT_ANSATZ_REL 6
-
-#define CT_CAPTTYPE 1
-
-#define MF_ABSTAND 1
-#define MF_ANSATZ 2
-#define MF_LAENGE 3
-
-#define CB_LAENGE 1
-
-#define LB_ANSATZ 2
-#define LB_ANSATZ_REL 3
-
-#define STR_CAPTTYPE_1 1
-#define STR_CAPTTYPE_2 2
-#define STR_CAPTTYPE_3 3
-#define STR_CAPTTYPE_4 4
-#define STR_HORZ_LIST 10
-#define STR_VERT_LIST 11
-
-#define BMP_CAPTTYPE_1 1
-#define BMP_CAPTTYPE_2 2
-#define BMP_CAPTTYPE_3 3
-#define BMP_CAPTTYPE_4 4
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index 3bac45a..f105ae7 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -21,174 +21,6 @@
#include "labdlg.hrc"
#include <svx/dialogs.hrc>
- // RID_SVXPAGE_CAPTION ---------------------------------------------------
-TabPage RID_SVXPAGE_CAPTION
-{
- HelpId = HID_CAPTION ;
- Hide = TRUE ;
- //Size = MAP_APPFONT ( 189 , 97 ) ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Text [ en-US ] = "Callouts" ;
- Control CT_CAPTTYPE
- {
- HelpId = HID_CAPTION_CTL_TYPE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 187 , 38 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_ABSTAND
- {
- Pos = MAP_APPFONT ( 6 , 53 ) ;
- Size = MAP_APPFONT ( 42 , 8 ) ;
- Text [ en-US ] = "~Spacing" ;
- };
- MetricField MF_ABSTAND
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 51 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 240000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 50 ;
- };
- FixedText FT_ANSATZ
- {
- Pos = MAP_APPFONT ( 6 , 69 ) ;
- Size = MAP_APPFONT ( 42 , 8 ) ;
- Text [ en-US ] = "~Extension" ;
- };
- ListBox LB_ANSATZ
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 67 ) ;
- Size = MAP_APPFONT ( 50 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- CurPos = 0 ;
- StringList [ en-US ] =
- {
- < "Optimal" ; 4 ; > ;
- < "From top" ; 3 ; > ;
- < "From left" ; 3 ; > ;
- < "Horizontal" ; 1 ; > ;
- < "Vertical" ; 2 ; > ;
- };
- };
- FixedText FT_UM
- {
- Pos = MAP_APPFONT ( 106 , 69 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
- Text [ en-US ] = "~By" ;
- };
- MetricField MF_ANSATZ
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 143 , 67 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 240000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 50 ;
- };
- FixedText FT_ANSATZ_REL
- {
- Pos = MAP_APPFONT ( 106 , 69 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
- Text [ en-US ] = "~Position" ;
- };
- ListBox LB_ANSATZ_REL
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 143 , 67 ) ;
- Size = MAP_APPFONT ( 50 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_LAENGE
- {
- Pos = MAP_APPFONT ( 6 , 85 ) ;
- Size = MAP_APPFONT ( 42 , 8 ) ;
- Text [ en-US ] = "~Length" ;
- };
- MetricField MF_LAENGE
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 83 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 240000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 50 ;
- };
- CheckBox CB_LAENGE
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE";
- Pos = MAP_APPFONT ( 106 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Optimal" ;
- };
- String STR_CAPTTYPE_1
- {
- Text [ en-US ] = "Straight Line" ;
- };
- String STR_CAPTTYPE_2
- {
- Text [ en-US ] = "Angled Line" ;
- };
- String STR_CAPTTYPE_3
- {
- Text [ en-US ] = "Angled Connector Line" ;
- };
- String STR_CAPTTYPE_4
- {
- Text [ en-US ] = "Double-angled line" ;
- };
- String STR_HORZ_LIST
- {
- Text [ en-US ] = "Top;Middle;Bottom" ;
- };
- String STR_VERT_LIST
- {
- Text [ en-US ] = "Left;Middle;Right" ;
- };
- Bitmap BMP_CAPTTYPE_1
- {
- File = "legtyp1.bmp" ;
- };
- Bitmap BMP_CAPTTYPE_2
- {
- File = "legtyp2.bmp" ;
- };
- Bitmap BMP_CAPTTYPE_3
- {
- File = "legtyp3.bmp" ;
- };
- Bitmap BMP_CAPTTYPE_4
- {
- File = "legtyp4.bmp" ;
- };
-};
-
#define _POS_SIZE_TEXT \
Text [ en-US ] = "Position and Size" ; \
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
new file mode 100644
index 0000000..8863313
--- /dev/null
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Sun Jan 5 22:34:50 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">2400</property>
+ <property name="step_increment">0.5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Optimal</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">From top</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">From left</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Horizontal</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Vertical</col>
+ <col id="1">2</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkBox" id="CalloutPage">
+ <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">12</property>
+ <child>
+ <object class="svtlo-ValueSet" id="valueset:border">
+ <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="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">24</property>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <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">_Extension</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">extension</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="GtkComboBox" id="extension">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</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">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="column_spacing">12</property>
+ <child>
+ <object class="GtkSpinButton" id="length:0.00mm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">0.00</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="GtkLabel" id="lengthft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Length</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">length:0.00mm</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">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="optimal">
+ <property name="label" translatable="yes">_Optimal</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">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="positionft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Position</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">position</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="byft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_By</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">by:0.00mm</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="GtkComboBoxText" id="position">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes">Top</item>
+ <item translatable="yes">Middle</item>
+ <item translatable="yes">Bottom</item>
+ <item translatable="yes">Left</item>
+ <item translatable="yes">Middle</item>
+ <item translatable="yes">Right</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="by:0.00mm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">0.00</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>
+ </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="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <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">_Spacing</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spacing:0.00mm</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="spacing:0.00mm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="text" translatable="yes">0.00</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">center</property>
+ <child>
+ <object class="GtkImage" id="legtyp1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/legtyp1.png</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="GtkImage" id="legtyp2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/legtyp2.png</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="GtkImage" id="legtyp3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/legtyp3.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</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">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="linetypes">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <items>
+ <item translatable="yes">Straight Line</item>
+ <item translatable="yes">Angled Line</item>
+ <item translatable="yes">Angled Connector Line</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="label2"/>
+ <widget name="lengthft"/>
+ <widget name="label1"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <widgets>
+ <widget name="positionft"/>
+ <widget name="byft"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <property name="mode">both</property>
+ <widgets>
+ <widget name="position"/>
+ <widget name="by:0.00mm"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup4">
+ <property name="mode">both</property>
+ <widgets>
+ <widget name="extension"/>
+ <widget name="length:0.00mm"/>
+ <widget name="spacing:0.00mm"/>
+ </widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list