[Libreoffice-commits] core.git: 3 commits - starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk vcl/source
Caolán McNamara
caolanm at redhat.com
Fri May 24 04:07:38 PDT 2013
starmath/UIConfig_smath.mk | 1
starmath/inc/dialog.hxx | 49
starmath/inc/starmath.hrc | 2
starmath/source/dialog.cxx | 158 --
starmath/source/smres.src | 473 ------
starmath/uiconfig/smath/ui/spacing.ui | 260 ---
starmath/uiconfig/smath/ui/spacingdialog.ui | 2059 ++++++++++++++++++++++++++++
vcl/source/control/button.cxx | 7
vcl/source/control/menubtn.cxx | 1
9 files changed, 2156 insertions(+), 854 deletions(-)
New commits:
commit a591f0dd0fdf41b3fd8922cdeae479afc692e439
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 22 11:03:42 2013 +0100
adapt code to spacing dialog .ui conversion
Change-Id: I4ec9444b3ad0d243fda0d93547f000cb7296c0bc
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 9c42043..d72ae83 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/printeroptions \
+ starmath/uiconfig/smath/ui/spacingdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 89eec63..ca902b5 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -23,6 +23,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
+#include <vcl/layout.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/combobox.hxx>
#include <svx/charmap.hxx>
@@ -194,17 +195,17 @@ public:
#define NOCATEGORIES 10
-class SmCategoryDesc : public Resource
+class SmCategoryDesc
{
- OUString Name;
+ OUString Name;
OUString *Strings[4];
- Bitmap *Graphics[4]; /* regular bitmaps */
- sal_uInt16 Minimum[4];
- sal_uInt16 Maximum[4];
- sal_uInt16 Value[4];
+ Image *Graphics[4]; /* regular bitmaps */
+ sal_uInt16 Minimum[4];
+ sal_uInt16 Maximum[4];
+ sal_uInt16 Value[4];
public:
- SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx);
+ SmCategoryDesc(VclBuilderContainer& rBuilder, sal_uInt16 nCategoryIdx);
~SmCategoryDesc();
const OUString& GetName() const { return Name; }
@@ -214,7 +215,7 @@ public:
sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; }
void SetValue(sal_uInt16 Index, sal_uInt16 nVal) { Value[Index] = nVal;}
- const Bitmap * GetGraphic(sal_uInt16 Index) const
+ const Image * GetGraphic(sal_uInt16 Index) const
{
return Graphics[Index];
}
@@ -223,22 +224,19 @@ public:
class SmDistanceDialog : public ModalDialog
{
- FixedText aFixedText1;
- MetricField aMetricField1;
- FixedText aFixedText2;
- MetricField aMetricField2;
- FixedText aFixedText3;
- MetricField aMetricField3;
- CheckBox aCheckBox1;
- FixedText aFixedText4;
- MetricField aMetricField4;
- OKButton aOKButton1;
- HelpButton aHelpButton1;
- CancelButton aCancelButton1;
- MenuButton aMenuButton;
- PushButton aDefaultButton;
- FixedBitmap aBitmap;
- FixedLine aFixedLine;
+ VclFrame* m_pFrame;
+ FixedText* m_pFixedText1;
+ MetricField* m_pMetricField1;
+ FixedText* m_pFixedText2;
+ MetricField* m_pMetricField2;
+ FixedText* m_pFixedText3;
+ MetricField* m_pMetricField3;
+ CheckBox* m_pCheckBox1;
+ FixedText* m_pFixedText4;
+ MetricField* m_pMetricField4;
+ MenuButton* m_pMenuButton;
+ PushButton* m_pDefaultButton;
+ FixedImage* m_pBitmap;
SmCategoryDesc *Categories[NOCATEGORIES];
sal_uInt16 nActiveCategory;
@@ -247,7 +245,6 @@ class SmDistanceDialog : public ModalDialog
DECL_LINK(GetFocusHdl, Control *);
DECL_LINK(MenuSelectHdl, Menu *);
DECL_LINK(DefaultButtonClickHdl, Button *);
- DECL_LINK(HelpButtonClickHdl, Button *);
DECL_LINK(CheckBoxClickHdl, CheckBox *);
using Window::SetHelpId;
@@ -255,7 +252,7 @@ class SmDistanceDialog : public ModalDialog
void SetCategory(sal_uInt16 Category);
public:
- SmDistanceDialog(Window *pParent, bool bFreeRes = true);
+ SmDistanceDialog(Window *pParent);
~SmDistanceDialog();
void ReadFrom(const SmFormat &rFormat);
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 165ecce..7cb9f4f 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -84,7 +84,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_PRINTOPTIONPAGE (RID_APP_START + 7)
#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
@@ -99,7 +98,6 @@
#define RID_UNDOFORMATNAME (RID_APP_START + 504)
#define RID_COMMANDMENU (RID_APP_START + 701)
#define RID_VIEWMENU (RID_APP_START + 702)
-#define RID_DISTANCEMENU (RID_APP_START + 703)
#define RID_FONTMENU (RID_APP_START + 704)
#define RID_TOOLBOXWINDOW (RID_APP_START + 801)
#define RID_CMDBOXWINDOW (RID_APP_START + 802)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4abdcba..149cf10 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -683,45 +683,40 @@ static const FieldMinMax pMinMaxData[10][4] =
{{ 0, 10000 }, { 0, 10000 }, { 0, 10000 }, { 0, 10000 }}
};
-SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) :
- Resource(rResId)
+SmCategoryDesc::SmCategoryDesc(VclBuilderContainer& rBuilder, sal_uInt16 nCategoryIdx)
{
- if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING)))
+ ++nCategoryIdx;
+ FixedText *pTitle = rBuilder.get<FixedText>(OString::number(nCategoryIdx)+"title");
+ if (pTitle)
{
- Name = ResId(1,*rResId.GetResMgr()).toString();
+ Name = pTitle->GetText();
- int i;
- for (i = 0; i < 4; i++)
+ for (int i = 0; i < 4; ++i)
{
- int nI2 = i + 2;
+ FixedText *pLabel = rBuilder.get<FixedText>(OString::number(nCategoryIdx)+"label"+OString::number(i+1));
- if (IsAvailableRes(ResId(nI2,*rResId.GetResMgr()).SetRT(RSC_STRING)))
+ if (pLabel)
{
- Strings [i] = new OUString(ResId(nI2,*rResId.GetResMgr()).toString());
- Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr()));
+ Strings [i] = new OUString(pLabel->GetText());
+ FixedImage *pImage = rBuilder.get<FixedImage>(OString::number(nCategoryIdx)+"image"+OString::number(i+1));
+ Graphics [i] = new Image(pImage->GetImage());
}
else
{
Strings [i] = 0;
Graphics [i] = 0;
}
- }
- for (i = 0; i < 4; i++)
- {
const FieldMinMax &rMinMax = pMinMaxData[ nCategoryIdx ][i];
Value[i] = Minimum[i] = rMinMax.nMin;
Maximum[i] = rMinMax.nMax;
}
}
-
- FreeResource();
}
-
SmCategoryDesc::~SmCategoryDesc()
{
- for (int i = 0; i < 4; i++)
+ for (int i = 0; i < 4; ++i)
{
delete Strings [i];
delete Graphics [i];
@@ -736,17 +731,17 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl )
{
sal_uInt16 i;
- if (pControl == &aMetricField1)
+ if (pControl == m_pMetricField1)
i = 0;
- else if (pControl == &aMetricField2)
+ else if (pControl == m_pMetricField2)
i = 1;
- else if (pControl == &aMetricField3)
+ else if (pControl == m_pMetricField3)
i = 2;
- else if (pControl == &aMetricField4)
+ else if (pControl == m_pMetricField4)
i = 3;
else
return 0;
- aBitmap.SetBitmap(*(Categories[nActiveCategory]->GetGraphic(i)));
+ m_pBitmap->SetImage(*(Categories[nActiveCategory]->GetGraphic(i)));
}
return 0;
}
@@ -773,27 +768,15 @@ IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton
return 0;
}
-IMPL_LINK( SmDistanceDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
-{
- // start help system
- Help* pHelp = Application::GetHelp();
- if( pHelp )
- {
- pHelp->Start( OUString( "HID_SMA_DISTANCEDIALOG" ), &aHelpButton1 );
- }
- return 0;
-}
-
-
IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
{
- if (pCheckBox == &aCheckBox1)
+ if (pCheckBox == m_pCheckBox1)
{
- aCheckBox1.Toggle();
+ m_pCheckBox1->Toggle();
- bool bChecked = aCheckBox1.IsChecked();
- aFixedText4 .Enable( bChecked );
- aMetricField4.Enable( bChecked );
+ bool bChecked = m_pCheckBox1->IsChecked();
+ m_pFixedText4->Enable( bChecked );
+ m_pMetricField4->Enable( bChecked );
}
return 0;
}
@@ -847,10 +830,10 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
// array to help iterate over the controls
Window * const aWin[4][2] =
{
- { &aFixedText1, &aMetricField1 },
- { &aFixedText2, &aMetricField2 },
- { &aFixedText3, &aMetricField3 },
- { &aFixedText4, &aMetricField4 }
+ { m_pFixedText1, m_pMetricField1 },
+ { m_pFixedText2, m_pMetricField2 },
+ { m_pFixedText3, m_pMetricField3 },
+ { m_pFixedText4, m_pMetricField4 }
};
SmCategoryDesc *pCat;
@@ -860,15 +843,15 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
if (nActiveCategory != CATEGORY_NONE)
{
pCat = Categories[nActiveCategory];
- pCat->SetValue(0, (sal_uInt16) aMetricField1.GetValue());
- pCat->SetValue(1, (sal_uInt16) aMetricField2.GetValue());
- pCat->SetValue(2, (sal_uInt16) aMetricField3.GetValue());
- pCat->SetValue(3, (sal_uInt16) aMetricField4.GetValue());
+ pCat->SetValue(0, (sal_uInt16) m_pMetricField1->GetValue());
+ pCat->SetValue(1, (sal_uInt16) m_pMetricField2->GetValue());
+ pCat->SetValue(2, (sal_uInt16) m_pMetricField3->GetValue());
+ pCat->SetValue(3, (sal_uInt16) m_pMetricField4->GetValue());
if (nActiveCategory == 5)
- bScaleAllBrackets = aCheckBox1.IsChecked();
+ bScaleAllBrackets = m_pCheckBox1->IsChecked();
- aMenuButton.GetPopupMenu()->CheckItem(nActiveCategory + 1, false);
+ m_pMenuButton->GetPopupMenu()->CheckItem(nActiveCategory + 1, false);
}
// activation/deactivation of the associated controls depending on the chosen category
@@ -918,68 +901,63 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
}
// activate the CheckBox and the associated MetricField if we're dealing with the brackets menu
bActive = nCategory == 5;
- aCheckBox1.Show(bActive);
- aCheckBox1.Enable(bActive);
+ m_pCheckBox1->Show(bActive);
+ m_pCheckBox1->Enable(bActive);
if (bActive)
{
- aCheckBox1.Check( bScaleAllBrackets );
+ m_pCheckBox1->Check( bScaleAllBrackets );
- bool bChecked = aCheckBox1.IsChecked();
- aFixedText4 .Enable( bChecked );
- aMetricField4.Enable( bChecked );
+ bool bChecked = m_pCheckBox1->IsChecked();
+ m_pFixedText4->Enable( bChecked );
+ m_pMetricField4->Enable( bChecked );
}
- aMenuButton.GetPopupMenu()->CheckItem(nCategory + 1, true);
- aFixedLine.SetText(Categories[nCategory]->GetName());
+ m_pMenuButton->GetPopupMenu()->CheckItem(nCategory + 1, true);
+ m_pFrame->set_label(Categories[nCategory]->GetName());
nActiveCategory = nCategory;
- aMetricField1.GrabFocus();
+ m_pMetricField1->GrabFocus();
Invalidate();
Update();
}
-SmDistanceDialog::SmDistanceDialog(Window *pParent, bool bFreeRes)
- : ModalDialog(pParent, SmResId(RID_DISTANCEDIALOG)),
- aFixedText1 (this, SmResId(1)),
- aMetricField1 (this, SmResId(1)),
- aFixedText2 (this, SmResId(2)),
- aMetricField2 (this, SmResId(2)),
- aFixedText3 (this, SmResId(3)),
- aMetricField3 (this, SmResId(3)),
- aCheckBox1 (this, SmResId(1)),
- aFixedText4 (this, SmResId(4)),
- aMetricField4 (this, SmResId(4)),
- aOKButton1 (this, SmResId(1)),
- aHelpButton1 (this, SmResId(1)),
- aCancelButton1 (this, SmResId(1)),
- aMenuButton (this, SmResId(1)),
- aDefaultButton (this, SmResId(1)),
- aBitmap (this, SmResId(1)),
- aFixedLine (this, SmResId(1))
+SmDistanceDialog::SmDistanceDialog(Window *pParent)
+ : ModalDialog(pParent, "SpacingDialog",
+ "modules/smath/ui/spacingdialog.ui")
{
- for (sal_uInt16 i = 0; i < NOCATEGORIES; i++)
- Categories[i] = new SmCategoryDesc(SmResId(i + 1), i);
+ get(m_pFrame, "template");
+ get(m_pFixedText1, "label1");
+ get(m_pMetricField1, "spinbutton1");
+ get(m_pFixedText2, "label2");
+ get(m_pMetricField2, "spinbutton2");
+ get(m_pFixedText3, "label3");
+ get(m_pMetricField3, "spinbutton3");
+ get(m_pCheckBox1, "checkbutton");
+ get(m_pFixedText4, "label4");
+ get(m_pMetricField4, "spinbutton4");
+ get(m_pMenuButton, "category");
+ get(m_pDefaultButton, "default");
+ get(m_pBitmap, "image");
+
+ for (sal_uInt16 i = 0; i < NOCATEGORIES; ++i)
+ Categories[i] = new SmCategoryDesc(*this, i);
nActiveCategory = CATEGORY_NONE;
bScaleAllBrackets = false;
- if (bFreeRes)
- FreeResource();
-
// preview like controls should have a 2D look
- aBitmap.SetBorderStyle( WINDOW_BORDER_MONO );
+ m_pBitmap->SetBorderStyle( WINDOW_BORDER_MONO );
- aMetricField1.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
- aMetricField2.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
- aMetricField3.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
- aMetricField4.SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
- aCheckBox1.SetClickHdl(LINK(this, SmDistanceDialog, CheckBoxClickHdl));
+ m_pMetricField1->SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
+ m_pMetricField2->SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
+ m_pMetricField3->SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
+ m_pMetricField4->SetGetFocusHdl(LINK(this, SmDistanceDialog, GetFocusHdl));
+ m_pCheckBox1->SetClickHdl(LINK(this, SmDistanceDialog, CheckBoxClickHdl));
- aMenuButton.GetPopupMenu()->SetSelectHdl(LINK(this, SmDistanceDialog, MenuSelectHdl));
+ m_pMenuButton->GetPopupMenu()->SetSelectHdl(LINK(this, SmDistanceDialog, MenuSelectHdl));
- aDefaultButton.SetClickHdl(LINK(this, SmDistanceDialog, DefaultButtonClickHdl));
- aHelpButton1.SetClickHdl(LINK(this, SmDistanceDialog, HelpButtonClickHdl));
+ m_pDefaultButton->SetClickHdl(LINK(this, SmDistanceDialog, DefaultButtonClickHdl));
}
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index d17398d..805b290 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -27,10 +27,6 @@
#include "smcommands.h"
#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-#define MN_SUB_TOOLBAR 32
-#define WORKARROUND_1 1
-#define WORKARROUND_3 3
-#define WORKARROUND_10 10
ModalDialog RID_FONTDIALOG
{
@@ -456,419 +452,6 @@ ModalDialog RID_FONTTYPEDIALOG
};
};
-ModalDialog RID_DISTANCEDIALOG
-{
- Moveable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- HelpId = CMD_SID_DISTANCE ;
- Size = MAP_APPFONT ( 250 , 120 ) ;
- Text [ en-US ] = "Spacing" ;
- FixedText 1
- {
- Pos = MAP_APPFONT ( 12 , 19 ) ;
- Size = MAP_APPFONT ( 65 , 10 ) ;
- Left = TRUE ;
- };
- MetricField 1
- {
- HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:1";
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Spin = TRUE ;
- SpinSize = 1 ;
- Repeat = TRUE;
- Pos = MAP_APPFONT ( 78 , 18 ) ;
- Size = MAP_APPFONT ( 38 , 12 ) ;
- CustomUnitText [ en-US ] = "%" ;
- };
- FixedText 2
- {
- Disable = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 35 ) ;
- Size = MAP_APPFONT ( 65 , 10 ) ;
- Left = TRUE ;
- };
- MetricField 2
- {
- HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:2";
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Spin = TRUE ;
- SpinSize = 1 ;
- Repeat = TRUE;
- Pos = MAP_APPFONT ( 78 , 34 ) ;
- Size = MAP_APPFONT ( 38 , 12 ) ;
- CustomUnitText [ en-US ] = "%" ;
- };
- CheckBox 1
- {
- HelpID = "starmath:CheckBox:RID_DISTANCEDIALOG:1";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 55 ) ;
- Size = MAP_APPFONT ( 110 , 12 ) ;
- Text [ en-US ] = "Scale all brackets";
- };
- FixedText 3
- {
- Disable = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 51 ) ;
- Size = MAP_APPFONT ( 65 , 10 ) ;
- Left = TRUE ;
- };
- MetricField 3
- {
- HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:3";
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Spin = TRUE ;
- SpinSize = 1 ;
- Repeat = TRUE;
- Pos = MAP_APPFONT ( 78 , 50 ) ;
- Size = MAP_APPFONT ( 38 , 12 ) ;
- CustomUnitText [ en-US ] = "%" ;
- };
- FixedText 4
- {
- Disable = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 67 ) ;
- Size = MAP_APPFONT ( 65 , 10 ) ;
- Left = TRUE ;
- };
- MetricField 4
- {
- HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:4";
- Border = TRUE ;
- TabStop = TRUE ;
- Left = TRUE ;
- Spin = TRUE ;
- SpinSize = 1 ;
- Repeat = TRUE;
- Pos = MAP_APPFONT ( 78 , 66 ) ;
- Size = MAP_APPFONT ( 38 , 12 ) ;
- TabStop = TRUE ;
- };
- OKButton 1
- {
- Pos = MAP_APPFONT ( 184 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT ( 184 , 24 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton 1
- {
- Pos = MAP_APPFONT ( 184 , 87 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- HelpID = "starmath:HelpButton:RID_DISTANCEDIALOG:1";
- Text [ en-US ] = "~Help" ;
- };
- PushButton 1
- {
- HelpID = "starmath:PushButton:RID_DISTANCEDIALOG:1";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 184 , 69 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Default" ;
- };
- MenuButton 1
- {
- HelpID = "starmath:MenuButton:RID_DISTANCEDIALOG:1";
- TabStop = TRUE ;
- ButtonMenu = Menu , RID_DISTANCEMENU ;
- Pos = MAP_APPFONT ( 184 , 51 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Category" ;
- };
- FixedBitmap 1
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 122 , 18 ) ;
- Size = MAP_APPFONT ( 49 , 53 ) ;
- };
- FixedLine 1
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 171 , 8 ) ;
- Text [ en-US ] = "Category" ;
- };
- Resource 1
- {
- String 1
- {
- Text [ en-US ] = "Spacing" ;
- };
- String 2
- {
- Text [ en-US ] = "~Spacing";
- };
- Bitmap 20
- {
- File = "dist11.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Line spacing";
- };
- Bitmap 30
- {
- File = "dist12.bmp" ;
- };
- String 4
- {
- Text [ en-US ] = "~Root spacing";
- };
- Bitmap 40
- {
- File = "dist13.bmp" ;
- };
- };
- Resource 2
- {
- String 1
- {
- Text [ en-US ] = "Indexes";
- };
- String 2
- {
- Text [ en-US ] = "~Superscript";
- };
- Bitmap 20
- {
- File = "dist21.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "S~ubscript";
- };
- Bitmap 30
- {
- File = "dist22.bmp" ;
- };
- };
- Resource 3
- {
- String 1
- {
- Text [ en-US ] = "Fractions" ;
- };
- String 2
- {
- Text [ en-US ] = "~Numerator";
- };
- Bitmap 20
- {
- File = "dist31.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Denominator";
- };
- Bitmap 30
- {
- File = "dist32.bmp" ;
- };
- };
- Resource 4
- {
- String 1
- {
- Text [ en-US ] = "Fraction bar" ;
- };
- String 2
- {
- Text [ en-US ] = "~Excess length";
- };
- Bitmap 20
- {
- File = "dist41.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Weight";
- };
- Bitmap 30
- {
- File = "dist42.bmp" ;
- };
- };
- Resource 5
- {
- String 1
- {
- Text [ en-US ] = "Limits" ;
- };
- String 2
- {
- Text [ en-US ] = "~Upper limit";
- };
- Bitmap 20
- {
- File = "dist51.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Lower limit";
- };
- Bitmap 30
- {
- File = "dist52.bmp" ;
- };
- };
- Resource 6
- {
- String 1
- {
- Text [ en-US ] = "Brackets" ;
- };
- String 2
- {
- Text [ en-US ] = "~Excess size (left/right)";
- };
- Bitmap 20
- {
- File = "dist61.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Spacing";
- };
- Bitmap 30
- {
- File = "dist62.bmp" ;
- };
- String 5
- {
- Text [ en-US ] = "~Excess size";
- };
- Bitmap 50
- {
- File = "dist61.bmp" ;
- };
- };
- Resource 7
- {
- String 1
- {
- Text [ en-US ] = "Matrix" ;
- };
- String 2
- {
- Text [ en-US ] = "~Line spacing";
- };
- Bitmap 20
- {
- File = "dist71.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Column spacing";
- };
- Bitmap 30
- {
- File = "dist72.bmp" ;
- };
- };
- Resource 8
- {
- String 1
- {
- Text [ en-US ] = "Symbols" ;
- };
- String 2
- {
- Text [ en-US ] = "~Primary height";
- };
- Bitmap 20
- {
- File = "dist81.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Minimum spacing";
- };
- Bitmap 30
- {
- File = "dist82.bmp" ;
- };
- };
- Resource 9
- {
- String 1
- {
- Text [ en-US ] = "Operators" ;
- };
- String 2
- {
- Text [ en-US ] = "~Excess size";
- };
- Bitmap 20
- {
- File = "dist91.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Spacing";
- };
- Bitmap 30
- {
- File = "dist92.bmp" ;
- };
- };
- Resource 10
- {
- String 1
- {
- Text [ en-US ] = "Borders";
- };
- String 2
- {
- Text [ en-US ] = "~Left";
- };
- Bitmap 20
- {
- File = "dist101.bmp" ;
- };
- String 3
- {
- Text [ en-US ] = "~Right";
- };
- Bitmap 30
- {
- File = "dist102.bmp" ;
- };
- String 4
- {
- Text [ en-US ] = "~Top";
- };
- Bitmap 40
- {
- File = "dist103.bmp" ;
- };
- String 5
- {
- Text [ en-US ] = "~Bottom";
- };
- Bitmap 50
- {
- File = "dist104.bmp" ;
- };
- };
-};
-
-
TabPage RID_PRINTOPTIONPAGE
{
HelpID = "starmath:TabPage:RID_PRINTOPTIONPAGE";
@@ -1301,62 +884,6 @@ Menu RID_VIEWMENU
};
};
};
-Menu RID_DISTANCEMENU
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = WORKARROUND_1 ;
- Text [ en-US ] = "Spacing" ;
- };
- MenuItem
- {
- Identifier = 2 ;
- Text [ en-US ] = "Indexes" ;
- };
- MenuItem
- {
- Identifier = WORKARROUND_3 ;
- Text [ en-US ] = "Fractions" ;
- };
- MenuItem
- {
- Identifier = 4 ;
- Text [ en-US ] = "Fraction Bars" ;
- };
- MenuItem
- {
- Identifier = 5 ;
- Text [ en-US ] = "Limits" ;
- };
- MenuItem
- {
- Identifier = 6 ;
- Text [ en-US ] = "Brackets" ;
- };
- MenuItem
- {
- Identifier = 7 ;
- Text [ en-US ] = "Matrices" ;
- };
- MenuItem
- {
- Identifier = 8 ;
- Text [ en-US ] = "Symbols" ;
- };
- MenuItem
- {
- Identifier = 9 ;
- Text [ en-US ] = "Operators" ;
- };
- MenuItem
- {
- Identifier = WORKARROUND_10 ;
- Text [ en-US ] = "Borders";
- };
- };
-};
Menu RID_FONTMENU
{
diff --git a/starmath/uiconfig/smath/ui/spacing.ui b/starmath/uiconfig/smath/ui/spacing.ui
deleted file mode 100644
index 8954bf9..0000000
--- a/starmath/uiconfig/smath/ui/spacing.ui
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="spacing">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Spacing</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox4">
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area4">
- <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="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</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_action_appearance">False</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="GtkComboBox" id="combobox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="add_tearoffs">True</property>
- <property name="tearoff_title">_Category</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="combobox-entry">
- <property name="can_focus">False</property>
- <property name="invisible_char">â—</property>
- <property name="placeholder_text">Category</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button1">
- <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_action_appearance">False</property>
- <property name="use_underline">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="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_action_appearance">False</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="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <child>
- <object class="GtkSpinButton" id="spinbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</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="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Spacing</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="label" translatable="yes">_Line Spacing</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="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Root Spacing</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Spacing</b></property>
- <property name="font">True</property>
- <property name="use_underline">True</property>
- </object>
- </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">button1</action-widget>
- <action-widget response="0">help</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/starmath/uiconfig/smath/ui/spacingdialog.ui b/starmath/uiconfig/smath/ui/spacingdialog.ui
new file mode 100644
index 0000000..17c569a
--- /dev/null
+++ b/starmath/uiconfig/smath/ui/spacingdialog.ui
@@ -0,0 +1,2059 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="SpacingDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Spacing</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox4">
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area4">
+ <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="can_default">True</property>
+ <property name="has_default">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="category:menu">
+ <property name="label" translatable="yes">_Category</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">2</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="default">
+ <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">3</property>
+ <property name="secondary">True</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">4</property>
+ <property name="secondary">True</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="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="template">
+ <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="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <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>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton1:0.00cm">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">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="GtkSpinButton" id="spinbutton2:0.00cm">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton3:0.00cm">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</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>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label">String 1</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinbutton1:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label">String 2</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinbutton2:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label">String 3</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinbutton3:0.00cm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton4:0.00cm">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </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="GtkLabel" id="label4">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label">String 4</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinbutton4:0.00cm</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="GtkCheckButton" id="checkbutton">
+ <property name="label" translatable="yes">Scale all brackets</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="no_show_all">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">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="stock">gtk-missing-image</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">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">Title</property>
+ <property name="use_underline">True</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="frame1">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</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="alignment3">
+ <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="GtkBox" id="box8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <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>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="1label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Spacing</property>
+ <property name="use_underline">True</property>
+ </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="1label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Line spacing</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="1label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Root spacing</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="1image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist11.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="1image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist12.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="1image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist13.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </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">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="1title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Spacing</property>
+ <property name="use_underline">True</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>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</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="alignment4">
+ <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="GtkBox" id="box11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <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>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="2label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Superscript</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="2label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">S_ubscript</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="2image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist21.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="2image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist22.png</property>
+ </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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="2title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Indexes</property>
+ <property name="use_underline">True</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">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</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="alignment5">
+ <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="GtkBox" id="box14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <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>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="3label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Numerator</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="3label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Denominator</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="3image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist31.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="3image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist32.png</property>
+ </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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="3title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Fractions</property>
+ <property name="use_underline">True</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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</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="alignment6">
+ <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="GtkBox" id="box17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <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>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="4label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Excess length</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="4label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Weight</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage" id="4image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist41.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="4image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">starmath/res/dist42.png</property>
+ </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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="4title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Fraction bar</property>
+ <property name="use_underline">True</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">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame5">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</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="alignment7">
+ <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="GtkBox" id="box20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <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>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="5label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Upper limit</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="5label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Lower limit</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list