summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdolfo Jayme Barrientos <fitojb@ubuntu.com>2014-10-26 11:13:37 -0600
committerCaolán McNamara <caolanm@redhat.com>2014-10-30 14:06:02 +0000
commit377ffa4d8f6132b5b20a1428af4af2ac02b094f0 (patch)
tree71b134e7a774d46c49a82fce26a7a1a59c305529
parentfc293cecec7732a365d791089a2c92bf2f85fea9 (diff)
HIG fixes for smath dialogs
Disabling manual resizing, setting modal flags, fixing spacing and adding missing colons to labels that precede controls. Change-Id: Id0f180355d302206a632af97dafb6a391c8b4472 Reviewed-on: https://gerrit.libreoffice.org/12105 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--starmath/uiconfig/smath/ui/alignmentdialog.ui5
-rw-r--r--starmath/uiconfig/smath/ui/catalogdialog.ui24
-rw-r--r--starmath/uiconfig/smath/ui/fontdialog.ui11
-rw-r--r--starmath/uiconfig/smath/ui/fontsizedialog.ui38
-rw-r--r--starmath/uiconfig/smath/ui/fonttypedialog.ui81
-rw-r--r--starmath/uiconfig/smath/ui/printeroptions.ui17
-rw-r--r--starmath/uiconfig/smath/ui/savedefaultsdialog.ui3
-rw-r--r--starmath/uiconfig/smath/ui/smathsettings.ui5
-rw-r--r--starmath/uiconfig/smath/ui/spacingdialog.ui323
-rw-r--r--starmath/uiconfig/smath/ui/symdefinedialog.ui137
10 files changed, 217 insertions, 427 deletions
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index e0b4fede1769..3e727f417109 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="AlignmentDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Alignment</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
diff --git a/starmath/uiconfig/smath/ui/catalogdialog.ui b/starmath/uiconfig/smath/ui/catalogdialog.ui
index 8c34badbcc12..5d6e9eebceeb 100644
--- a/starmath/uiconfig/smath/ui/catalogdialog.ui
+++ b/starmath/uiconfig/smath/ui/catalogdialog.ui
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="CatalogDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Symbols</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox5">
@@ -89,20 +93,18 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">18</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="xalign">0</property>
- <property name="label" translatable="yes">_Symbol set</property>
+ <property name="label" translatable="yes">_Symbol set:</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>
@@ -110,14 +112,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">6</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -132,8 +130,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -147,8 +143,6 @@
<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>
@@ -160,8 +154,6 @@
<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>
@@ -189,7 +181,6 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="liststore1"/>
<object class="GtkSizeGroup" id="sizegroup1">
<property name="mode">vertical</property>
<widgets>
@@ -204,4 +195,5 @@
<widget name="symbolset"/>
</widgets>
</object>
+ <object class="GtkListStore" id="liststore1"/>
</interface>
diff --git a/starmath/uiconfig/smath/ui/fontdialog.ui b/starmath/uiconfig/smath/ui/fontdialog.ui
index 1a88585c777e..2866b8855f41 100644
--- a/starmath/uiconfig/smath/ui/fontdialog.ui
+++ b/starmath/uiconfig/smath/ui/fontdialog.ui
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="FontDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Fonts</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -156,8 +159,6 @@
<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>
@@ -173,8 +174,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/starmath/uiconfig/smath/ui/fontsizedialog.ui b/starmath/uiconfig/smath/ui/fontsizedialog.ui
index 6ebdb4d366fb..bd1a2fca86f5 100644
--- a/starmath/uiconfig/smath/ui/fontsizedialog.ui
+++ b/starmath/uiconfig/smath/ui/fontsizedialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustmentBaseSize">
<property name="lower">4</property>
<property name="upper">127</property>
@@ -17,6 +18,8 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Font Sizes</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
@@ -115,7 +118,8 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Base _size</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Base _size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinB_baseSize:0pt</property>
</object>
@@ -180,8 +184,6 @@
<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>
@@ -189,15 +191,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Operators</property>
+ <property name="label" translatable="yes">_Operators:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinB_function:0%</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>
@@ -205,15 +205,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Limits</property>
+ <property name="label" translatable="yes">_Limits:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinB_limit:0%</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>
@@ -227,8 +225,6 @@
<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>
@@ -242,8 +238,6 @@
<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>
@@ -251,15 +245,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Text</property>
+ <property name="label" translatable="yes">_Text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinB_text:0%</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>
@@ -267,15 +259,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Functions</property>
+ <property name="label" translatable="yes">_Functions:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinB_function:0%</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -283,15 +273,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Indexes</property>
+ <property name="label" translatable="yes">_Indexes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinB_index:0%</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>
@@ -305,8 +293,6 @@
<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>
@@ -320,8 +306,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 15a7a1e8bb62..060854db54ec 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="FontsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Fonts</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -129,7 +132,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Variables</property>
+ <property name="label" translatable="yes">_Variables:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">variableCB</property>
<attributes>
@@ -139,8 +142,6 @@
<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>
@@ -148,7 +149,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Functions</property>
+ <property name="label" translatable="yes">_Functions:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">functionCB</property>
<attributes>
@@ -158,8 +159,6 @@
<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>
@@ -167,7 +166,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Numbers</property>
+ <property name="label" translatable="yes">_Numbers:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numberCB</property>
<attributes>
@@ -177,8 +176,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -186,7 +183,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Text</property>
+ <property name="label" translatable="yes">_Text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textCB</property>
<attributes>
@@ -196,8 +193,6 @@
<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>
@@ -209,8 +204,6 @@
<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>
@@ -222,8 +215,6 @@
<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>
@@ -235,8 +226,6 @@
<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>
@@ -248,8 +237,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -298,7 +285,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Serif</property>
+ <property name="label" translatable="yes">_Serif:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">serifCB</property>
<attributes>
@@ -308,8 +295,6 @@
<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>
@@ -317,7 +302,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_ans</property>
+ <property name="label" translatable="yes">S_ans-serif:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sansCB</property>
<attributes>
@@ -327,8 +312,6 @@
<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>
@@ -336,7 +319,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ixed</property>
+ <property name="label" translatable="yes">F_ixed-width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fixedCB</property>
<attributes>
@@ -346,8 +329,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -359,8 +340,6 @@
<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>
@@ -372,8 +351,6 @@
<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>
@@ -385,8 +362,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -427,6 +402,17 @@
<action-widget response="0">default</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="label1"/>
+ <widget name="label2"/>
+ <widget name="label3"/>
+ <widget name="label4"/>
+ <widget name="label5"/>
+ <widget name="label6"/>
+ <widget name="label7"/>
+ </widgets>
+ </object>
<object class="GtkMenu" id="menu1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -474,7 +460,7 @@
<object class="GtkMenuItem" id="menuitem6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">S_ans</property>
+ <property name="label" translatable="yes">S_ans-serif</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -482,26 +468,9 @@
<object class="GtkMenuItem" id="menuitem7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Fixe_d</property>
+ <property name="label" translatable="yes">Fixe_d-width</property>
<property name="use_underline">True</property>
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="label1"/>
- <widget name="label2"/>
- <widget name="label3"/>
- <widget name="label4"/>
- <widget name="label5"/>
- <widget name="label6"/>
- <widget name="label7"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="sizegroup2">
- <widgets>
- <widget name="formulaL"/>
- <widget name="customL"/>
- </widgets>
- </object>
</interface>
diff --git a/starmath/uiconfig/smath/ui/printeroptions.ui b/starmath/uiconfig/smath/ui/printeroptions.ui
index 8bd161a378f7..2ef10834881e 100644
--- a/starmath/uiconfig/smath/ui/printeroptions.ui
+++ b/starmath/uiconfig/smath/ui/printeroptions.ui
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="box">
<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="contents">
<property name="visible">True</property>
@@ -17,12 +19,14 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box2">
<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">Title</property>
@@ -30,7 +34,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -47,7 +50,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -64,7 +66,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -105,12 +106,14 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_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>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="originalsize">
<property name="label" translatable="yes">Original size</property>
@@ -118,7 +121,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -137,7 +139,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">scaling</property>
@@ -152,14 +153,14 @@
<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">Scaling</property>
+ <property name="label" translatable="yes">Scaling:</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">originalsize</property>
diff --git a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
index 336bf09c00f2..00404f3ef5a2 100644
--- a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
+++ b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
@@ -7,6 +7,7 @@
<property name="border_width">6</property>
<property name="title" translatable="yes">Save defaults?</property>
<property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">question</property>
@@ -17,7 +18,7 @@
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">24</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="messagedialog-action_area">
<property name="can_focus">False</property>
diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui
index 63d7f7f1346e..29f7487bbf94 100644
--- a/starmath/uiconfig/smath/ui/smathsettings.ui
+++ b/starmath/uiconfig/smath/ui/smathsettings.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">10</property>
<property name="upper">400</property>
@@ -163,7 +164,7 @@
<property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="sizezoomed">
- <property name="label" translatable="yes">_Scaling</property>
+ <property name="label" translatable="yes">_Scaling:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/starmath/uiconfig/smath/ui/spacingdialog.ui b/starmath/uiconfig/smath/ui/spacingdialog.ui
index 167949f4f246..f4f4f955219c 100644
--- a/starmath/uiconfig/smath/ui/spacingdialog.ui
+++ b/starmath/uiconfig/smath/ui/spacingdialog.ui
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="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="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
@@ -139,7 +142,6 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -148,13 +150,10 @@
<property name="can_focus">True</property>
<property name="no_show_all">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>
@@ -162,13 +161,10 @@
<property name="can_focus">True</property>
<property name="no_show_all">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>
@@ -176,13 +172,10 @@
<property name="can_focus">True</property>
<property name="no_show_all">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>
@@ -197,8 +190,6 @@
<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>
@@ -213,8 +204,6 @@
<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>
@@ -229,8 +218,6 @@
<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>
@@ -238,13 +225,10 @@
<property name="can_focus">True</property>
<property name="no_show_all">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>
@@ -259,8 +243,6 @@
<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>
@@ -276,7 +258,6 @@
<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>
@@ -290,13 +271,11 @@
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</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=">start</property>
<property name="stock">gtk-missing-image</property>
</object>
<packing>
@@ -375,7 +354,6 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -384,14 +362,12 @@
<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="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>
@@ -399,14 +375,12 @@
<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="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>
@@ -414,14 +388,12 @@
<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="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>
@@ -435,13 +407,11 @@
<object class="GtkBox" id="box10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</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=">start</property>
<property name="pixbuf">starmath/res/dist11.png</property>
</object>
<packing>
@@ -454,7 +424,6 @@
<object class="GtkImage" id="1image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist12.png</property>
</object>
<packing>
@@ -467,7 +436,6 @@
<object class="GtkImage" id="1image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist13.png</property>
</object>
<packing>
@@ -545,7 +513,6 @@
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -554,14 +521,12 @@
<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="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>
@@ -569,14 +534,12 @@
<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="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>
@@ -590,13 +553,11 @@
<object class="GtkBox" id="box13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</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=">start</property>
<property name="pixbuf">starmath/res/dist21.png</property>
</object>
<packing>
@@ -609,7 +570,6 @@
<object class="GtkImage" id="2image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist22.png</property>
</object>
<packing>
@@ -687,7 +647,6 @@
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -696,14 +655,12 @@
<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="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>
@@ -711,14 +668,12 @@
<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="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>
@@ -732,13 +687,11 @@
<object class="GtkBox" id="box16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</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=">start</property>
<property name="pixbuf">starmath/res/dist31.png</property>
</object>
<packing>
@@ -751,7 +704,6 @@
<object class="GtkImage" id="3image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist32.png</property>
</object>
<packing>
@@ -829,7 +781,6 @@
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -838,14 +789,12 @@
<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="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>
@@ -853,14 +802,12 @@
<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="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>
@@ -874,13 +821,11 @@
<object class="GtkBox" id="box19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</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=">start</property>
<property name="pixbuf">starmath/res/dist41.png</property>
</object>
<packing>
@@ -893,7 +838,6 @@
<object class="GtkImage" id="4image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist42.png</property>
</object>
<packing>
@@ -971,7 +915,6 @@
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -980,14 +923,12 @@
<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="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>
@@ -995,14 +936,12 @@
<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="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>
@@ -1016,13 +955,11 @@
<object class="GtkBox" id="box22">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="5image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist51.png</property>
</object>
<packing>
@@ -1035,7 +972,6 @@
<object class="GtkImage" id="5image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist52.png</property>
</object>
<packing>
@@ -1113,7 +1049,6 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1122,14 +1057,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Excess size (left/right)</property>
+ <property name="label" translatable="yes">_Excess size (left/right):</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>
@@ -1137,14 +1070,12 @@
<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="label" translatable="yes">_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>
@@ -1152,14 +1083,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Excess size</property>
+ <property name="label" translatable="yes">_Excess size:</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>
@@ -1173,13 +1102,11 @@
<object class="GtkBox" id="box25">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="6image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist61.png</property>
</object>
<packing>
@@ -1192,7 +1119,6 @@
<object class="GtkImage" id="6image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist62.png</property>
</object>
<packing>
@@ -1205,7 +1131,6 @@
<object class="GtkImage" id="6image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist61.png</property>
</object>
<packing>
@@ -1283,7 +1208,6 @@
<object class="GtkGrid" id="grid9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1292,14 +1216,12 @@
<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="label" translatable="yes">_Line 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>
@@ -1307,14 +1229,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Column spacing</property>
+ <property name="label" translatable="yes">_Column 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>
</object>
@@ -1328,13 +1248,11 @@
<object class="GtkBox" id="box28">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="7image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist71.png</property>
</object>
<packing>
@@ -1347,7 +1265,6 @@
<object class="GtkImage" id="7image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist72.png</property>
</object>
<packing>
@@ -1425,7 +1342,6 @@
<object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1434,14 +1350,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Primary height</property>
+ <property name="label" translatable="yes">_Primary height:</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>
@@ -1449,14 +1363,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Minimum spacing</property>
+ <property name="label" translatable="yes">_Minimum 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>
</object>
@@ -1470,13 +1382,11 @@
<object class="GtkBox" id="box31">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="8image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist81.png</property>
</object>
<packing>
@@ -1489,7 +1399,6 @@
<object class="GtkImage" id="8image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist82.png</property>
</object>
<packing>
@@ -1567,7 +1476,6 @@
<object class="GtkGrid" id="grid11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1576,14 +1484,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Excess size</property>
+ <property name="label" translatable="yes">_Excess size:</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>
@@ -1591,14 +1497,12 @@
<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="label" translatable="yes">_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>
</object>
@@ -1612,13 +1516,11 @@
<object class="GtkBox" id="box34">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="9image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist91.png</property>
</object>
<packing>
@@ -1631,7 +1533,6 @@
<object class="GtkImage" id="9image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist92.png</property>
</object>
<packing>
@@ -1709,7 +1610,6 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1718,14 +1618,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Left</property>
+ <property name="label" translatable="yes">_Left:</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>
@@ -1733,14 +1631,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Right</property>
+ <property name="label" translatable="yes">_Right:</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>
@@ -1748,14 +1644,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Top</property>
+ <property name="label" translatable="yes">_Top:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1763,14 +1657,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Bottom</property>
+ <property name="label" translatable="yes">_Bottom:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -1784,13 +1676,11 @@
<object class="GtkBox" id="box7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="10image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist101.png</property>
</object>
<packing>
@@ -1803,7 +1693,6 @@
<object class="GtkImage" id="10image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist102.png</property>
</object>
<packing>
@@ -1816,7 +1705,6 @@
<object class="GtkImage" id="10image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist103.png</property>
</object>
<packing>
@@ -1829,7 +1717,6 @@
<object class="GtkImage" id="10image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign=">start</property>
<property name="pixbuf">starmath/res/dist104.png</property>
</object>
<packing>
@@ -1891,6 +1778,83 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="mode">both</property>
+ <widgets>
+ <widget name="image"/>
+ <widget name="1image1"/>
+ <widget name="1image2"/>
+ <widget name="1image3"/>
+ <widget name="2image1"/>
+ <widget name="2image2"/>
+ <widget name="3image1"/>
+ <widget name="3image2"/>
+ <widget name="4image1"/>
+ <widget name="4image2"/>
+ <widget name="5image1"/>
+ <widget name="5image2"/>
+ <widget name="6image1"/>
+ <widget name="6image2"/>
+ <widget name="6image4"/>
+ <widget name="7image1"/>
+ <widget name="7image2"/>
+ <widget name="8image1"/>
+ <widget name="8image2"/>
+ <widget name="9image1"/>
+ <widget name="9image2"/>
+ <widget name="10image1"/>
+ <widget name="10image2"/>
+ <widget name="10image3"/>
+ <widget name="10image4"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <widgets>
+ <widget name="label1"/>
+ <widget name="label2"/>
+ <widget name="label3"/>
+ <widget name="label4"/>
+ <widget name="1label1"/>
+ <widget name="1label2"/>
+ <widget name="1label3"/>
+ <widget name="2label1"/>
+ <widget name="2label2"/>
+ <widget name="3label1"/>
+ <widget name="3label2"/>
+ <widget name="4label1"/>
+ <widget name="4label2"/>
+ <widget name="5label1"/>
+ <widget name="5label2"/>
+ <widget name="6label1"/>
+ <widget name="6label2"/>
+ <widget name="6label4"/>
+ <widget name="7label1"/>
+ <widget name="7label2"/>
+ <widget name="8label1"/>
+ <widget name="8label2"/>
+ <widget name="9label1"/>
+ <widget name="9label2"/>
+ <widget name="10label1"/>
+ <widget name="10label2"/>
+ <widget name="10label3"/>
+ <widget name="10label4"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <widgets>
+ <widget name="title"/>
+ <widget name="1title"/>
+ <widget name="2title"/>
+ <widget name="3title"/>
+ <widget name="4title"/>
+ <widget name="5title"/>
+ <widget name="6title"/>
+ <widget name="7title"/>
+ <widget name="8title"/>
+ <widget name="9title"/>
+ <widget name="10title"/>
+ </widgets>
+ </object>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1975,81 +1939,4 @@
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <property name="mode">both</property>
- <widgets>
- <widget name="image"/>
- <widget name="1image1"/>
- <widget name="1image2"/>
- <widget name="1image3"/>
- <widget name="2image1"/>
- <widget name="2image2"/>
- <widget name="3image1"/>
- <widget name="3image2"/>
- <widget name="4image1"/>
- <widget name="4image2"/>
- <widget name="5image1"/>
- <widget name="5image2"/>
- <widget name="6image1"/>
- <widget name="6image2"/>
- <widget name="6image4"/>
- <widget name="7image1"/>
- <widget name="7image2"/>
- <widget name="8image1"/>
- <widget name="8image2"/>
- <widget name="9image1"/>
- <widget name="9image2"/>
- <widget name="10image1"/>
- <widget name="10image2"/>
- <widget name="10image3"/>
- <widget name="10image4"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="sizegroup2">
- <widgets>
- <widget name="label1"/>
- <widget name="label2"/>
- <widget name="label3"/>
- <widget name="label4"/>
- <widget name="1label1"/>
- <widget name="1label2"/>
- <widget name="1label3"/>
- <widget name="2label1"/>
- <widget name="2label2"/>
- <widget name="3label1"/>
- <widget name="3label2"/>
- <widget name="4label1"/>
- <widget name="4label2"/>
- <widget name="5label1"/>
- <widget name="5label2"/>
- <widget name="6label1"/>
- <widget name="6label2"/>
- <widget name="6label4"/>
- <widget name="7label1"/>
- <widget name="7label2"/>
- <widget name="8label1"/>
- <widget name="8label2"/>
- <widget name="9label1"/>
- <widget name="9label2"/>
- <widget name="10label1"/>
- <widget name="10label2"/>
- <widget name="10label3"/>
- <widget name="10label4"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="sizegroup3">
- <widgets>
- <widget name="title"/>
- <widget name="1title"/>
- <widget name="2title"/>
- <widget name="3title"/>
- <widget name="4title"/>
- <widget name="5title"/>
- <widget name="6title"/>
- <widget name="7title"/>
- <widget name="8title"/>
- <widget name="9title"/>
- <widget name="10title"/>
- </widgets>
- </object>
</interface>
diff --git a/starmath/uiconfig/smath/ui/symdefinedialog.ui b/starmath/uiconfig/smath/ui/symdefinedialog.ui
index b21a65d3cc3d..4c5ec9868926 100644
--- a/starmath/uiconfig/smath/ui/symdefinedialog.ui
+++ b/starmath/uiconfig/smath/ui/symdefinedialog.ui
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="EditSymbols">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Edit Symbols</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -24,29 +26,26 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="column_spacing">24</property>
+ <property name="column_spacing">18</property>
<child>
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="oldSymbolSetText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">O_ld symbol set</property>
+ <property name="label" translatable="yes">O_ld symbol set:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldSymbolSets</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>
@@ -64,16 +63,12 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<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>
@@ -82,22 +77,20 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="oldSymbolText">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Old symbol</property>
+ <property name="label" translatable="yes">_Old symbol:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldSymbols</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>
@@ -115,16 +108,12 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -136,7 +125,7 @@
</child>
<child>
<object class="svxlo-SvxShowCharSet" id="charsetDisplay">
- <property name="width_request">400</property>
+ <property name="width_request">250</property>
<property name="height_request">250</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -153,94 +142,82 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="column_spacing">24</property>
+ <property name="column_spacing">18</property>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="row_spacing">2</property>
- <property name="column_spacing">6</property>
- <property name="row_homogeneous">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="symbolText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Symbol</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Symbol:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">symbols</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="symbolSetText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Symbol s_et</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Symbol s_et:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">symbolSets</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="fontText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Font</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Font:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fonts</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="styleText">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Typeface</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">S_tyle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">styles</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="fontsSubsetFT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Subset</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">S_ubset:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fontsSubsetLB</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>
@@ -253,8 +230,6 @@
<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>
@@ -267,22 +242,6 @@
<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="svtlo-FontStyleBox" id="styles">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="hexpand">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>
@@ -301,8 +260,6 @@
<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>
@@ -321,16 +278,24 @@
<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="svtlo-FontStyleBox" id="styles">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -349,8 +314,6 @@
<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>
@@ -363,8 +326,6 @@
<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>
@@ -375,8 +336,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -387,8 +346,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -401,8 +358,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -413,8 +368,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -428,8 +381,6 @@
<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>
@@ -443,8 +394,6 @@
<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>
@@ -458,8 +407,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -473,8 +420,6 @@
<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>
@@ -487,8 +432,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -574,4 +517,14 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="mode">vertical</property>
+ <widgets>
+ <widget name="fonts"/>
+ <widget name="fontsSubsetLB"/>
+ <widget name="symbols"/>
+ <widget name="symbolSets"/>
+ <widget name="styles"/>
+ </widgets>
+ </object>
</interface>