[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Csikós Tamás
csks.tomi at gmail.com
Tue Jul 9 02:04:51 PDT 2013
sw/UIConfig_swriter.mk | 1
sw/inc/globals.hrc | 4
sw/source/ui/config/optdlg.hrc | 25 --
sw/source/ui/config/optdlg.src | 178 --------------
sw/source/ui/config/optpage.cxx | 277 ++++++++++------------
sw/source/ui/inc/optpage.hxx | 42 +--
sw/uiconfig/swriter/ui/optfonttabpage.ui | 381 +++++++++++++++++++++++++++++++
7 files changed, 540 insertions(+), 368 deletions(-)
New commits:
commit 5c7570be6c987f4a406b7320599bc81197d68885
Author: Csikós Tamás <csks.tomi at gmail.com>
Date: Mon Jul 8 14:31:53 2013 +0200
.ui layout for optpage/fonttabpage
Change-Id: Ib41ac1b5febbb288f7a05f3823dee6ff32feb315
Reviewed-on: https://gerrit.libreoffice.org/4771
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 58abfe1..f09c26b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/numparapage \
sw/uiconfig/swriter/ui/numberingnamedialog \
sw/uiconfig/swriter/ui/optcomparison \
+ sw/uiconfig/swriter/ui/optfonttabpage \
sw/uiconfig/swriter/ui/optformataidspage \
sw/uiconfig/swriter/ui/optgeneralpage \
sw/uiconfig/swriter/ui/opttablepage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 60cb591..152b894d3 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -35,6 +35,10 @@
#define STR_PAGE (RC_GLOBALS_BEGIN + 14)
#define STR_PRINTOPTUI (RC_GLOBALS_BEGIN + 15)
+#define ST_SCRIPT_WESTERN (RC_GLOBALS_BEGIN + 105)
+#define ST_SCRIPT_ASIAN (RC_GLOBALS_BEGIN + 106)
+#define ST_SCRIPT_CTL (RC_GLOBALS_BEGIN + 107)
+
//EventStrings
#define STR_EVENT_OBJECT_SELECT ( RC_GLOBALS_BEGIN + 17 )
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 4dd3868..cd5f366 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -48,29 +48,4 @@
#define RB_END 82
#define RB_PAGEEND 83
-// Tabpage Basic Fonts
-#define FT_STANDARD 90
-#define LB_STANDARD 91
-#define FT_TITLE 92
-#define LB_TITLE 93
-#define FT_LIST 94
-#define LB_LIST 95
-#define FT_LABEL 96
-#define LB_LABEL 97
-#define FT_IDX 98
-#define LB_IDX 99
-#define FL_STDCHR 100
-#define PB_STANDARD 101
-#define CB_DOCONLY 102
-#define ST_SCRIPT_WESTERN 103
-#define ST_SCRIPT_ASIAN 104
-#define ST_SCRIPT_CTL 105
-#define FT_TYPE 106
-#define FT_SIZE 107
-#define LB_STANDARD_SIZE 108
-#define LB_TITLE_SIZE 109
-#define LB_LIST_SIZE 110
-#define LB_LABEL_SIZE 111
-#define LB_INDEX_SIZE 112
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 93b6033..748560a 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -24,175 +24,17 @@
#include "optdlg.hrc"
#include "helpid.h"
-TabPage TP_STD_FONT
+String ST_SCRIPT_ASIAN
{
- HelpID = HID_STD_FONT ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_STDCHR
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Basic fonts (%1)";
- };
- FixedText FT_TYPE
- {
- Pos = MAP_APPFONT ( 63 , 14 ) ;
- Size = MAP_APPFONT ( 100 , 8 ) ;
- Text [ en-US ] = "Font";
- };
- FixedText FT_SIZE
- {
- Pos = MAP_APPFONT ( 204 , 14 ) ;
- Size = MAP_APPFONT ( 40 , 8 ) ;
- Text [ en-US ] = "Size";
- };
- MetricBox LB_STANDARD_SIZE
- {
- HelpID = "sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE";
- Pos = MAP_APPFONT ( 204 , 25 ) ;
- Size = MAP_APPFONT ( 30 , 60 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- MetricBox LB_TITLE_SIZE
- {
- HelpID = "sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE";
- Pos = MAP_APPFONT ( 204 , 42 ) ;
- Size = MAP_APPFONT ( 30 , 60 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- MetricBox LB_LIST_SIZE
- {
- HelpID = "sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE";
- Pos = MAP_APPFONT ( 204 , 59 ) ;
- Size = MAP_APPFONT ( 30 , 60 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- MetricBox LB_LABEL_SIZE
- {
- HelpID = "sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE";
- Pos = MAP_APPFONT ( 204 , 76 ) ;
- Size = MAP_APPFONT ( 30 , 60 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- MetricBox LB_INDEX_SIZE
- {
- HelpID = "sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE";
- Pos = MAP_APPFONT ( 204 , 93 ) ;
- Size = MAP_APPFONT ( 30 , 60 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- FixedText FT_STANDARD
- {
- Pos = MAP_APPFONT ( 12 , 26 ) ;
- Size = MAP_APPFONT ( 48 , 10 ) ;
- Left = TRUE ;
- Text [ en-US ] = "De~fault" ;
- };
- FixedText FT_TITLE
- {
- Pos = MAP_APPFONT ( 12 , 43 ) ;
- Size = MAP_APPFONT ( 48 , 10 ) ;
- Text [ en-US ] = "Headin~g" ;
- Left = TRUE ;
- };
- FixedText FT_LIST
- {
- Pos = MAP_APPFONT ( 12 , 60 ) ;
- Size = MAP_APPFONT ( 48 , 10 ) ;
- Text [ en-US ] = "~List" ;
- Left = TRUE ;
- };
- FixedText FT_LABEL
- {
- Pos = MAP_APPFONT ( 12 , 77 ) ;
- Size = MAP_APPFONT ( 48 , 10 ) ;
- Text [ en-US ] = "C~aption" ;
- Left = TRUE ;
- };
- FixedText FT_IDX
- {
- Pos = MAP_APPFONT ( 12 , 94 ) ;
- Size = MAP_APPFONT ( 48 , 10 ) ;
- Text [ en-US ] = "~Index" ;
- Left = TRUE ;
- };
- ComboBox LB_STANDARD
- {
- HelpID = "sw:ComboBox:TP_STD_FONT:LB_STANDARD";
- Pos = MAP_APPFONT ( 63 , 25 ) ;
- Size = MAP_APPFONT ( 135 , 73 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
- ComboBox LB_TITLE
- {
- HelpID = "sw:ComboBox:TP_STD_FONT:LB_TITLE";
- Pos = MAP_APPFONT ( 63 , 42 ) ;
- Size = MAP_APPFONT ( 135, 73 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
- ComboBox LB_LIST
- {
- HelpID = "sw:ComboBox:TP_STD_FONT:LB_LIST";
- Pos = MAP_APPFONT ( 63 , 59 ) ;
- Size = MAP_APPFONT ( 135 , 73 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
- ComboBox LB_LABEL
- {
- HelpID = "sw:ComboBox:TP_STD_FONT:LB_LABEL";
- Pos = MAP_APPFONT ( 63 , 76 ) ;
- Size = MAP_APPFONT ( 135 , 73 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
- ComboBox LB_IDX
- {
- HelpID = "sw:ComboBox:TP_STD_FONT:LB_IDX";
- Pos = MAP_APPFONT ( 63 , 94 ) ;
- Size = MAP_APPFONT ( 135, 73 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Sort = TRUE ;
- };
- CheckBox CB_DOCONLY
- {
- HelpID = "sw:CheckBox:TP_STD_FONT:CB_DOCONLY";
- Pos = MAP_APPFONT ( 12 , 111 ) ;
- Size = MAP_APPFONT ( 147 , 10 ) ;
- Text [ en-US ] = "C~urrent document only" ;
- };
- PushButton PB_STANDARD
- {
- HelpID = "sw:PushButton:TP_STD_FONT:PB_STANDARD";
- Pos = MAP_APPFONT ( 204 , 165 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Default" ;
- };
- String ST_SCRIPT_ASIAN
- {
- Text [ en-US ] = "Asian";
- };
- String ST_SCRIPT_CTL
- {
- Text [ en-US ] = "CTL";
- };
- String ST_SCRIPT_WESTERN
- {
- Text [ en-US ] = "Western";
- };
+ Text [ en-US ] = "Asian";
+};
+String ST_SCRIPT_CTL
+{
+ Text [ en-US ] = "CTL";
+};
+String ST_SCRIPT_WESTERN
+{
+ Text [ en-US ] = "Western";
};
StringArray STR_PRINTOPTUI
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 41f5327..7ae6cf3 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -506,34 +506,7 @@ void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet)
--------------------------------------------------*/
SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
const SfxItemSet& rSet ) :
- SfxTabPage( pParent, SW_RES( TP_STD_FONT ), rSet),
- aStdChrFL (this, SW_RES(FL_STDCHR )),
- aTypeFT( this, SW_RES( FT_TYPE )),
-
- aStandardLbl(this, SW_RES(FT_STANDARD)),
- aStandardBox(this, SW_RES(LB_STANDARD)),
-
- aHeightFT( this, SW_RES( FT_SIZE )),
- aStandardHeightLB(this, SW_RES( LB_STANDARD_SIZE )),
-
- aTitleLbl (this, SW_RES(FT_TITLE )),
- aTitleBox (this, SW_RES(LB_TITLE )),
- aTitleHeightLB( this, SW_RES( LB_TITLE_SIZE )),
-
- aListLbl (this, SW_RES(FT_LIST )),
- aListBox (this, SW_RES(LB_LIST )),
- aListHeightLB( this, SW_RES( LB_LIST_SIZE )),
-
- aLabelLbl (this, SW_RES(FT_LABEL )),
- aLabelBox (this, SW_RES(LB_LABEL )),
- aLabelHeightLB( this, SW_RES( LB_LABEL_SIZE )),
-
- aIdxLbl (this, SW_RES(FT_IDX )),
- aIdxBox (this, SW_RES(LB_IDX )),
- aIndexHeightLB( this, SW_RES( LB_INDEX_SIZE )),
-
- aDocOnlyCB (this, SW_RES(CB_DOCONLY )),
- aStandardPB (this, SW_RES(PB_STANDARD)),
+ SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , rSet),
pPrt(0),
pFontList(0),
pFontConfig(0),
@@ -561,27 +534,41 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
sScriptAsian(SW_RES(ST_SCRIPT_ASIAN)),
sScriptComplex(SW_RES(ST_SCRIPT_CTL))
{
- FreeResource();
- aStandardPB.SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl));
- aStandardBox.SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- aListBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- aLabelBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
- aIdxBox .SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ get(pLabelFT,"label1");
+ get(pStandardBox,"standardbox");
+ get(pStandardHeightLB,"standardheight");
+ get(pTitleBox,"titlebox");
+ get(pTitleHeightLB,"titleheight");
+ get(pListBox,"listbox");
+ get(pListHeightLB,"listheight");
+ get(pLabelBox,"labelbox");
+ get(pLabelHeightLB,"labelheight");
+ get(pIdxBox,"idxbox");
+ get(pIndexHeightLB,"indexheight");
+
+ get(pDocOnlyCB,"doconly");
+ get(pStandardPB,"standard");
+
+ pStandardPB->SetClickHdl(LINK(this, SwStdFontTabPage, StandardHdl));
+ pStandardBox->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ pListBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ pLabelBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
+ pIdxBox ->SetModifyHdl( LINK(this, SwStdFontTabPage, ModifyHdl));
Link aFocusLink = LINK( this, SwStdFontTabPage, LoseFocusHdl);
- aStandardBox.SetLoseFocusHdl( aFocusLink );
- aTitleBox .SetLoseFocusHdl( aFocusLink );
- aListBox .SetLoseFocusHdl( aFocusLink );
- aLabelBox .SetLoseFocusHdl( aFocusLink );
- aIdxBox .SetLoseFocusHdl( aFocusLink );
+ pStandardBox->SetLoseFocusHdl( aFocusLink );
+ pTitleBox ->SetLoseFocusHdl( aFocusLink );
+ pListBox ->SetLoseFocusHdl( aFocusLink );
+ pLabelBox ->SetLoseFocusHdl( aFocusLink );
+ pIdxBox ->SetLoseFocusHdl( aFocusLink );
Link aModifyHeightLink( LINK( this, SwStdFontTabPage, ModifyHeightHdl));
- aStandardHeightLB.SetModifyHdl( aModifyHeightLink );
- aTitleHeightLB. SetModifyHdl( aModifyHeightLink );
- aListHeightLB. SetModifyHdl( aModifyHeightLink );
- aLabelHeightLB. SetModifyHdl( aModifyHeightLink );
- aIndexHeightLB. SetModifyHdl( aModifyHeightLink );
+ pStandardHeightLB->SetModifyHdl( aModifyHeightLink );
+ pTitleHeightLB-> SetModifyHdl( aModifyHeightLink );
+ pListHeightLB-> SetModifyHdl( aModifyHeightLink );
+ pLabelHeightLB-> SetModifyHdl( aModifyHeightLink );
+ pIndexHeightLB-> SetModifyHdl( aModifyHeightLink );
- aDocOnlyCB.Check(SW_MOD()->GetModuleConfig()->IsDefaultFontInCurrDocOnly());
+ pDocOnlyCB->Check(SW_MOD()->GetModuleConfig()->IsDefaultFontInCurrDocOnly());
}
SwStdFontTabPage::~SwStdFontTabPage()
@@ -619,20 +606,20 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
{
- sal_Bool bNotDocOnly = !aDocOnlyCB.IsChecked();
+ sal_Bool bNotDocOnly = !pDocOnlyCB->IsChecked();
SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly);
- String sStandard = aStandardBox.GetText();
- String sTitle = aTitleBox .GetText();
- String sList = aListBox .GetText();
- String sLabel = aLabelBox .GetText();
- String sIdx = aIdxBox .GetText();
-
- bool bStandardHeightChanged = aStandardHeightLB.GetSavedValue() != aStandardHeightLB.GetText();
- bool bTitleHeightChanged = aTitleHeightLB.GetSavedValue() != aTitleHeightLB.GetText();
- bool bListHeightChanged = aListHeightLB.GetSavedValue() != aListHeightLB.GetText() && (!bListHeightDefault || !bSetListHeightDefault );
- bool bLabelHeightChanged = aLabelHeightLB.GetSavedValue() != aLabelHeightLB.GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault );
- bool bIndexHeightChanged = aIndexHeightLB.GetSavedValue() != aIndexHeightLB.GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault );
+ String sStandard = pStandardBox->GetText();
+ String sTitle = pTitleBox->GetText();
+ String sList = pListBox->GetText();
+ String sLabel = pLabelBox->GetText();
+ String sIdx = pIdxBox->GetText();
+
+ bool bStandardHeightChanged = pStandardHeightLB->GetSavedValue() != pStandardHeightLB->GetText();
+ bool bTitleHeightChanged = pTitleHeightLB->GetSavedValue() != pTitleHeightLB->GetText();
+ bool bListHeightChanged = pListHeightLB->GetSavedValue() != pListHeightLB->GetText() && (!bListHeightDefault || !bSetListHeightDefault );
+ bool bLabelHeightChanged = pLabelHeightLB->GetSavedValue() != pLabelHeightLB->GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault );
+ bool bIndexHeightChanged = pIndexHeightLB->GetSavedValue() != pIndexHeightLB->GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault );
if(bNotDocOnly)
{
pFontConfig->SetFontStandard(sStandard, nFontGroup);
@@ -642,27 +629,27 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
pFontConfig->SetFontIndex(sIdx, nFontGroup);
if(bStandardHeightChanged)
{
- float fSize = (float)aStandardHeightLB.GetValue() / 10;
+ float fSize = (float)pStandardHeightLB->GetValue() / 10;
pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_STANDARD, nFontGroup );
}
if(bTitleHeightChanged)
{
- float fSize = (float)aTitleHeightLB.GetValue() / 10;
+ float fSize = (float)pTitleHeightLB->GetValue() / 10;
pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_OUTLINE, nFontGroup );
}
if(bListHeightChanged)
{
- float fSize = (float)aListHeightLB.GetValue() / 10;
+ float fSize = (float)pListHeightLB->GetValue() / 10;
pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_LIST, nFontGroup );
}
if(bLabelHeightChanged)
{
- float fSize = (float)aLabelHeightLB.GetValue() / 10;
+ float fSize = (float)pLabelHeightLB->GetValue() / 10;
pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_CAPTION, nFontGroup );
}
if(bIndexHeightChanged)
{
- float fSize = (float)aIndexHeightLB.GetValue() / 10;
+ float fSize = (float)pIndexHeightLB->GetValue() / 10;
pFontConfig->SetFontHeight( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), FONT_INDEX, nFontGroup );
}
}
@@ -690,7 +677,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
}
if(bStandardHeightChanged)
{
- float fSize = (float)aStandardHeightLB.GetValue() / 10;
+ float fSize = (float)pStandardHeightLB->GetValue() / 10;
pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize, SFX_MAPUNIT_TWIP ), 100, nFontHeightWhich ) );
SwTxtFmtColl *pColl = pWrtShell->GetTxtCollFromPool(RES_POOLCOLL_STANDARD);
pColl->ResetFmtAttr(nFontHeightWhich);
@@ -705,7 +692,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
if(bTitleHeightChanged)
{
lcl_SetColl(pWrtShell, RES_POOLCOLL_HEADLINE_BASE,
- sal::static_int_cast< sal_uInt16, sal_Int64 >(aTitleHeightLB.GetValue()), nFontHeightWhich);
+ sal::static_int_cast< sal_uInt16, sal_Int64 >(pTitleHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
if(sList != sShellList && (!bListDefault || !bSetListDefault ))
@@ -716,7 +703,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
if(bListHeightChanged)
{
lcl_SetColl(pWrtShell, RES_POOLCOLL_NUMBUL_BASE,
- sal::static_int_cast< sal_uInt16, sal_Int64 >(aListHeightLB.GetValue()), nFontHeightWhich);
+ sal::static_int_cast< sal_uInt16, sal_Int64 >(pListHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
if(sLabel != sShellLabel && (!bLabelDefault || !bSetLabelDefault))
@@ -727,7 +714,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
if(bLabelHeightChanged)
{
lcl_SetColl(pWrtShell, RES_POOLCOLL_LABEL,
- sal::static_int_cast< sal_uInt16, sal_Int64 >(aLabelHeightLB.GetValue()), nFontHeightWhich);
+ sal::static_int_cast< sal_uInt16, sal_Int64 >(pLabelHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
if(sIdx != sShellIndex && (!bIdxDefault || !bSetIdxDefault))
@@ -738,14 +725,13 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& )
if(bIndexHeightChanged)
{
lcl_SetColl(pWrtShell, RES_POOLCOLL_REGISTER_BASE,
- sal::static_int_cast< sal_uInt16, sal_Int64 >(aIndexHeightLB.GetValue()), nFontHeightWhich);
+ sal::static_int_cast< sal_uInt16, sal_Int64 >(pIndexHeightLB->GetValue()), nFontHeightWhich);
bMod = true;
}
if ( bMod )
pWrtShell->SetModified();
pWrtShell->EndAllAction();
}
-
return sal_False;
}
@@ -755,19 +741,18 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
sal_uInt16 nLangSlot = nFontGroup == FONT_GROUP_DEFAULT ? SID_ATTR_LANGUAGE :
FONT_GROUP_CJK == nFontGroup ? SID_ATTR_CHAR_CJK_LANGUAGE : SID_ATTR_CHAR_CTL_LANGUAGE;
-
if( SFX_ITEM_SET == rSet.GetItemState(nLangSlot, sal_False, &pLang))
eLanguage = ((const SvxLanguageItem*)pLang)->GetValue();
- String sTmp(aStdChrFL.GetText());
+ String sTmp = pLabelFT->GetText();
String sToReplace = sScriptWestern;
if(FONT_GROUP_CJK == nFontGroup )
sToReplace = sScriptAsian;
else if(FONT_GROUP_CTL == nFontGroup )
sToReplace = sScriptComplex;
-
sTmp.SearchAndReplaceAscii("%1", sToReplace);
- aStdChrFL.SetText(sTmp);
+ pLabelFT->SetText(sTmp);
+
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_PRINTER, sal_False, &pItem))
@@ -785,7 +770,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
}
pFontList = new FontList( pPrt );
// #i94536# prevent duplication of font entries when 'reset' button is pressed
- if( !aStandardBox.GetEntryCount() )
+ if( !pStandardBox->GetEntryCount() )
{
// get the set of disctinct available family names
std::set< String > aFontNames;
@@ -800,11 +785,11 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
for( std::set< String >::const_iterator it = aFontNames.begin();
it != aFontNames.end(); ++it )
{
- aStandardBox.InsertEntry( *it );
- aTitleBox .InsertEntry( *it );
- aListBox .InsertEntry( *it );
- aLabelBox .InsertEntry( *it );
- aIdxBox .InsertEntry( *it );
+ pStandardBox->InsertEntry( *it );
+ pTitleBox->InsertEntry( *it );
+ pListBox->InsertEntry( *it );
+ pLabelBox->InsertEntry( *it );
+ pIdxBox->InsertEntry( *it );
}
}
if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_STDFONTS, sal_False, &pItem))
@@ -850,7 +835,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
if( nIndexHeight <= 0)
nIndexHeight = pFontConfig->GetDefaultHeightFor( FONT_INDEX + nFontGroup * FONT_PER_GROUP, eLanguage);
- aDocOnlyCB.Enable(sal_False);
+ pDocOnlyCB->Enable(sal_False);
}
else
{
@@ -905,97 +890,96 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet)
nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight();
bIndexHeightDefault = SFX_ITEM_DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, sal_False);
}
- aStandardBox.SetText(sStdBackup );
- aTitleBox .SetText(sOutBackup );
- aListBox .SetText(sListBackup);
- aLabelBox .SetText(sCapBackup );
- aIdxBox .SetText(sIdxBackup );
+ pStandardBox->SetText(sStdBackup );
+ pTitleBox->SetText(sOutBackup );
+ pListBox->SetText(sListBackup);
+ pLabelBox->SetText(sCapBackup );
+ pIdxBox->SetText(sIdxBackup );
FontInfo aFontInfo( pFontList->Get(sStdBackup, sStdBackup) );
- aStandardHeightLB.Fill( &aFontInfo, pFontList );
+ pStandardHeightLB->Fill( &aFontInfo, pFontList );
aFontInfo = pFontList->Get(sOutBackup, sOutBackup );
- aTitleHeightLB.Fill( &aFontInfo, pFontList );
+ pTitleHeightLB->Fill( &aFontInfo, pFontList );
aFontInfo = pFontList->Get(sListBackup,sListBackup);
- aListHeightLB.Fill( &aFontInfo, pFontList );
+ pListHeightLB->Fill( &aFontInfo, pFontList );
aFontInfo = pFontList->Get(sCapBackup, sCapBackup );
- aLabelHeightLB.Fill( &aFontInfo, pFontList );
+ pLabelHeightLB->Fill( &aFontInfo, pFontList );
aFontInfo = pFontList->Get(sIdxBackup, sIdxBackup );
- aIndexHeightLB.Fill( &aFontInfo, pFontList );
+ pIndexHeightLB->Fill( &aFontInfo, pFontList );
- aStandardHeightLB.SetValue( CalcToPoint( nStandardHeight, SFX_MAPUNIT_TWIP, 10 ) );
- aTitleHeightLB. SetValue( CalcToPoint( nTitleHeight , SFX_MAPUNIT_TWIP, 10 ) );
- aListHeightLB. SetValue( CalcToPoint( nListHeight , SFX_MAPUNIT_TWIP, 10 ) );
- aLabelHeightLB. SetValue( CalcToPoint( nLabelHeight , SFX_MAPUNIT_TWIP, 10 ));
- aIndexHeightLB. SetValue( CalcToPoint( nIndexHeight , SFX_MAPUNIT_TWIP, 10 ));
+ pStandardHeightLB->SetValue( CalcToPoint( nStandardHeight, SFX_MAPUNIT_TWIP, 10 ) );
+ pTitleHeightLB-> SetValue( CalcToPoint( nTitleHeight , SFX_MAPUNIT_TWIP, 10 ) );
+ pListHeightLB-> SetValue( CalcToPoint( nListHeight , SFX_MAPUNIT_TWIP, 10 ) );
+ pLabelHeightLB-> SetValue( CalcToPoint( nLabelHeight , SFX_MAPUNIT_TWIP, 10 ));
+ pIndexHeightLB-> SetValue( CalcToPoint( nIndexHeight , SFX_MAPUNIT_TWIP, 10 ));
- aStandardBox.SaveValue();
- aTitleBox .SaveValue();
- aListBox .SaveValue();
- aLabelBox .SaveValue();
- aIdxBox .SaveValue();
+ pStandardBox->SaveValue();
+ pTitleBox->SaveValue();
+ pListBox->SaveValue();
+ pLabelBox->SaveValue();
+ pIdxBox->SaveValue();
- aStandardHeightLB.SaveValue();
- aTitleHeightLB. SaveValue();
- aListHeightLB. SaveValue();
- aLabelHeightLB. SaveValue();
- aIndexHeightLB. SaveValue();
+ pStandardHeightLB->SaveValue();
+ pTitleHeightLB->SaveValue();
+ pListHeightLB->SaveValue();
+ pLabelHeightLB->SaveValue();
+ pIndexHeightLB->SaveValue();
}
IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl)
{
sal_uInt8 nFontOffset = nFontGroup * FONT_PER_GROUP;
- aStandardBox.SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, eLanguage));
- aTitleBox .SetText(SwStdFontConfig::GetDefaultFor(FONT_OUTLINE + nFontOffset, eLanguage));
- aListBox .SetText(SwStdFontConfig::GetDefaultFor(FONT_LIST + nFontOffset, eLanguage));
- aLabelBox .SetText(SwStdFontConfig::GetDefaultFor(FONT_CAPTION + nFontOffset, eLanguage));
- aIdxBox .SetText(SwStdFontConfig::GetDefaultFor(FONT_INDEX + nFontOffset, eLanguage));
-
- aStandardBox.SaveValue();
- aTitleBox .SaveValue();
- aListBox .SaveValue();
- aLabelBox .SaveValue();
- aIdxBox .SaveValue();
-
- aStandardHeightLB.SetValue( CalcToPoint(
+ pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, eLanguage));
+ pTitleBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_OUTLINE + nFontOffset, eLanguage));
+ pListBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_LIST + nFontOffset, eLanguage));
+ pLabelBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_CAPTION + nFontOffset, eLanguage));
+ pIdxBox ->SetText(SwStdFontConfig::GetDefaultFor(FONT_INDEX + nFontOffset, eLanguage));
+
+ pStandardBox->SaveValue();
+ pTitleBox->SaveValue();
+ pListBox->SaveValue();
+ pLabelBox->SaveValue();
+ pIdxBox->SaveValue();
+
+ pStandardHeightLB->SetValue( CalcToPoint(
SwStdFontConfig::GetDefaultHeightFor(FONT_STANDARD + nFontOffset, eLanguage),
SFX_MAPUNIT_TWIP, 10 ) );
- aTitleHeightLB .SetValue(CalcToPoint(
+ pTitleHeightLB ->SetValue(CalcToPoint(
SwStdFontConfig::GetDefaultHeightFor(FONT_OUTLINE +
nFontOffset, eLanguage), SFX_MAPUNIT_TWIP, 10 ));
- aListHeightLB .SetValue(CalcToPoint(
+ pListHeightLB ->SetValue(CalcToPoint(
SwStdFontConfig::GetDefaultHeightFor(FONT_LIST + nFontOffset, eLanguage),
SFX_MAPUNIT_TWIP, 10 ));
- aLabelHeightLB .SetValue(CalcToPoint(
+ pLabelHeightLB ->SetValue(CalcToPoint(
SwStdFontConfig::GetDefaultHeightFor(FONT_CAPTION + nFontOffset, eLanguage),
SFX_MAPUNIT_TWIP, 10 ));
- aIndexHeightLB .SetValue(CalcToPoint(
+ pIndexHeightLB ->SetValue(CalcToPoint(
SwStdFontConfig::GetDefaultHeightFor(FONT_INDEX + nFontOffset, eLanguage),
SFX_MAPUNIT_TWIP, 10 ));
-
return 0;
}
IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox )
{
- if(pBox == &aStandardBox)
+ if(pBox == pStandardBox)
{
String sEntry = pBox->GetText();
if(bSetListDefault && bListDefault)
- aListBox.SetText(sEntry);
+ pListBox->SetText(sEntry);
if(bSetLabelDefault && bLabelDefault)
- aLabelBox.SetText(sEntry);
+ pLabelBox->SetText(sEntry);
if(bSetIdxDefault && bIdxDefault)
- aIdxBox.SetText(sEntry);
+ pIdxBox->SetText(sEntry);
}
- else if(pBox == &aListBox)
+ else if(pBox == pListBox)
{
bSetListDefault = sal_False;
}
- else if(pBox == &aLabelBox)
+ else if(pBox == pLabelBox)
{
bSetLabelDefault = sal_False;
}
- else if(pBox == &aIdxBox)
+ else if(pBox == pIdxBox)
{
bSetIdxDefault = sal_False;
}
@@ -1004,25 +988,25 @@ IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox )
IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, FontSizeBox*, pBox )
{
- if(pBox == &aStandardHeightLB)
+ if(pBox == pStandardHeightLB)
{
sal_Int64 nValue = pBox->GetValue(FUNIT_TWIP);
if(bSetListHeightDefault && bListHeightDefault)
- aListHeightLB.SetValue(nValue, FUNIT_TWIP);
+ pListHeightLB->SetValue(nValue, FUNIT_TWIP);
if(bSetLabelHeightDefault && bLabelHeightDefault)
- aLabelHeightLB.SetValue(nValue, FUNIT_TWIP);
+ pLabelHeightLB->SetValue(nValue, FUNIT_TWIP);
if(bSetIndexHeightDefault && bIndexHeightDefault)
- aIndexHeightLB.SetValue(nValue, FUNIT_TWIP);
+ pIndexHeightLB->SetValue(nValue, FUNIT_TWIP);
}
- else if(pBox == &aListHeightLB)
+ else if(pBox == pListHeightLB)
{
bSetListHeightDefault = sal_False;
}
- else if(pBox == &aLabelHeightLB)
+ else if(pBox == pLabelHeightLB)
{
bSetLabelHeightDefault = sal_False;
}
- else if(pBox == &aIndexHeightLB)
+ else if(pBox == pIndexHeightLB)
{
bSetIndexHeightDefault = sal_False;
}
@@ -1033,29 +1017,28 @@ IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, ComboBox*, pBox )
{
FontSizeBox* pHeightLB = 0;
String sEntry = pBox->GetText();
- if(pBox == &aStandardBox)
+ if(pBox == pStandardBox)
{
- pHeightLB = &aStandardHeightLB;
+ pHeightLB = pStandardHeightLB;
}
- else if(pBox == &aTitleBox)
+ else if(pBox == pTitleBox)
{
- pHeightLB = &aTitleHeightLB;
+ pHeightLB = pTitleHeightLB;
}
- else if(pBox == &aListBox)
+ else if(pBox == pListBox)
{
- pHeightLB = &aListHeightLB;
+ pHeightLB = pListHeightLB;
}
- else if(pBox == &aLabelBox)
+ else if(pBox == pLabelBox)
{
- pHeightLB = &aLabelHeightLB;
+ pHeightLB = pLabelHeightLB;
}
- else /*if(pBox == &aIdxBox)*/
+ else /*if(pBox == pIdxBox)*/
{
- pHeightLB = &aIndexHeightLB;
+ pHeightLB = pIndexHeightLB;
}
FontInfo aFontInfo( pFontList->Get(sEntry, sEntry) );
pHeightLB->Fill( &aFontInfo, pFontList );
-
return 0;
}
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index cb30157..274d1e6 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -137,34 +137,20 @@ public:
class SwStdFontTabPage : public SfxTabPage
{
- FixedLine aStdChrFL ;
-
- FixedText aTypeFT;
-
- FixedText aStandardLbl;
- ComboBox aStandardBox;
-
- FixedText aHeightFT;
- FontSizeBox aStandardHeightLB;
-
- FixedText aTitleLbl ;
- ComboBox aTitleBox ;
- FontSizeBox aTitleHeightLB;
-
- FixedText aListLbl ;
- ComboBox aListBox ;
- FontSizeBox aListHeightLB;
-
- FixedText aLabelLbl ;
- ComboBox aLabelBox ;
- FontSizeBox aLabelHeightLB;
-
- FixedText aIdxLbl ;
- ComboBox aIdxBox ;
- FontSizeBox aIndexHeightLB;
-
- CheckBox aDocOnlyCB ;
- PushButton aStandardPB;
+ FixedText* pLabelFT;
+
+ ComboBox* pStandardBox;
+ FontSizeBox* pStandardHeightLB;
+ ComboBox* pTitleBox ;
+ FontSizeBox* pTitleHeightLB;
+ ComboBox* pListBox ;
+ FontSizeBox* pListHeightLB;
+ ComboBox* pLabelBox ;
+ FontSizeBox* pLabelHeightLB;
+ ComboBox* pIdxBox ;
+ FontSizeBox* pIndexHeightLB;
+ CheckBox* pDocOnlyCB ;
+ PushButton* pStandardPB;
String sShellStd;
String sShellTitle;
diff --git a/sw/uiconfig/swriter/ui/optfonttabpage.ui b/sw/uiconfig/swriter/ui/optfonttabpage.ui
new file mode 100644
index 0000000..6155efc
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/optfonttabpage.ui
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="OptFontTabPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="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="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="svtlo-FontSizeBox" id="standardheight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-FontSizeBox" id="titleheight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-FontSizeBox" id="listheight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-FontSizeBox" id="labelheight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svtlo-FontSizeBox" id="indexheight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="font_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Font</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="size_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Size</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">standardheight</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>
+ <child>
+ <object class="GtkLabel" id="default_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">De_fault:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">standardbox</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="heading_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Headin_g:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">titlebox</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="list_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_List:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">listbox</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="GtkLabel" id="caption_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">C_aption:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">labelbox</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="index_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Index:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">idxbox</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="doconly">
+ <property name="label" translatable="yes">C_urrent document only</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="standardbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="standardbox-entry">
+ <property name="can_focus">False</property>
+ <property name="invisible_char">���</property>
+ </object>
+ </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="GtkComboBoxText" id="titlebox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="titlebox-entry">
+ <property name="can_focus">False</property>
+ <property name="invisible_char">���</property>
+ </object>
+ </child>
+ </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="GtkComboBoxText" id="listbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="listbox-entry">
+ <property name="can_focus">False</property>
+ <property name="invisible_char">���</property>
+ </object>
+ </child>
+ </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>
+ <child>
+ <object class="GtkComboBoxText" id="labelbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="labelbox-entry">
+ <property name="can_focus">False</property>
+ <property name="invisible_char">���</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="idxbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="idxbox-entry">
+ <property name="can_focus">False</property>
+ <property name="invisible_char">���</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Basic fonts (%1)</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="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="standard">
+ <property name="label" translatable="yes">_Default</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list