flip catalogdialog action area orientation to standard

Change-Id: I7ba0e10b9033efabcc7ff209ca048d2c8a684f2d
Reviewed-on: https://gerrit.libreoffice.org/53632
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 23 insertions, 19 deletions

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 08bbf1300373..b9bc57f9530d 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1397,7 +1397,7 @@ SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevic
     get(m_pSymbolSets, "symbolset");
     m_pSymbolSets->SetStyle(m_pSymbolSets->GetStyle()|WB_SORT);
     get(m_pSymbolName, "symbolname");
-    get(m_pGetBtn, "insert");
+    get(m_pGetBtn, "ok");
     get(m_pEditBtn, "edit");
     get(m_pSymbolSetDisplay, "symbolsetdisplay");
     get(m_pSymbolDisplay, "preview");
diff --git a/starmath/uiconfig/smath/ui/catalogdialog.ui b/starmath/uiconfig/smath/ui/catalogdialog.ui
index 33a715fc2ff8..c4010b41b1e5 100644
--- a/starmath/uiconfig/smath/ui/catalogdialog.ui
+++ b/starmath/uiconfig/smath/ui/catalogdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="sm">
   <requires lib="gtk+" version="3.18"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -13,19 +13,17 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox5">
         <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_area5">
             <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="insert">
-                <property name="label" translatable="yes" context="catalogdialog|insert">_Insert</property>
+              <object class="GtkButton" id="edit">
+                <property name="label" translatable="yes" context="catalogdialog|edit">_Edit...</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_underline">True</property>
               </object>
@@ -36,13 +34,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="close">
-                <property name="label">gtk-close</property>
+              <object class="GtkButton" id="ok">
+                <property name="label" translatable="yes" context="catalogdialog|insert">_Insert</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_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -51,12 +50,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="edit">
-                <property name="label" translatable="yes" context="catalogdialog|edit">_Edit...</property>
+              <object class="GtkButton" id="close">
+                <property name="label">gtk-close</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>
@@ -76,6 +76,7 @@
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">3</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
           </object>
@@ -98,9 +99,9 @@
               <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="catalogdialog|label1">_Symbol set:</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -120,7 +121,6 @@
             </child>
             <child>
               <object class="smlo-SmShowSymbolSet" id="symbolsetdisplay">
-                <property name="label" translatable="yes" context="catalogdialog|symbolsetdisplay">button</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -138,7 +138,6 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="stock">gtk-missing-image</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -175,11 +174,14 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">insert</action-widget>
-      <action-widget response="-7">close</action-widget>
       <action-widget response="0">edit</action-widget>
+      <action-widget response="-5">ok</action-widget>
+      <action-widget response="-7">close</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="mode">vertical</property>
diff --git a/starmath/uiconfig/smath/ui/symdefinedialog.ui b/starmath/uiconfig/smath/ui/symdefinedialog.ui
index 154723ee9fed..cc4cef4965e2 100644
--- a/starmath/uiconfig/smath/ui/symdefinedialog.ui
+++ b/starmath/uiconfig/smath/ui/symdefinedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="sm">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="EditSymbols">
@@ -7,6 +7,8 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="symdefinedialog|EditSymbols">Edit Symbols</property>
     <property name="modal">True</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">