starmath/uiconfig/smath/ui/alignmentdialog.ui | 128 -
starmath/uiconfig/smath/ui/fontdialog.ui | 176 +-
starmath/uiconfig/smath/ui/fontsizedialog.ui | 375 ++---
starmath/uiconfig/smath/ui/fonttypedialog.ui | 450 +++---
starmath/uiconfig/smath/ui/printeroptions.ui | 212 +--
starmath/uiconfig/smath/ui/smathsettings.ui | 374 ++---
starmath/uiconfig/smath/ui/spacingdialog.ui | 1714 ++++++++++++--------------
7 files changed, 1634 insertions(+), 1795 deletions(-)
New commits:
commit 30aacb7826f39601f5729aed929997073ff4e309
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Dec 28 19:11:30 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jan 1 20:41:26 2021 +0100
drop deprecated GtkAlignment, move left/top-padding into child
margin-start/top
for starmath
Change-Id: Ide8aa36cda7a50b4f538dd39955acf51ef308582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108423
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui
b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index 95615b62a4ea..a9555a53920c 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -99,86 +99,80 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkRadioButton" id="left">
+ <property name="label" translatable="yes"
context="alignmentdialog|left">_Left</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="left">
- <property name="label" translatable="yes"
context="alignmentdialog|left">_Left</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="left-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="alignmentdialog|extended_tip|left">Aligns the
selected elements of a formula to the left.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="left-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="alignmentdialog|extended_tip|left">Aligns the
selected elements of a formula to the left.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="center">
- <property name="label" translatable="yes"
context="alignmentdialog|center">_Centered</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="center-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="alignmentdialog|extended_tip|center">Aligns the
elements of a formula to the center.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="center">
+ <property name="label" translatable="yes"
context="alignmentdialog|center">_Centered</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="center-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="alignmentdialog|extended_tip|center">Aligns the
elements of a formula to the center.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="right">
- <property name="label" translatable="yes"
context="alignmentdialog|right">_Right</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="right-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="alignmentdialog|extended_tip|right">Aligns the
elements of a formula to the right.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="right">
+ <property name="label" translatable="yes"
context="alignmentdialog|right">_Right</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="right-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="alignmentdialog|extended_tip|right">Aligns the
elements of a formula to the right.</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">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/starmath/uiconfig/smath/ui/fontdialog.ui
b/starmath/uiconfig/smath/ui/fontdialog.ui
index d857c219d0f6..6cda44c8750d 100644
--- a/starmath/uiconfig/smath/ui/fontdialog.ui
+++ b/starmath/uiconfig/smath/ui/fontdialog.ui
@@ -95,76 +95,70 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="fontgrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">3</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="fontgrid">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">3</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="fonts">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="fonts">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property
name="headers_visible">False</property>
- <property
name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <property
name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="font">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="font-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontdialog|extended_tip|font">Select a font from the list.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="font">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="font-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontdialog|extended_tip|font">Select a font from
the list.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
@@ -194,60 +188,54 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkCheckButton" id="bold">
+ <property name="label" translatable="yes"
context="fontdialog|bold">_Bold</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="column_homogeneous">True</property>
- <child>
- <object class="GtkCheckButton" id="bold">
- <property name="label" translatable="yes"
context="fontdialog|bold">_Bold</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="bold-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontdialog|extended_tip|bold">Check this box to assign the bold
attribute to the font.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="bold-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontdialog|extended_tip|bold">Check this box to
assign the bold attribute to the font.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="italic">
- <property name="label" translatable="yes"
context="fontdialog|italic">_Italic</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="italic-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontdialog|extended_tip|italic">Check this box to assign the italic
attribute to the font.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="italic">
+ <property name="label" translatable="yes"
context="fontdialog|italic">_Italic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="italic-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontdialog|extended_tip|italic">Check this box to
assign the italic attribute to the font.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/starmath/uiconfig/smath/ui/fontsizedialog.ui
b/starmath/uiconfig/smath/ui/fontsizedialog.ui
index c1a25926617c..d43452ce6cba 100644
--- a/starmath/uiconfig/smath/ui/fontsizedialog.ui
+++ b/starmath/uiconfig/smath/ui/fontsizedialog.ui
@@ -136,51 +136,45 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <property name="margin-start">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="fontsizedialog|label4">Base _size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinB_baseSize</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinB_baseSize">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fontsizedialog|label4">Base _size:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinB_baseSize</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinB_baseSize">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentBaseSize</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="spinB_baseSize-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_baseSize">All
elements of a formula are proportionally scaled to the base size. To change the
base size, select or type in the desired point (pt) size. You can also use
other units of measure or other metrics, which are then automatically converted
to points.</property>
- </object>
- </child>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentBaseSize</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="spinB_baseSize-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_baseSize">All
elements of a formula are proportionally scaled to the base size. To change the
base size, select or type in the desired point (pt) size. You can also use
other units of measure or other metrics, which are then automatically converted
to points.</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>
@@ -197,181 +191,174 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkSpinButton" id="spinB_function">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkSpinButton" id="spinB_function">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentRelativeSizes1</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="spinB_function-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontsizedialog|extended_tip|spinB_function">Select the relative size
for names and other function elements in a formula in proportion to the base
size.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</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"
context="fontsizedialog|label2">_Operators:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinB_operator</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</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"
context="fontsizedialog|label3">_Limits:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinB_limit</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinB_operator">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentRelativeSizes2</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="spinB_operator-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontsizedialog|extended_tip|spinB_operator">Select the relative size
of the mathematical operators in a formula in proportion to the base
size.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinB_limit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentRelativeSizes3</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="spinB_limit-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontsizedialog|extended_tip|spinB_limit">Select the relative size for
the limits in a formula in proportion to the base size.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fontsizedialog|label5">_Text:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinB_text</property>
- <property name="xalign">0</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentRelativeSizes1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="spinB_function-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_function">Select
the relative size for names and other function elements in a formula in
proportion to the base size.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fontsizedialog|label7">_Functions:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinB_function</property>
- <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</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"
context="fontsizedialog|label2">_Operators:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">spinB_operator</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</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"
context="fontsizedialog|label3">_Limits:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinB_limit</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinB_operator">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentRelativeSizes2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="spinB_operator-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_operator">Select
the relative size of the mathematical operators in a formula in proportion to
the base size.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fontsizedialog|label6">_Indexes:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinB_index</property>
- <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinB_limit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentRelativeSizes3</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="spinB_limit-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_limit">Select the
relative size for the limits in a formula in proportion to the base
size.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="spinB_text">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentRelativeSizes4</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="spinB_text-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontsizedialog|extended_tip|spinB_text">Select the size for text in a
formula relative to the base size.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="fontsizedialog|label5">_Text:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinB_text</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="fontsizedialog|label7">_Functions:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">spinB_function</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="fontsizedialog|label6">_Indexes:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinB_index</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinB_text">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentRelativeSizes4</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="spinB_text-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_text">Select the
size for text in a formula relative to the base size.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="spinB_index">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentRelativeSizes5</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="spinB_index-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fontsizedialog|extended_tip|spinB_index">Select the relative size for
the indexes in a formula in proportion to the base size.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinB_index">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentRelativeSizes5</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="spinB_index-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fontsizedialog|extended_tip|spinB_index">Select the
relative size for the indexes in a formula in proportion to the base
size.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui
b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index cb1dbc41f323..1059c3bf222e 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -192,151 +192,145 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fonttypedialog|label1">_Variables:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">variableCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</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"
context="fonttypedialog|label2">_Functions:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">functionCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">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"
context="fonttypedialog|label3">_Numbers:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">numberCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</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"
context="fonttypedialog|label4">_Text:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">textCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="variableCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="variableCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|variableCB">You can select the fonts for
the variables in your formula.</property>
- </object>
- </child>
+ <property name="label" translatable="yes"
context="fonttypedialog|label1">_Variables:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">variableCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</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"
context="fonttypedialog|label2">_Functions:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">functionCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">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"
context="fonttypedialog|label3">_Numbers:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">numberCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</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"
context="fonttypedialog|label4">_Text:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">textCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="variableCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="variableCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|variableCB">You can
select the fonts for the variables in your formula.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="functionCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="functionCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|functionCB">Select the fonts for names and
properties of functions.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="functionCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="functionCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|functionCB">Select the
fonts for names and properties of functions.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="numberCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="numberCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|numberCB">You can select the fonts for the
numbers in your formula.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="numberCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="numberCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|numberCB">You can
select the fonts for the numbers in your formula.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="textCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="textCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|textCB">Define the fonts for the text in
your formula here.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="textCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="textCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|textCB">Define the
fonts for the text in your formula here.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
</child>
</object>
</child>
@@ -366,118 +360,112 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fonttypedialog|label5">_Serif:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">serifCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fonttypedialog|label6">S_ans-serif:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">sansCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="fonttypedialog|label7">F_ixed-width:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">fixedCB</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="normal"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="serifCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="serifCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|serifCB">You can specify the font to be
used for the font serif format.</property>
- </object>
- </child>
+ <property name="label" translatable="yes"
context="fonttypedialog|label5">_Serif:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">serifCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="fonttypedialog|label6">S_ans-serif:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sansCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="fonttypedialog|label7">F_ixed-width:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">fixedCB</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="normal"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="serifCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="serifCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|serifCB">You can
specify the font to be used for the font serif format.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="sansCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="sansCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|sansCB">You can specify the font to be
used for sans font formatting.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="sansCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="sansCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|sansCB">You can specify
the font to be used for sans font formatting.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="fixedCB">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="fixedCB-atkobject">
- <property
name="AtkObject::accessible-description" translatable="yes"
context="fonttypedialog|extended_tip|fixedCB">You can specify the font to be
used for fixed font formatting.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="fixedCB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="fixedCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="fonttypedialog|extended_tip|fixedCB">You can
specify the font to be used for fixed font formatting.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/starmath/uiconfig/smath/ui/printeroptions.ui
b/starmath/uiconfig/smath/ui/printeroptions.ui
index 5c3ba04f6e06..a6f2e05f368c 100644
--- a/starmath/uiconfig/smath/ui/printeroptions.ui
+++ b/starmath/uiconfig/smath/ui/printeroptions.ui
@@ -23,66 +23,60 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkCheckButton" id="title">
+ <property name="label" translatable="yes"
context="printeroptions|title">Title</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="title">
- <property name="label" translatable="yes"
context="printeroptions|title">Title</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="formulatext">
- <property name="label" translatable="yes"
context="printeroptions|formulatext">Formula text</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="borders">
- <property name="label" translatable="yes"
context="printeroptions|borders">Borders</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="formulatext">
+ <property name="label" translatable="yes"
context="printeroptions|formulatext">Formula text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="borders">
+ <property name="label" translatable="yes"
context="printeroptions|borders">Borders</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
@@ -110,27 +104,62 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <child>
+ <object class="GtkRadioButton" id="originalsize">
+ <property name="label" translatable="yes"
context="printeroptions|originalsize">Original size</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkRadioButton" id="fittopage">
+ <property name="label" translatable="yes"
context="printeroptions|fittopage">Fit to page</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">originalsize</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkRadioButton" id="originalsize">
- <property name="label" translatable="yes"
context="printeroptions|originalsize">Original size</property>
+ <object class="GtkRadioButton" id="scaling">
+ <property name="label" translatable="yes"
context="printeroptions|scaling">Scaling:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">originalsize</property>
</object>
<packing>
<property name="expand">False</property>
@@ -139,15 +168,10 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="fittopage">
- <property name="label" translatable="yes"
context="printeroptions|fittopage">Fit to page</property>
+ <object class="GtkSpinButton" id="scalingspin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">originalsize</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -155,48 +179,12 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkRadioButton" id="scaling">
- <property name="label" translatable="yes"
context="printeroptions|scaling">Scaling:</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">originalsize</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="scalingspin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment1</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">2</property>
- </packing>
- </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui
b/starmath/uiconfig/smath/ui/smathsettings.ui
index ece1a2472188..fcac0e6f92b3 100644
--- a/starmath/uiconfig/smath/ui/smathsettings.ui
+++ b/starmath/uiconfig/smath/ui/smathsettings.ui
@@ -23,81 +23,75 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkCheckButton" id="title">
+ <property name="label" translatable="yes"
context="smathsettings|title">_Title row</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="title">
- <property name="label" translatable="yes"
context="smathsettings|title">_Title row</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="title-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|title">Specifies whether you want the
name of the document to be included in the printout.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="title-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|title">Specifies whether you want the
name of the document to be included in the printout.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="text">
- <property name="label" translatable="yes"
context="smathsettings|text">_Formula text</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="text-atkobject">
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
