[Libreoffice-commits] core.git: starmath/uiconfig

Andreas Brandner Andreas.Brandner at cib.de
Wed Sep 6 14:38:24 UTC 2017


 starmath/uiconfig/smath/ui/fonttypedialog.ui |   57 +++++++++++++--------------
 1 file changed, 29 insertions(+), 28 deletions(-)

New commits:
commit 8cbe2fa1535e475ab48b450a61fc471c3522fce4
Author: Andreas Brandner <Andreas.Brandner at cib.de>
Date:   Wed Sep 6 12:26:27 2017 +0200

    tdf#101876 Math Fonts dialog: moved buttons to bottom of dialog
    
    Change-Id: I588d9a9f2c87e57bc596cdcae823834f500c7d67
    Reviewed-on: https://gerrit.libreoffice.org/41984
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 898426702775..ce4ae9ecd349 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface domain="sm">
   <requires lib="gtk+" version="3.0"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -13,21 +13,19 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="layout_style">start</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</property>
+              <object class="GtkButton" id="modify:menu1">
+                <property name="label" translatable="yes" context="fonttypedialog|modify">_Modify</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -36,8 +34,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</property>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -46,12 +44,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="modify:menu1">
-                <property name="label" translatable="yes" context="fonttypedialog|modify">_Modify</property>
+              <object class="GtkButton" id="default">
+                <property name="label" translatable="yes" context="fonttypedialog|default">_Default</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -64,10 +63,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -78,12 +79,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="default">
-                <property name="label" translatable="yes" context="fonttypedialog|default">_Default</property>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -131,10 +132,10 @@
                           <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" 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>
@@ -148,10 +149,10 @@
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</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>
@@ -165,10 +166,10 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</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>
@@ -182,10 +183,10 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</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>
@@ -284,10 +285,10 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</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>
@@ -301,10 +302,10 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</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>
@@ -318,10 +319,10 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</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>
@@ -389,17 +390,17 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
       <action-widget response="0">modify:menu1</action-widget>
       <action-widget response="0">help</action-widget>
       <action-widget response="0">default</action-widget>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
     </action-widgets>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">


More information about the Libreoffice-commits mailing list