weld native message dialogs

just the straight-forward MessageDialog cases first

a) remove border_width from message dialog .ui so as to take
the default border width
b) retain 12 as default message dialog border for vcl widget case
c) remove layour_style from message dialog button boxes so as to
take the default mode (a no-op for vcl widget case)
d) use gtk response ids (vcl builder will converts to vcl ones)

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

5 files changed, 10 insertions, 19 deletions

diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui
index d92c8bbbf757..feabad732dd7 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="AlienWarnDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="alienwarndialog|AlienWarnDialog">Confirm File Format</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" context="alienwarndialog|cancel">Use %DEFAULTEXTENSION _Format</property>
@@ -82,8 +80,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
-      <action-widget response="1">save</action-widget>
+      <action-widget response="-6">cancel</action-widget>
+      <action-widget response="-5">save</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/sfx2/uiconfig/ui/editdocumentdialog.ui b/sfx2/uiconfig/ui/editdocumentdialog.ui
index e879e95dcfc9..f47c31b06c55 100644
--- a/sfx2/uiconfig/ui/editdocumentdialog.ui
+++ b/sfx2/uiconfig/ui/editdocumentdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="EditDocumentDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="editdocumentdialog|EditDocumentDialog">Confirm editing of document</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="edit">
                 <property name="label" translatable="yes" context="editdocumentdialog|edit">Edit Document</property>
@@ -66,8 +64,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">edit</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-5">edit</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/sfx2/uiconfig/ui/errorfindemaildialog.ui b/sfx2/uiconfig/ui/errorfindemaildialog.ui
index 0f0195015ba0..be42a0c6c723 100644
--- a/sfx2/uiconfig/ui/errorfindemaildialog.ui
+++ b/sfx2/uiconfig/ui/errorfindemaildialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="ErrorFindEmailDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">No e-mail configuration</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index 4104d13ce9bb..b5942c301e27 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkMessageDialog" id="onlinehelpmanual">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="helpmanual|onlinehelpmanual">%PRODUCTNAME Help Not Installed</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui
index 4d48d2379296..4f0b54aecb40 100644
--- a/sfx2/uiconfig/ui/querysavedialog.ui
+++ b/sfx2/uiconfig/ui/querysavedialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querysavedialog|QuerySaveDialog">Save Document?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -20,7 +19,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="discard">
                 <property name="label" translatable="yes" context="querysavedialog|discard">_Don’t Save</property>
@@ -77,9 +75,9 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="3">discard</action-widget>
-      <action-widget response="0">cancel</action-widget>
-      <action-widget response="2">save</action-widget>
+      <action-widget response="-9">discard</action-widget>
+      <action-widget response="-6">cancel</action-widget>
+      <action-widget response="-8">save</action-widget>
     </action-widgets>
   </object>
 </interface>