convert delete object and theme queryboxes to .ui

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

7 files changed, 72 insertions, 12 deletions

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index c337ea5e8c55..9cb6a18adbb9 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/optgridpage \
 	svx/uiconfig/ui/passwd \
 	svx/uiconfig/ui/querydeletecontourdialog \
+	svx/uiconfig/ui/querydeleteobjectdialog \
+	svx/uiconfig/ui/querydeletethemedialog \
 	svx/uiconfig/ui/querymodifyimagemapchangesdialog \
 	svx/uiconfig/ui/querynewcontourdialog \
 	svx/uiconfig/ui/querysavecontchangesdialog \
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 526011f7b1a5..1897612fecac 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -35,7 +35,6 @@
 #define RID_SVXSTR_EXTFORMAT3_UI                (RID_SVX_GALLERY_START + 20)
 #define RID_SVXSTR_GALLERY_FOPENERROR           (RID_SVX_GALLERY_START + 11)
 #define RID_SVXSTR_GALLERY_NOTHEME              (RID_SVX_GALLERY_START + 13)
-#define RID_SVXSTR_GALLERY_DELETEOBJ            (RID_SVX_GALLERY_START + 14)
 #define RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS   (RID_SVX_GALLERY_START + 25)
 #define RID_SVXSTR_GALLERY_FILTER               (RID_SVX_GALLERY_START + 26)
 #define RID_SVXSTR_GALLERY_LENGTH               (RID_SVX_GALLERY_START + 27)
@@ -48,7 +47,6 @@
 #define RID_SVXSTR_GALLERY_IMPORTTHEME          (RID_SVX_GALLERY_START + 41)
 #define RID_SVXSTR_GALLERY_CREATETHEME          (RID_SVX_GALLERY_START + 42)
 #define RID_SVXSTR_GALLERY_DIALOGID             (RID_SVX_GALLERY_START + 80)
-#define RID_SVXSTR_GALLERY_DELETETHEME          (RID_SVX_GALLERY_START + 83)
 #define RID_SVXSTR_GALLERY_TITLE                (RID_SVX_GALLERY_START + 84)
 #define RID_SVXSTR_GALLERY_PATH                 (RID_SVX_GALLERY_START + 85)
 #define RID_SVXSTR_GALLERY_ICONVIEW             (RID_SVX_GALLERY_START + 86)
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 7285b840e404..84fbb560c688 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -373,7 +373,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
 
         case( MN_DELETE  ):
         {
-            if( QueryBox( NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETETHEME)).Execute() == RET_YES )
+            if( MessageDialog( NULL, "QueryDeleteThemeDialog","svx/ui/querydeletethemedialog.ui").Execute() == RET_YES )
                 mpGallery->RemoveTheme( mpThemes->GetSelectEntry() );
         }
         break;
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 2767816cfd42..3574b7a1164e 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1195,7 +1195,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId )
             case( MN_DELETE ):
             {
                 if( !mpCurTheme->IsReadOnly() &&
-                    QueryBox(NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETEOBJ)).Execute() == RET_YES )
+                    MessageDialog(NULL, "QueryDeleteObjectDialog","svx/ui/querydeleteobjectdialog.ui").Execute() == RET_YES )
                 {
                     mpCurTheme->RemoveObject( mnCurActionPos );
                 }
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index b5f7767065c8..bd3a9763f9b0 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -73,14 +73,6 @@ String RID_SVXSTR_GALLERY_NOTHEME
 {
     Text [ en-US ] = "Invalid Theme Name!" ;
 };
-String RID_SVXSTR_GALLERY_DELETEOBJ
-{
-    Text [ en-US ] = "Do you really want to\ndelete this object?" ;
-};
-String RID_SVXSTR_GALLERY_DELETETHEME
-{
-    Text [ en-US ] = "Do you really want to\ndelete this theme?" ;
-};
 String RID_SVXSTR_EXTFORMAT1_SYS
 {
     Text = "wav" ;
diff --git a/svx/uiconfig/ui/querydeleteobjectdialog.ui b/svx/uiconfig/ui/querydeleteobjectdialog.ui
new file mode 100644
index 000000000000..f49711bc9ad2
--- /dev/null
+++ b/svx/uiconfig/ui/querydeleteobjectdialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkMessageDialog" id="QueryDeleteObjectDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Delete this object?</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">question</property>
+    <property name="buttons">yes-no</property>
+    <property name="text" translatable="yes">Do you really want to delete this object?</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox4">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">24</property>
+        <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>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/svx/uiconfig/ui/querydeletethemedialog.ui b/svx/uiconfig/ui/querydeletethemedialog.ui
new file mode 100644
index 000000000000..d4cf7ff285af
--- /dev/null
+++ b/svx/uiconfig/ui/querydeletethemedialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkMessageDialog" id="QueryDeleteThemeDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Delete this theme?</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">question</property>
+    <property name="buttons">yes-no</property>
+    <property name="text" translatable="yes">Do you really want to delete this theme?</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox2">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">24</property>
+        <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>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>