[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk include/sfx2

[Caolán McNamara]

 cui/UIConfig_cui.mk                            |    1 
 cui/source/options/optlingu.cxx                |    5 ++-
 cui/source/options/optlingu.src                |    9 ------
 cui/uiconfig/ui/querydeletedictionarydialog.ui |   35 +++++++++++++++++++++++++
 include/sfx2/sfx.hrc                           |    1 
 5 files changed, 39 insertions(+), 12 deletions(-)

New commits:
commit d213d507f2ff71ec14a59485e1e10ffbac1f08c2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 15 17:35:17 2013 +0100

    convert delete dictionary query to .ui
    
    Change-Id: I5016207a6cf592ce0a7f7a8033825f88c7a22d16

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 0908fef..915047d 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/pickoutlinepage \
 	cui/uiconfig/ui/positionpage \
 	cui/uiconfig/ui/querydeletechartcolordialog \
+	cui/uiconfig/ui/querydeletedictionarydialog \
 	cui/uiconfig/ui/scriptorganizer \
 	cui/uiconfig/ui/securityoptionsdialog \
 	cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 0c30fea..f0ca449 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1698,8 +1698,9 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
     }
     else if (&aLinguDicsDelPB == pBtn)
     {
-        if ( RET_NO ==
-             QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() )
+        MessageDialog aQuery(this, "QueryDeleteDictionaryDialog",
+            "cui/ui/querydeletedictionarydialog.ui");
+        if (RET_NO == aQuery.Execute())
             return 0;
 
         SvTreeListEntry *pEntry = aLinguDicsCLB.GetCurEntry();
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 8e857001..3c24554 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -345,13 +345,4 @@ TabPage RID_SFXPAGE_LINGU
 };
 // end: TabPage RID_SFXPAGE_LINGU
 
- // RID_SFXQB_DELDICT --------------------------------------------------------
-QueryBox RID_SFXQB_DELDICT
-{
-    Buttons = WB_YES_NO ;
-    DefButton = WB_DEF_NO ;
-    Message [ en-US ] = "Do you want to delete the dictionary?" ;
-};
- // ******************************************************************* EOF
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/querydeletedictionarydialog.ui b/cui/uiconfig/ui/querydeletedictionarydialog.ui
new file mode 100644
index 0000000..4c6fae2
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletedictionarydialog.ui
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkMessageDialog" id="QueryDeleteDictionaryDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Delete Dictionary?</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">warning</property>
+    <property name="buttons">yes-no</property>
+    <property name="text" translatable="yes">Do you really want to delete the dictionary?</property>
+    <property name="secondary_text" translatable="yes">This action cannot be undone.</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox">
+        <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_area">
+            <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/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 4044de2..ba09c72 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -223,7 +223,6 @@
 #define RID_SFXPAGE_SAVE            (RID_OPTIONS_START +  0)
 #define RID_SFXPAGE_GENERAL         (RID_OPTIONS_START +  1)
 #define RID_SFXDLG_EDITDICT         (RID_OPTIONS_START +  4)
-#define RID_SFXQB_DELDICT           (RID_OPTIONS_START +  5)
 #define RID_SFXPAGE_PATH            (RID_OPTIONS_START +  6)
 #define RID_SFXPAGE_LINGU           (RID_OPTIONS_START +  7)
 #define RID_SFXQB_SET_LANGUAGE      (RID_OPTIONS_START + 10)