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>

13 files changed, 28 insertions, 45 deletions

diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui
index f77b40390d99..ce33ef1315ca 100644
--- a/svx/uiconfig/ui/deletefooterdialog.ui
+++ b/svx/uiconfig/ui/deletefooterdialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteFooterDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="deletefooterdialog|DeleteFooterDialog">Delete footer?</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/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui
index 9a09130c24d2..2d2a7f02912c 100644
--- a/svx/uiconfig/ui/deleteheaderdialog.ui
+++ b/svx/uiconfig/ui/deleteheaderdialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteHeaderDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="deleteheaderdialog|DeleteHeaderDialog">Delete header?</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/svx/uiconfig/ui/formlinkwarndialog.ui b/svx/uiconfig/ui/formlinkwarndialog.ui
index dcd7d76bc5ff..8fb64ac1dae8 100644
--- a/svx/uiconfig/ui/formlinkwarndialog.ui
+++ b/svx/uiconfig/ui/formlinkwarndialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="FormLinkWarnDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
@@ -21,7 +20,6 @@ How do you want to proceed?</property>
         <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="ok">
                 <property name="label" translatable="yes" context="formlinkwarndialog|ok">_Edit</property>
@@ -63,8 +61,8 @@ How do you want to proceed?</property>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-5">ok</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/linkwarndialog.ui b/svx/uiconfig/ui/linkwarndialog.ui
index 7da928127f10..f1f22847db6f 100644
--- a/svx/uiconfig/ui/linkwarndialog.ui
+++ b/svx/uiconfig/ui/linkwarndialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="LinkWarnDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="linkwarndialog|LinkWarnDialog">Confirm Linked Graphic</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="ok">
                 <property name="label" translatable="yes" context="linkwarndialog|ok">_Keep Link</property>
@@ -83,8 +81,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-5">ok</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querydeletecontourdialog.ui b/svx/uiconfig/ui/querydeletecontourdialog.ui
index f2d7c3d35c4c..15af36d2b81e 100644
--- a/svx/uiconfig/ui/querydeletecontourdialog.ui
+++ b/svx/uiconfig/ui/querydeletecontourdialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteContourDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querydeletecontourdialog|QueryDeleteContourDialog">Delete the contour?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -22,7 +21,6 @@ cause the contour to be deleted.</property>
         <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/svx/uiconfig/ui/querydeleteobjectdialog.ui b/svx/uiconfig/ui/querydeleteobjectdialog.ui
index 024e704d8d44..cd5b7c6a9fd4 100644
--- a/svx/uiconfig/ui/querydeleteobjectdialog.ui
+++ b/svx/uiconfig/ui/querydeleteobjectdialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteObjectDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querydeleteobjectdialog|QueryDeleteObjectDialog">Delete this object?</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_area4">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -31,5 +29,8 @@
         </child>
       </object>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querydeletethemedialog.ui b/svx/uiconfig/ui/querydeletethemedialog.ui
index a7eb54ab2d3e..4c1a05c4f5c2 100644
--- a/svx/uiconfig/ui/querydeletethemedialog.ui
+++ b/svx/uiconfig/ui/querydeletethemedialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteThemeDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querydeletethemedialog|QueryDeleteThemeDialog">Delete this theme?</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_area2">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -31,5 +29,8 @@
         </child>
       </object>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
index 1d874646ad9b..eff11a64bb29 100644
--- a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
+++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryModifyImageMapChangesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog">Save ImageMap changes?</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_area5">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
@@ -49,7 +47,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querynewcontourdialog.ui b/svx/uiconfig/ui/querynewcontourdialog.ui
index 8dc1d1994cf8..b511a02dc6af 100644
--- a/svx/uiconfig/ui/querynewcontourdialog.ui
+++ b/svx/uiconfig/ui/querynewcontourdialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryNewContourDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querynewcontourdialog|QueryNewContourDialog">Create a new contour?</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>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/querysavecontchangesdialog.ui b/svx/uiconfig/ui/querysavecontchangesdialog.ui
index 91af4774429e..f4b3d022305c 100644
--- a/svx/uiconfig/ui/querysavecontchangesdialog.ui
+++ b/svx/uiconfig/ui/querysavecontchangesdialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveContourChangesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querysavecontchangesdialog|QuerySaveContourChangesDialog">Save contour changes?</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>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
@@ -47,7 +45,10 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
index a74be0694b8d..f0ad846b6935 100644
--- a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
+++ b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveImageMapChangesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog">Save ImageMap changes?</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_area4">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
@@ -49,7 +47,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
index 82bd731b9ea8..1449fcae153a 100644
--- a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
+++ b/svx/uiconfig/ui/queryunlinkgraphicsdialog.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="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryUnlinkGraphicsDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog">Unlink the graphics?</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/svx/uiconfig/ui/savemodifieddialog.ui b/svx/uiconfig/ui/savemodifieddialog.ui
index 8ad47b0b3925..0c98506f092a 100644
--- a/svx/uiconfig/ui/savemodifieddialog.ui
+++ b/svx/uiconfig/ui/savemodifieddialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveModifiedDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
@@ -19,7 +18,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="no">
                 <property name="label">gtk-no</property>
@@ -77,9 +75,9 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="3">no</action-widget>
-      <action-widget response="2">yes</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-9">no</action-widget>
+      <action-widget response="-8">yes</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>