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

[Olivier Hallot]

 cui/UIConfig_cui.mk                         |    1 
 cui/source/inc/cuires.hrc                   |    1 
 cui/source/tabpages/strings.src             |    4 ---
 cui/source/tabpages/tplneend.cxx            |    4 ++-
 cui/uiconfig/ui/querydeletelineenddialog.ui |   33 ++++++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 6 deletions(-)

New commits:
commit 443dc323d93cbb657bf76053f4aeaef5345cc7a8
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date:   Tue Aug 6 22:17:07 2013 -0300

    Convert delete arrow warning to widget UI
    
    Change-Id: I9848233357b5cc3b07e66e1ef689db1ae7f28075
    Reviewed-on: https://gerrit.libreoffice.org/5297
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 2c79f77..684e8c9 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/positionpage \
 	cui/uiconfig/ui/querydeletechartcolordialog \
 	cui/uiconfig/ui/querydeletedictionarydialog \
+	cui/uiconfig/ui/querydeletelineenddialog \
 	cui/uiconfig/ui/scriptorganizer \
 	cui/uiconfig/ui/securityoptionsdialog \
 	cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 2de46b9..d012b7b 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -100,7 +100,6 @@
 #define RID_SVXSTR_READ_DATA_ERROR          (RID_SVX_START + 230)
 #define RID_SVXSTR_WARN_TABLE_OVERWRITE     (RID_SVX_START + 231)
 #define RID_SVXSTR_ASK_CHANGE_LINEEND       (RID_SVX_START + 184)
-#define RID_SVXSTR_ASK_DEL_LINEEND          (RID_SVX_START + 219)
 #define RID_SVXSTR_WARN_NAME_DUPLICATE      (RID_SVX_START + 236)
 #define RID_SVXSTR_CHARNAME_TRANSPARENT     (RID_SVX_START + 237)
 #define RID_SVXSTR_DESC_LINEEND             (RID_SVX_START + 238)
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index b4cfb24..36a441a 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -115,10 +115,6 @@ String RID_SVXSTR_DESC_LINEEND
 {
     Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
 };
-String RID_SVXSTR_ASK_DEL_LINEEND
-{
-    Text [ en-US ] = "Do you want to delete the arrowhead?" ;
-};
 String RID_SVXSTR_ASK_CHANGE_LINEEND
 {
     Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 9623f38..c1da56d 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -495,7 +495,9 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), OUString( CUI_RES( RID_SVXSTR_ASK_DEL_LINEEND ) ) );
+        MessageDialog aQueryBox( GetParentDialog()
+                                ,"AskDelLineEndDialog"
+                                ,"cui/ui/querydeletelineenddialog.ui");
 
         if ( aQueryBox.Execute() == RET_YES )
         {
diff --git a/cui/uiconfig/ui/querydeletelineenddialog.ui b/cui/uiconfig/ui/querydeletelineenddialog.ui
new file mode 100644
index 0000000..629e987
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletelineenddialog.ui
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.6 -->
+  <object class="GtkMessageDialog" id="AskDelLineEndDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Delete arrowhead ?</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 want to delete the arrowhead ?</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">2</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>