[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Wed Aug 7 09:26:35 PDT 2013
sw/UIConfig_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/envelp/label.hrc | 19 -
sw/source/ui/envelp/label.src | 157 ---------
sw/source/ui/envelp/label1.cxx | 253 ++++++---------
sw/source/ui/envelp/swuilabimp.hxx | 42 +-
sw/uiconfig/swriter/ui/cardmediumpage.ui | 520 +++++++++++++++++++++++++++++++
7 files changed, 644 insertions(+), 349 deletions(-)
New commits:
commit 37aa92dfa3605b4d2d03d977a45a71b34e4b6b9d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 7 13:47:28 2013 +0200
convert label medium tabpage to .ui
Change-Id: I38c3e28070b9d5b689bd6ba4bde01a7a8dedba18
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 34ea76f..7e67b46 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/bulletsandnumbering \
sw/uiconfig/swriter/ui/cannotsavelabeldialog \
sw/uiconfig/swriter/ui/captionoptions \
+ sw/uiconfig/swriter/ui/cardmediumpage \
sw/uiconfig/swriter/ui/characterproperties \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columndialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 0a4014c..74edf70 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -144,7 +144,6 @@
#define HID_FRM_STD "SW_HID_FRM_STD"
#define HID_GRF_EXT "SW_HID_GRF_EXT"
-#define HID_LAB_LAB "SW_HID_LAB_LAB"
#define HID_ENV_PRT "SW_HID_ENV_PRT"
#define HID_LAB_FMT "SW_HID_LAB_FMT"
#define HID_ENV_ENV "SW_HID_ENV_ENV"
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc
index 1d00229..b7bfaef 100644
--- a/sw/source/ui/envelp/label.hrc
+++ b/sw/source/ui/envelp/label.hrc
@@ -24,25 +24,6 @@
// local resources *********************************************************
-#define TXT_WRITING 1
-#define BOX_ADDR 2
-#define EDT_WRITING 3
-#define FT_DATABASE 4
-#define LB_DATABASE 5
-#define FT_TABLE 6
-#define LB_TABLE 7
-#define FL_WRITING 8
-#define BTN_CONT 9
-#define BTN_SHEET 10
-#define TXT_MAKE 11
-#define BOX_MAKE 12
-#define TXT_TYPE 13
-#define BOX_TYPE 14
-#define INF_FORMAT 15
-#define FL_FORMAT 16
-#define FT_DBFIELD 17
-#define LB_DBFIELD 18
-#define BTN_INSERT 19
#define BTN_SYNC 20
#define LB_AUTO_TEXT 3
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index 89db7c9..4008642 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -84,162 +84,7 @@ TabDialog DLG_LAB
Text [ en-US ] = "Medium";
};
};
- // TP_LAB_LAB ---------------------------------------------------------------
-TabPage TP_LAB_LAB
-{
- HelpID = HID_LAB_LAB ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedText TXT_WRITING
- {
- Pos = MAP_APPFONT ( 12 , 15 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Group = TRUE ;
- Left = TRUE ;
- Text [ en-US ] = "Label text" ;
- };
- CheckBox BOX_ADDR
- {
- HelpID = "sw:CheckBox:TP_LAB_LAB:BOX_ADDR";
- Pos = MAP_APPFONT ( 67 , 14 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Address" ;
- };
- MultiLineEdit EDT_WRITING
- {
- HelpID = "sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 27 ) ;
- Size = MAP_APPFONT ( 105 , 89 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- HScroll = TRUE ;
- VScroll = TRUE ;
- IgnoreTab = TRUE;
- };
- FixedText FT_DATABASE
- {
- Pos = MAP_APPFONT ( 149 , 16 ) ;
- Size = MAP_APPFONT ( 99 , 8 ) ;
- Text [ en-US ] = "Database" ;
- };
- ListBox LB_DATABASE
- {
- HelpID = "sw:ListBox:TP_LAB_LAB:LB_DATABASE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 149 , 27 ) ;
- Size = MAP_APPFONT ( 99 , 70 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText FT_TABLE
- {
- Pos = MAP_APPFONT ( 149 , 45 ) ;
- Size = MAP_APPFONT ( 99 , 8 ) ;
- Text [ en-US ] = "Table" ;
- };
- ListBox LB_TABLE
- {
- HelpID = "sw:ListBox:TP_LAB_LAB:LB_TABLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 149 , 56 ) ;
- Size = MAP_APPFONT ( 99 , 70 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- ImageButton BTN_INSERT
- {
- HelpID = "sw:ImageButton:TP_LAB_LAB:BTN_INSERT";
- Pos = MAP_APPFONT ( 124 , 92 ) ;
- Size = MAP_APPFONT ( 18 , 12 ) ;
- SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
- TabStop = TRUE ;
- };
- FixedText FT_DBFIELD
- {
- Pos = MAP_APPFONT ( 149 , 81 ) ;
- Size = MAP_APPFONT ( 99 , 8 ) ;
- Text [ en-US ] = "Database field" ;
- };
- ListBox LB_DBFIELD
- {
- HelpID = "sw:ListBox:TP_LAB_LAB:LB_DBFIELD";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 149 , 92 ) ;
- Size = MAP_APPFONT ( 99 , 70 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedLine FL_WRITING
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Group = TRUE ;
- Text [ en-US ] = "Inscription" ;
- };
- RadioButton BTN_CONT
- {
- HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_CONT";
- Pos = MAP_APPFONT ( 12 , 137 ) ;
- Size = MAP_APPFONT ( 65 , 10 ) ;
- TabStop = TRUE ;
- Group = TRUE ;
- Text [ en-US ] = "~Continuous" ;
- };
- RadioButton BTN_SHEET
- {
- HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_SHEET";
- Pos = MAP_APPFONT ( 12 , 153 ) ;
- Size = MAP_APPFONT ( 65 , 10 ) ;
- Text [ en-US ] = "~Sheet" ;
- };
- FixedText TXT_MAKE
- {
- Pos = MAP_APPFONT ( 91 , 138 ) ;
- Size = MAP_APPFONT ( 30 , 8 ) ;
- Text [ en-US ] = "Brand" ;
- Left = TRUE ;
- };
- ListBox BOX_MAKE
- {
- HelpID = "sw:ListBox:TP_LAB_LAB:BOX_MAKE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 124 , 136 ) ;
- Size = MAP_APPFONT ( 124 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText TXT_TYPE
- {
- Pos = MAP_APPFONT ( 91 , 154 ) ;
- Size = MAP_APPFONT ( 30 , 8 ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Type" ;
- };
- ListBox BOX_TYPE
- {
- HelpID = "sw:ListBox:TP_LAB_LAB:BOX_TYPE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 124 , 152 ) ;
- Size = MAP_APPFONT ( 124 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- FixedText INF_FORMAT
- {
- Pos = MAP_APPFONT ( 12 , 168 ) ;
- Size = MAP_APPFONT ( 236 , 8 ) ;
- Left = TRUE ;
- };
- FixedLine FL_FORMAT
- {
- Pos = MAP_APPFONT ( 6 , 125 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Group = TRUE ;
- Text [ en-US ] = "Format" ;
- };
-};
+
#define WIDTH 100
#define HEIGHT 16
FloatingWindow DLG_SYNC_BTN
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index ab201c2..d938370 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -225,47 +225,47 @@ Printer *SwLabDlg::GetPrt()
return (NULL);
}
-SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage(pParent, SW_RES(TP_LAB_LAB), rSet),
- pNewDBMgr(NULL),
- aItem ((const SwLabItem&) rSet.Get(FN_LABEL)),
-
- aWritingFL (this, SW_RES(FL_WRITING)),
- aWritingText (this, SW_RES(TXT_WRITING)),
- aAddrBox (this, SW_RES(BOX_ADDR )),
- aWritingEdit (this, SW_RES(EDT_WRITING)),
- aDatabaseFT (this, SW_RES(FT_DATABASE)),
- aDatabaseLB (this, SW_RES(LB_DATABASE)),
- aTableFT (this, SW_RES(FT_TABLE )),
- aTableLB (this, SW_RES(LB_TABLE )),
- aInsertBT (this, SW_RES(BTN_INSERT )),
- aDBFieldFT (this, SW_RES(FT_DBFIELD )),
- aDBFieldLB (this, SW_RES(LB_DBFIELD )),
- aFormatFL (this, SW_RES(FL_FORMAT )),
- aContButton (this, SW_RES(BTN_CONT )),
- aSheetButton (this, SW_RES(BTN_SHEET )),
- aMakeText (this, SW_RES(TXT_MAKE )),
- aMakeBox (this, SW_RES(BOX_MAKE )),
- aTypeText (this, SW_RES(TXT_TYPE )),
- aTypeBox (this, SW_RES(BOX_TYPE )),
- aHiddenSortTypeBox(this, WB_SORT|WB_HIDE),
- aFormatInfo (this, SW_RES(INF_FORMAT ))
- {
+SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "CardMediumPage",
+ "modules/swriter/ui/cardmediumpage.ui", rSet)
+ , pNewDBMgr(NULL)
+ , aItem((const SwLabItem&)rSet.Get(FN_LABEL))
+{
WaitObject aWait( pParent );
- FreeResource();
- SetExchangeSupport();
+ get(m_pAddressFrame, "addressframe");
+ get(m_pAddrBox, "address");
+ get(m_pWritingEdit, "textview");
+ m_pWritingEdit->set_height_request(m_pWritingEdit->GetTextHeight() * 10);
+ m_pWritingEdit->set_width_request(m_pWritingEdit->approximate_char_width() * 25);
+ get(m_pDatabaseLB, "database");
+ get(m_pTableLB, "table");
+ get(m_pInsertBT, "insert");
+ get(m_pDBFieldLB, "field");
+ get(m_pContButton, "continuous");
+ get(m_pSheetButton, "sheet");
+ get(m_pMakeBox, "brand");
+ get(m_pTypeBox, "type");
+ get(m_pFormatInfo, "formatinfo");
+ get(m_pHiddenSortTypeBox, "hiddentype");
+ m_pHiddenSortTypeBox->SetStyle(m_pHiddenSortTypeBox->GetStyle() | WB_SORT);
+
+ long nListBoxWidth = approximate_char_width() * 30;
+ m_pTableLB->set_width_request(nListBoxWidth);
+ m_pDatabaseLB->set_width_request(nListBoxWidth);
+ m_pDBFieldLB->set_width_request(nListBoxWidth);
+ SetExchangeSupport();
// Install handlers
- aAddrBox .SetClickHdl (LINK(this, SwLabPage, AddrHdl ));
- aDatabaseLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl ));
- aTableLB .SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl ));
- aInsertBT .SetClickHdl (LINK(this, SwLabPage, FieldHdl ));
- aContButton .SetClickHdl (LINK(this, SwLabPage, PageHdl ));
- aSheetButton .SetClickHdl (LINK(this, SwLabPage, PageHdl ));
- aMakeBox .SetSelectHdl(LINK(this, SwLabPage, MakeHdl ));
- aTypeBox .SetSelectHdl(LINK(this, SwLabPage, TypeHdl ));
+ m_pAddrBox->SetClickHdl (LINK(this, SwLabPage, AddrHdl ));
+ m_pDatabaseLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl ));
+ m_pTableLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl ));
+ m_pInsertBT->SetClickHdl (LINK(this, SwLabPage, FieldHdl ));
+ m_pContButton->SetClickHdl (LINK(this, SwLabPage, PageHdl ));
+ m_pSheetButton->SetClickHdl (LINK(this, SwLabPage, PageHdl ));
+ m_pMakeBox->SetSelectHdl(LINK(this, SwLabPage, MakeHdl ));
+ m_pTypeBox->SetSelectHdl(LINK(this, SwLabPage, TypeHdl ));
InitDatabaseBox();
@@ -275,111 +275,68 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
for(size_t i = 0; i < nCount; ++i)
{
OUString& rStr = GetParentSwLabDlg()->Makes()[i];
- aMakeBox.InsertEntry( rStr );
+ m_pMakeBox->InsertEntry( rStr );
if ( rStr == aItem.aLstMake)
nLstGroup = i;
}
- aMakeBox.SelectEntryPos( nLstGroup );
- aMakeBox.GetSelectHdl().Call( &aMakeBox );
-}
-
-SwLabPage::~SwLabPage()
-{
-}
-
-static void lcl_ChgYPos(Window& rWin, long nDiff)
-{
- Point aTempPos(rWin.GetPosPixel());
- aTempPos.Y() += nDiff;
- rWin.SetPosPixel(aTempPos);
+ m_pMakeBox->SelectEntryPos( nLstGroup );
+ m_pMakeBox->GetSelectHdl().Call(m_pMakeBox);
}
void SwLabPage::SetToBusinessCard()
{
SetHelpId(HID_BUSINESS_FMT_PAGE);
- aContButton.SetHelpId(HID_BUSINESS_FMT_PAGE_CONT);
- aSheetButton.SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET);
- aMakeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND);
- aTypeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE);
+ m_pContButton->SetHelpId(HID_BUSINESS_FMT_PAGE_CONT);
+ m_pSheetButton->SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET);
+ m_pMakeBox->SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND);
+ m_pTypeBox->SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE);
m_bLabel = sal_False;
- aWritingText.Hide();
- aAddrBox.Hide();
- aWritingEdit.Hide();
- aDatabaseFT.Hide();
- aDatabaseLB.Hide();
- aTableFT.Hide();
- aTableLB.Hide();
- aInsertBT.Hide();
- aDBFieldFT.Hide();
- aDBFieldLB.Hide();
- aWritingFL.Hide();
-
- //resize the form
- Point aFLPos(aWritingFL.GetPosPixel());
- long nDiffPos = aFormatFL.GetPosPixel().Y() - aFLPos.Y();
- Size aFLSz(aFormatFL.GetSizePixel());
- aFormatFL.SetPosSizePixel(aFLPos, aFLSz);
-
- // move all controls up
- lcl_ChgYPos(aContButton, -nDiffPos);
- lcl_ChgYPos(aSheetButton, -nDiffPos);
- lcl_ChgYPos(aMakeText, -nDiffPos);
-
- lcl_ChgYPos(aTypeText, -nDiffPos);
- lcl_ChgYPos(aFormatInfo, -nDiffPos);
-
- Size aTmpSz(3, 3);
- aTmpSz = LogicToPixel(aTmpSz, MAP_APPFONT);
-
- lcl_ChgYPos(aMakeBox, - nDiffPos);
- Point aLBPos(aMakeBox.GetPosPixel());
- aLBPos.Y() += aMakeBox.GetSizePixel().Height() + aTmpSz.Height();
- aTypeBox.SetPosPixel(aLBPos);
+ m_pAddressFrame->Hide();
};
IMPL_LINK_NOARG(SwLabPage, AddrHdl)
{
String aWriting;
- if ( aAddrBox.IsChecked() )
+ if ( m_pAddrBox->IsChecked() )
aWriting = convertLineEnd(MakeSender(), GetSystemLineEnd());
- aWritingEdit.SetText( aWriting );
- aWritingEdit.GrabFocus();
+ m_pWritingEdit->SetText( aWriting );
+ m_pWritingEdit->GrabFocus();
return 0;
}
IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox )
{
- sActDBName = aDatabaseLB.GetSelectEntry();
+ sActDBName = m_pDatabaseLB->GetSelectEntry();
WaitObject aObj( GetParentSwLabDlg() );
- if (pListBox == &aDatabaseLB)
- GetNewDBMgr()->GetTableNames(&aTableLB, sActDBName);
+ if (pListBox == m_pDatabaseLB)
+ GetNewDBMgr()->GetTableNames(m_pTableLB, sActDBName);
- GetNewDBMgr()->GetColumnNames(&aDBFieldLB, sActDBName, aTableLB.GetSelectEntry());
+ GetNewDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry());
return 0;
}
IMPL_LINK_NOARG(SwLabPage, FieldHdl)
{
- OUString aStr("<" + OUString(aDatabaseLB.GetSelectEntry()) + "." +
- OUString(aTableLB.GetSelectEntry()) + "." +
- (aTableLB.GetEntryData(aTableLB.GetSelectEntryPos()) == 0 ? OUString("0") : OUString("1")) + "." +
- aDBFieldLB.GetSelectEntry() + ">");
- aWritingEdit.ReplaceSelected(aStr);
- Selection aSel = aWritingEdit.GetSelection();
- aWritingEdit.GrabFocus();
- aWritingEdit.SetSelection(aSel);
+ OUString aStr("<" + OUString(m_pDatabaseLB->GetSelectEntry()) + "." +
+ OUString(m_pTableLB->GetSelectEntry()) + "." +
+ (m_pTableLB->GetEntryData(m_pTableLB->GetSelectEntryPos()) == 0 ? OUString("0") : OUString("1")) + "." +
+ m_pDBFieldLB->GetSelectEntry() + ">");
+ m_pWritingEdit->ReplaceSelected(aStr);
+ Selection aSel = m_pWritingEdit->GetSelection();
+ m_pWritingEdit->GrabFocus();
+ m_pWritingEdit->SetSelection(aSel);
return 0;
}
IMPL_LINK_NOARG_INLINE_START(SwLabPage, PageHdl)
{
- aMakeBox.GetSelectHdl().Call( &aMakeBox );
+ m_pMakeBox->GetSelectHdl().Call(m_pMakeBox);
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SwLabPage, PageHdl)
@@ -388,15 +345,15 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
{
WaitObject aWait( GetParentSwLabDlg() );
- aTypeBox.Clear();
- aHiddenSortTypeBox.Clear();
+ m_pTypeBox->Clear();
+ m_pHiddenSortTypeBox->Clear();
GetParentSwLabDlg()->TypeIds().clear();
- const String aMake = aMakeBox.GetSelectEntry();
+ const String aMake = m_pMakeBox->GetSelectEntry();
GetParentSwLabDlg()->ReplaceGroup( aMake );
aItem.aLstMake = aMake;
- const sal_Bool bCont = aContButton.IsChecked();
+ const sal_Bool bCont = m_pContButton->IsChecked();
const sal_uInt16 nCount = GetParentSwLabDlg()->Recs().size();
sal_uInt16 nLstType = 0;
@@ -409,14 +366,14 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
if ( GetParentSwLabDlg()->Recs()[i]->aType == sCustom )
{
bInsert = true;
- aTypeBox.InsertEntry(aType );
+ m_pTypeBox->InsertEntry(aType );
}
else if ( GetParentSwLabDlg()->Recs()[i]->bCont == bCont )
{
- if ( aHiddenSortTypeBox.GetEntryPos(aType) == LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pHiddenSortTypeBox->GetEntryPos(aType) == LISTBOX_ENTRY_NOTFOUND )
{
bInsert = true;
- aHiddenSortTypeBox.InsertEntry( aType );
+ m_pHiddenSortTypeBox->InsertEntry( aType );
}
}
if(bInsert)
@@ -426,22 +383,22 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
nLstType = GetParentSwLabDlg()->TypeIds().size();
}
}
- for(sal_uInt16 nEntry = 0; nEntry < aHiddenSortTypeBox.GetEntryCount(); nEntry++)
+ for(sal_uInt16 nEntry = 0; nEntry < m_pHiddenSortTypeBox->GetEntryCount(); nEntry++)
{
- aTypeBox.InsertEntry(aHiddenSortTypeBox.GetEntry(nEntry));
+ m_pTypeBox->InsertEntry(m_pHiddenSortTypeBox->GetEntry(nEntry));
}
if (nLstType)
- aTypeBox.SelectEntry(aItem.aLstType);
+ m_pTypeBox->SelectEntry(aItem.aLstType);
else
- aTypeBox.SelectEntryPos(0);
- aTypeBox.GetSelectHdl().Call( &aTypeBox );
+ m_pTypeBox->SelectEntryPos(0);
+ m_pTypeBox->GetSelectHdl().Call(m_pTypeBox);
return 0;
}
IMPL_LINK_NOARG_INLINE_START(SwLabPage, TypeHdl)
{
DisplayFormat();
- aItem.aType = aTypeBox.GetSelectEntry();
+ aItem.aType = m_pTypeBox->GetSelectEntry();
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SwLabPage, TypeHdl)
@@ -474,35 +431,35 @@ void SwLabPage::DisplayFormat()
aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" x "));
aText += OUString::number( pRec->nRows );
aText += ')';
- aFormatInfo.SetText(aText);
+ m_pFormatInfo->SetText(aText);
}
SwLabRec* SwLabPage::GetSelectedEntryPos()
{
- String sSelEntry(aTypeBox.GetSelectEntry());
+ String sSelEntry(m_pTypeBox->GetSelectEntry());
- return GetParentSwLabDlg()->GetRecord(sSelEntry, aContButton.IsChecked());
+ return GetParentSwLabDlg()->GetRecord(sSelEntry, m_pContButton->IsChecked());
}
void SwLabPage::InitDatabaseBox()
{
if( GetNewDBMgr() )
{
- aDatabaseLB.Clear();
+ m_pDatabaseLB->Clear();
::com::sun::star::uno::Sequence<OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
const OUString* pDataNames = aDataNames.getConstArray();
for (long i = 0; i < aDataNames.getLength(); i++)
- aDatabaseLB.InsertEntry(pDataNames[i]);
+ m_pDatabaseLB->InsertEntry(pDataNames[i]);
String sDBName = sActDBName.GetToken( 0, DB_DELIM );
String sTableName = sActDBName.GetToken( 1, DB_DELIM );
- aDatabaseLB.SelectEntry(sDBName);
- if( sDBName.Len() && GetNewDBMgr()->GetTableNames(&aTableLB, sDBName))
+ m_pDatabaseLB->SelectEntry(sDBName);
+ if( sDBName.Len() && GetNewDBMgr()->GetTableNames(m_pTableLB, sDBName))
{
- aTableLB.SelectEntry(sTableName);
- GetNewDBMgr()->GetColumnNames(&aDBFieldLB, sActDBName, sTableName);
+ m_pTableLB->SelectEntry(sTableName);
+ GetNewDBMgr()->GetColumnNames(m_pDBFieldLB, sActDBName, sTableName);
}
else
- aDBFieldLB.Clear();
+ m_pDBFieldLB->Clear();
}
}
@@ -526,18 +483,18 @@ int SwLabPage::DeactivatePage(SfxItemSet* _pSet)
void SwLabPage::FillItem(SwLabItem& rItem)
{
- rItem.bAddr = aAddrBox.IsChecked();
- rItem.aWriting = aWritingEdit.GetText();
- rItem.bCont = aContButton.IsChecked();
- rItem.aMake = aMakeBox.GetSelectEntry();
- rItem.aType = aTypeBox.GetSelectEntry();
+ rItem.bAddr = m_pAddrBox->IsChecked();
+ rItem.aWriting = m_pWritingEdit->GetText();
+ rItem.bCont = m_pContButton->IsChecked();
+ rItem.aMake = m_pMakeBox->GetSelectEntry();
+ rItem.aType = m_pTypeBox->GetSelectEntry();
rItem.sDBName = sActDBName;
SwLabRec* pRec = GetSelectedEntryPos();
pRec->FillItem( rItem );
- rItem.aLstMake = aMakeBox.GetSelectEntry();
- rItem.aLstType = aTypeBox.GetSelectEntry();
+ rItem.aLstMake = m_pMakeBox->GetSelectEntry();
+ rItem.aLstType = m_pTypeBox->GetSelectEntry();
}
sal_Bool SwLabPage::FillItemSet(SfxItemSet& rSet)
@@ -555,38 +512,38 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
String aWriting(convertLineEnd(aItem.aWriting, GetSystemLineEnd()));
- aAddrBox .Check ( aItem.bAddr );
- aWritingEdit.SetText ( aWriting );
+ m_pAddrBox->Check( aItem.bAddr );
+ m_pWritingEdit->SetText ( aWriting );
for(std::vector<OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
{
- if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND)
- aMakeBox.InsertEntry(*i);
+ if(m_pMakeBox->GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND)
+ m_pMakeBox->InsertEntry(*i);
}
- aMakeBox .SelectEntry( aItem.aMake );
+ m_pMakeBox->SelectEntry( aItem.aMake );
//save the current type
String sType(aItem.aType);
- aMakeBox.GetSelectHdl().Call( &aMakeBox );
+ m_pMakeBox->GetSelectHdl().Call(m_pMakeBox);
aItem.aType = sType;
//#102806# a newly added make may not be in the type ListBox already
- if (aTypeBox.GetEntryPos(String(aItem.aType)) == LISTBOX_ENTRY_NOTFOUND && !aItem.aMake.isEmpty())
+ if (m_pTypeBox->GetEntryPos(String(aItem.aType)) == LISTBOX_ENTRY_NOTFOUND && !aItem.aMake.isEmpty())
GetParentSwLabDlg()->UpdateGroup( aItem.aMake );
- if (aTypeBox.GetEntryPos(String(aItem.aType)) != LISTBOX_ENTRY_NOTFOUND)
+ if (m_pTypeBox->GetEntryPos(String(aItem.aType)) != LISTBOX_ENTRY_NOTFOUND)
{
- aTypeBox.SelectEntry(aItem.aType);
- aTypeBox.GetSelectHdl().Call(&aTypeBox);
+ m_pTypeBox->SelectEntry(aItem.aType);
+ m_pTypeBox->GetSelectHdl().Call(m_pTypeBox);
}
- if (aDatabaseLB.GetEntryPos(sDBName) != LISTBOX_ENTRY_NOTFOUND)
+ if (m_pDatabaseLB->GetEntryPos(sDBName) != LISTBOX_ENTRY_NOTFOUND)
{
- aDatabaseLB.SelectEntry(sDBName);
- aDatabaseLB.GetSelectHdl().Call(&aDatabaseLB);
+ m_pDatabaseLB->SelectEntry(sDBName);
+ m_pDatabaseLB->GetSelectHdl().Call(m_pDatabaseLB);
}
if (aItem.bCont)
- aContButton .Check();
+ m_pContButton->Check();
else
- aSheetButton.Check();
+ m_pSheetButton->Check();
}
void SwVisitingCardPage::ClearUserData()
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 70fb0c3..52e0f90 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -20,6 +20,7 @@
#define _SWUILABIMP_HXX
#include "labimp.hxx"
#include <com/sun/star/text/XAutoTextContainer2.hpp>
+#include <vcl/layout.hxx>
class SwLabPage : public SfxTabPage
{
@@ -27,37 +28,28 @@ class SwLabPage : public SfxTabPage
String sActDBName;
SwLabItem aItem;
- FixedLine aWritingFL;
- FixedText aWritingText;
- CheckBox aAddrBox;
- MultiLineEdit aWritingEdit;
- FixedText aDatabaseFT;
- ListBox aDatabaseLB;
- FixedText aTableFT;
- ListBox aTableLB;
- ImageButton aInsertBT;
- FixedText aDBFieldFT;
- ListBox aDBFieldLB;
-// PushButton aDatabaseButton;
-
- FixedLine aFormatFL;
- RadioButton aContButton;
- RadioButton aSheetButton;
- FixedText aMakeText;
- ListBox aMakeBox;
- FixedText aTypeText;
- ListBox aTypeBox;
- ListBox aHiddenSortTypeBox;
- FixedInfo aFormatInfo;
+ VclContainer* m_pAddressFrame;
+
+ CheckBox* m_pAddrBox;
+ VclMultiLineEdit* m_pWritingEdit;
+ ListBox* m_pDatabaseLB;
+ ListBox* m_pTableLB;
+ PushButton* m_pInsertBT;
+ ListBox* m_pDBFieldLB;
+
+ RadioButton* m_pContButton;
+ RadioButton* m_pSheetButton;
+ ListBox* m_pMakeBox;
+ ListBox* m_pTypeBox;
+ ListBox* m_pHiddenSortTypeBox;
+ FixedText* m_pFormatInfo;
sal_Bool m_bLabel;
- SwLabPage(Window* pParent, const SfxItemSet& rSet);
- ~SwLabPage();
+ SwLabPage(Window* pParent, const SfxItemSet& rSet);
DECL_LINK(AddrHdl, void *);
DECL_LINK( DatabaseHdl, ListBox *pListBox );
-// DECL_LINK( DatabaseButtonHdl, Button * );
DECL_LINK(FieldHdl, void *);
DECL_LINK(PageHdl, void *);
DECL_LINK(MakeHdl, void *);
diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui
new file mode 100644
index 0000000..336e3f8
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui
@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="CardMediumPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="addressframe">
+ <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="vexpand">True</property>
+ <property name="column_spacing">18</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="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="address">
+ <property name="label" translatable="yes">Address</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="xalign">0</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="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Label text</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">textview:border</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">always</property>
+ <property name="vscrollbar_policy">always</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <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="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</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">Database</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">database</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="GtkComboBoxText" id="database">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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">0</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="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <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">Table</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">table</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="GtkComboBoxText" id="table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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">1</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="valign">end</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Database field</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">field</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="GtkComboBoxText" id="field">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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>
+ <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>
+ <child>
+ <object class="GtkButton" id="insert">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_markup" translatable="yes">Insert</property>
+ <property name="valign">center</property>
+ <property name="image">image1</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>
+ </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">Inscription</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </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="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="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">12</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</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>
+ <child>
+ <object class="GtkRadioButton" id="continuous">
+ <property name="label" translatable="yes">_Continuous</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">sheet</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="GtkRadioButton" id="sheet">
+ <property name="label" translatable="yes">_Sheet</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">continuous</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="formatinfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</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="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <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">Brand</property>
+ <property name="use_underline">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="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Type</property>
+ <property name="use_underline">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="GtkComboBoxText" id="brand">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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="GtkComboBoxText" id="type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="hiddentype">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</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="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Format</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list