[PATCH] Convert starmath/ fontdialog to .ui
Joren De Cuyper (via Code Review)
gerrit at gerrit.libreoffice.org
Tue Apr 2 15:06:00 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3181
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3181/1
Convert starmath/ fontdialog to .ui
Status: Draft
!Please do not submit yet!
Reason: Some questions/problems
Thanks in advance
Joren
Change-Id: I745373e583d71819de34671f2e4f3a39871b6b9a
---
M starmath/UI_smath.mk
M starmath/inc/dialog.hxx
M starmath/inc/starmath.hrc
M starmath/source/dialog.cxx
M starmath/source/smres.src
A starmath/uiconfig/smath/ui/fontstypedialog.ui
6 files changed, 477 insertions(+), 100 deletions(-)
diff --git a/starmath/UI_smath.mk b/starmath/UI_smath.mk
index 6cbfb8d..109208f 100644
--- a/starmath/UI_smath.mk
+++ b/starmath/UI_smath.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,modules/smath))
$(eval $(call gb_UI_add_uifiles,modules/smath,\
+ starmath/uiconfig/smath/ui/fontstypedialog \
starmath/uiconfig/smath/ui/printeroptions \
))
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 51782f0..10a071a 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -155,27 +155,27 @@
class SmFontTypeDialog : public ModalDialog
{
- FixedText aFixedText1;
- SmFontPickListBox aVariableFont;
- FixedText aFixedText2;
- SmFontPickListBox aFunctionFont;
- FixedText aFixedText3;
- SmFontPickListBox aNumberFont;
- FixedText aFixedText4;
- SmFontPickListBox aTextFont;
- FixedText aFixedText5;
- SmFontPickListBox aSerifFont;
- FixedText aFixedText6;
- SmFontPickListBox aSansFont;
- FixedText aFixedText7;
- SmFontPickListBox aFixedFont;
- FixedLine aFixedLine1;
- FixedLine aFixedLine2;
- OKButton aOKButton1;
- HelpButton aHelpButton1;
- CancelButton aCancelButton1;
- MenuButton aMenuButton;
- PushButton aDefaultButton;
+// FixedText aFixedText1;
+// SmFontPickListBox aVariableFont;
+// FixedText aFixedText2;
+// SmFontPickListBox aFunctionFont;
+// FixedText aFixedText3;
+// SmFontPickListBox aNumberFont;
+// FixedText aFixedText4;
+// SmFontPickListBox aTextFont;
+// FixedText aFixedText5;
+// SmFontPickListBox aSerifFont;
+// FixedText aFixedText6;
+// SmFontPickListBox aSansFont;
+// FixedText aFixedText7;
+// SmFontPickListBox aFixedFont;
+// FixedLine aFixedLine1;
+// FixedLine aFixedLine2;
+ OKButton* m_pBP_OK;
+// HelpButton aHelpButton1;
+// CancelButton aCancelButton1;
+ MenuButton* m_pBP_MenuButton;
+ PushButton* m_pBP_DefaultButton;
OutputDevice *pFontListDev;
@@ -184,7 +184,7 @@
DECL_LINK(HelpButtonClickHdl, Button *);
public:
- SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool bFreeRes = true);
+ SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice/*, bool bFreeRes = true*/);
void ReadFrom(const SmFormat &rFormat);
void WriteTo (SmFormat &rFormat) const;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ed1eb26..90ceb7a 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -81,7 +81,6 @@
#define RID_FONTDIALOG (RID_APP_START + 2)
#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
-#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
#define RID_DISTANCEDIALOG (RID_APP_START + 5)
#define RID_ALIGNDIALOG (RID_APP_START + 6)
#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 29c0328..ee90f9f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -511,13 +511,13 @@
bool bHideCheckboxes = false;
switch (pMenu->GetCurItemId())
{
- case 1: pActiveListBox = &aVariableFont; break;
- case 2: pActiveListBox = &aFunctionFont; break;
- case 3: pActiveListBox = &aNumberFont; break;
- case 4: pActiveListBox = &aTextFont; break;
- case 5: pActiveListBox = &aSerifFont; bHideCheckboxes = true; break;
- case 6: pActiveListBox = &aSansFont; bHideCheckboxes = true; break;
- case 7: pActiveListBox = &aFixedFont; bHideCheckboxes = true; break;
+ case 1: pActiveListBox = &m_pLB_VariableFont; break;
+ case 2: pActiveListBox = &m_pLB_FunctionFont; break;
+ case 3: pActiveListBox = &m_pLB_NumberFont; break;
+ case 4: pActiveListBox = &m_pLB_TextFont; break;
+ case 5: pActiveListBox = &m_pLB_SerifFont ; bHideCheckboxes = true; break;
+ case 6: pActiveListBox = &m_pLB_SansFont; bHideCheckboxes = true; break;
+ case 7: pActiveListBox = &m_pLB_FixedFont; bHideCheckboxes = true; break;
default:pActiveListBox = NULL;
}
@@ -550,8 +550,8 @@
}
IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton )
-IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
-{
+//IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+/*{
// start help system
Help* pHelp = Application::GetHelp();
if( pHelp )
@@ -559,61 +559,68 @@
pHelp->Start( rtl::OUString( "HID_SMA_FONTTYPEDIALOG" ), &aHelpButton1 );
}
return 0;
-}
+}*/
-SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice, bool bFreeRes)
- : ModalDialog(pParent, SmResId(RID_FONTTYPEDIALOG)),
- aFixedText1 (this, SmResId(1)),
- aVariableFont (this, SmResId(1)),
- aFixedText2 (this, SmResId(2)),
- aFunctionFont (this, SmResId(2)),
- aFixedText3 (this, SmResId(3)),
- aNumberFont (this, SmResId(3)),
- aFixedText4 (this, SmResId(4)),
- aTextFont (this, SmResId(4)),
- aFixedText5 (this, SmResId(5)),
- aSerifFont (this, SmResId(5)),
- aFixedText6 (this, SmResId(6)),
- aSansFont (this, SmResId(6)),
- aFixedText7 (this, SmResId(7)),
- aFixedFont (this, SmResId(7)),
- aFixedLine1 (this, SmResId(1)),
- aFixedLine2 (this, SmResId(2)),
- aOKButton1 (this, SmResId(1)),
- aHelpButton1 (this, SmResId(1)),
- aCancelButton1 (this, SmResId(1)),
- aMenuButton (this, SmResId(1)),
- aDefaultButton (this, SmResId(2)),
+SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice/*, bool bFreeRes*/)
+ : ModalDialog(pParent, "FontsTypeDialog", "starmath/uiconfig/smath/ui/fontstypedialog.ui"),
+// aFixedText1 (this, SmResId(1)),
+// aVariableFont (this, SmResId(1)),
+// aFixedText2 (this, SmResId(2)),
+// aFunctionFont (this, SmResId(2)),
+// aFixedText3 (this, SmResId(3)),
+// aNumberFont (this, SmResId(3)),
+// aFixedText4 (this, SmResId(4)),
+// aTextFont (this, SmResId(4)),
+// aFixedText5 (this, SmResId(5)),
+// aSerifFont (this, SmResId(5)),
+// aFixedText6 (this, SmResId(6)),
+// aSansFont (this, SmResId(6)),
+// aFixedText7 (this, SmResId(7)),
+// aFixedFont (this, SmResId(7)),
+// aFixedLine1 (this, SmResId(1)),
+// aFixedLine2 (this, SmResId(2)),
+// aOKButton1 (this, SmResId(1)),
+// aHelpButton1 (this, SmResId(1)),
+// aCancelButton1 (this, SmResId(1)),
+// aMenuButton (this, SmResId(1)),
+// aDefaultButton (this, SmResId(2)),
pFontListDev (pFntListDevice)
{
- if (bFreeRes)
- FreeResource();
+ get(m_pBP_OK, "ok");
+ get(m_pLB_VariableFont, "variablefont");
+ get(m_pLB_FunctionFont, "functionfont");
+ get(m_pLB_NumberFont, "numberfont");
+ get(m_pLB_TextFont, "textfont");
+ get(m_pLB_SerifFont, "seriffont");
+ get(m_pLB_SansFont, "sansfont");
+ get(m_pLB_FixedFont, "fixedfont");
- aDefaultButton.SetClickHdl(LINK(this, SmFontTypeDialog, DefaultButtonClickHdl));
- aHelpButton1.SetClickHdl(LINK(this, SmFontTypeDialog, HelpButtonClickHdl));
+ m_pBP_DefaultButton->SetClickHdl(LINK(this, SmFontTypeDialog, DefaultButtonClickHdl));
+ m_pBP_HelpButton1->SetClickHdl(LINK(this, SmFontTypeDialog, HelpButtonClickHdl));
- aMenuButton.GetPopupMenu()->SetSelectHdl(LINK(this, SmFontTypeDialog, MenuSelectHdl));
+ m_pBP_MenuButton->GetPopupMenu()->SetSelectHdl(LINK(this, SmFontTypeDialog, MenuSelectHdl));
+ m_pBP_OK->SetClickHdl( LINK( this, SmFontTypeDialog, OkHdl ) );
}
void SmFontTypeDialog::ReadFrom(const SmFormat &rFormat)
{
SmModule *pp = SM_MOD();
- aVariableFont = pp->GetConfig()->GetFontPickList(FNT_VARIABLE);
- aFunctionFont = pp->GetConfig()->GetFontPickList(FNT_FUNCTION);
- aNumberFont = pp->GetConfig()->GetFontPickList(FNT_NUMBER);
- aTextFont = pp->GetConfig()->GetFontPickList(FNT_TEXT);
- aSerifFont = pp->GetConfig()->GetFontPickList(FNT_SERIF);
- aSansFont = pp->GetConfig()->GetFontPickList(FNT_SANS);
- aFixedFont = pp->GetConfig()->GetFontPickList(FNT_FIXED);
+ m_pLB_VariableFont = pp->GetConfig()->GetFontPickList(FNT_VARIABLE);
+ m_pLB_FunctionFont = pp->GetConfig()->GetFontPickList(FNT_FUNCTION);
+ m_pLB_NumberFont = pp->GetConfig()->GetFontPickList(FNT_NUMBER);
+ m_pLB_TextFont = pp->GetConfig()->GetFontPickList(FNT_TEXT);
+ m_pLB_SerifFont = pp->GetConfig()->GetFontPickList(FNT_SERIF);
+ m_pLB_SansFont = pp->GetConfig()->GetFontPickList(FNT_SANS);
+ m_pLB_FixedFont = pp->GetConfig()->GetFontPickList(FNT_FIXED);
- aVariableFont.Insert( rFormat.GetFont(FNT_VARIABLE) );
- aFunctionFont.Insert( rFormat.GetFont(FNT_FUNCTION) );
- aNumberFont .Insert( rFormat.GetFont(FNT_NUMBER) );
- aTextFont .Insert( rFormat.GetFont(FNT_TEXT) );
- aSerifFont .Insert( rFormat.GetFont(FNT_SERIF) );
- aSansFont .Insert( rFormat.GetFont(FNT_SANS) );
- aFixedFont .Insert( rFormat.GetFont(FNT_FIXED) );
+ m_pLB_VariableFont->Insert( rFormat.GetFont(FNT_VARIABLE) );
+ m_pLB_FunctionFont->Insert( rFormat.GetFont(FNT_FUNCTION) );
+ m_pLB_NumberFont ->Insert( rFormat.GetFont(FNT_NUMBER) );
+ m_pLB_TextFont ->Insert( rFormat.GetFont(FNT_TEXT) );
+ m_pLB_SerifFont ->Insert( rFormat.GetFont(FNT_SERIF) );
+ m_pLB_SansFont ->Insert( rFormat.GetFont(FNT_SANS) );
+ m_pLB_FixedFont ->Insert( rFormat.GetFont(FNT_FIXED) );
}
@@ -621,21 +628,21 @@
{
SmModule *pp = SM_MOD();
- pp->GetConfig()->GetFontPickList(FNT_VARIABLE) = aVariableFont;
- pp->GetConfig()->GetFontPickList(FNT_FUNCTION) = aFunctionFont;
- pp->GetConfig()->GetFontPickList(FNT_NUMBER) = aNumberFont;
- pp->GetConfig()->GetFontPickList(FNT_TEXT) = aTextFont;
- pp->GetConfig()->GetFontPickList(FNT_SERIF) = aSerifFont;
- pp->GetConfig()->GetFontPickList(FNT_SANS) = aSansFont;
- pp->GetConfig()->GetFontPickList(FNT_FIXED) = aFixedFont;
+ pp->GetConfig()->GetFontPickList(FNT_VARIABLE) = m_pLB_VariableFont;
+ pp->GetConfig()->GetFontPickList(FNT_FUNCTION) = m_pLB_FunctionFont;
+ pp->GetConfig()->GetFontPickList(FNT_NUMBER) = m_pLB_NumberFont;
+ pp->GetConfig()->GetFontPickList(FNT_TEXT) = m_pLB_TextFont;
+ pp->GetConfig()->GetFontPickList(FNT_SERIF) = m_pLB_SerifFont;
+ pp->GetConfig()->GetFontPickList(FNT_SANS) = m_pLB_SansFont;
+ pp->GetConfig()->GetFontPickList(FNT_FIXED) = m_pLB_FixedFont;
- rFormat.SetFont( FNT_VARIABLE, aVariableFont.Get(0) );
- rFormat.SetFont( FNT_FUNCTION, aFunctionFont.Get(0) );
- rFormat.SetFont( FNT_NUMBER, aNumberFont .Get(0) );
- rFormat.SetFont( FNT_TEXT, aTextFont .Get(0) );
- rFormat.SetFont( FNT_SERIF, aSerifFont .Get(0) );
- rFormat.SetFont( FNT_SANS, aSansFont .Get(0) );
- rFormat.SetFont( FNT_FIXED, aFixedFont .Get(0) );
+ rFormat.SetFont( FNT_VARIABLE, m_pLB_VariableFont->Get(0) );
+ rFormat.SetFont( FNT_FUNCTION, m_pLB_FunctionFont->Get(0) );
+ rFormat.SetFont( FNT_NUMBER, m_pLB_NumberFont ->Get(0) );
+ rFormat.SetFont( FNT_TEXT, m_pLB_TextFont ->Get(0) );
+ rFormat.SetFont( FNT_SERIF, m_pLB_SerifFont ->Get(0) );
+ rFormat.SetFont( FNT_SANS, m_pLB_SansFont ->Get(0) );
+ rFormat.SetFont( FNT_FIXED, m_pLB_FixedFont ->Get(0) );
rFormat.RequestApplyChanges();
}
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 0e5ebf5..c6f078b 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -283,7 +283,7 @@
Text [ en-US ] = "~Default" ;
};
};
-
+/*
ModalDialog RID_FONTTYPEDIALOG
{
OutputSize = TRUE ;
@@ -292,19 +292,19 @@
Size = MAP_APPFONT ( 282 , 153 ) ;
Text [ en-US ] = "Fonts" ;
Moveable = TRUE ;
- FixedLine 1
+// FixedLine 1
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 207 , 8 ) ;
Text [ en-US ] = "Formula fonts" ;
};
- FixedLine 2
+// FixedLine 2
{
Pos = MAP_APPFONT ( 6 , 84 ) ;
Size = MAP_APPFONT ( 207 , 8 ) ;
Text [ en-US ] = "Custom fonts" ;
};
- FixedText 1
+// FixedText 1
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 18 ) ;
@@ -320,7 +320,7 @@
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedText 2
+// FixedText 2
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 33 ) ;
@@ -336,7 +336,7 @@
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedText 3
+// FixedText 3
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 51 ) ;
@@ -352,7 +352,7 @@
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedText 4
+// FixedText 4
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 66 ) ;
@@ -368,7 +368,7 @@
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedText 5
+// FixedText 5
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 97 ) ;
@@ -384,7 +384,7 @@
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedText 6
+// FixedText 6
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 112 ) ;
@@ -400,7 +400,7 @@
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedText 7
+// FixedText 7
{
Left = TRUE ;
Pos = MAP_APPFONT ( 12 , 127 ) ;
@@ -454,7 +454,7 @@
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Default" ;
};
-};
+};*/
ModalDialog RID_DISTANCEDIALOG
{
diff --git a/starmath/uiconfig/smath/ui/fontstypedialog.ui b/starmath/uiconfig/smath/ui/fontstypedialog.ui
new file mode 100644
index 0000000..f371fae
--- /dev/null
+++ b/starmath/uiconfig/smath/ui/fontstypedialog.ui
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="dialog1">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="modify">
+ <property name="label" translatable="yes">button</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="default">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="labelFixedText1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Variables</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="labelFixedText2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Functions</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="GtkLabel" id="labelFixedText3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Numbers</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelFixedText4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Text</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="variablefont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkComboBox" id="functionfont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="numberfont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkComboBox" id="textfont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="labelFixedLine1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Formula fonts</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="labelFixedText5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Serif</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="labelFixedText6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">S_ans</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="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">F_ixed</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="seriffont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkComboBox" id="sansfont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="fixedfont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="labelFixedLine2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Custom Fonts</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">modify</action-widget>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">default</action-widget>
+ </action-widgets>
+ </object>
+</interface>
--
To view, visit https://gerrit.libreoffice.org/3181
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I745373e583d71819de34671f2e4f3a39871b6b9a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper <joren.libreoffice at telenet.be>
More information about the LibreOffice
mailing list