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/querychangelineenddialog.ui | 34 ++++++++++++++++++++++++++++
5 files changed, 38 insertions(+), 6 deletions(-)
New commits:
commit 38e24914ef87dc3247f736eb67bb17463388707b
Author: Olivier Hallot <olivier.hal...@edx.srv.br>
Date: Tue Aug 6 22:44:34 2013 -0300
Convert line end change warning to widget UI
Change-Id: I1aca130736d2c45a251a3551976e549f107cad0e
Reviewed-on: https://gerrit.libreoffice.org/5298
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 684e8c9..6c0b01b 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/querychangelineenddialog \
cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/querydeletedictionarydialog \
cui/uiconfig/ui/querydeletelineenddialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index d012b7b..bf0a9c5 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -99,7 +99,6 @@
#define RID_SVXSTR_WRITE_DATA_ERROR (RID_SVX_START + 229)
#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_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 36a441a..3b31606 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_CHANGE_LINEEND
-{
- Text [ en-US ] = "The arrowhead was modified without saving.\nWould you
like to save the arrowhead now?" ;
-};
String RID_SVXSTR_CHARNAME_TRANSPARENT
{
Text [ en-US ] = "Transparent";
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index c1da56d..9a2f5ee 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -188,7 +188,9 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
if( aString != m_pLbLineEnds->GetSelectEntry() )
{
- QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO |
WB_DEF_NO ), CUI_RESSTR( RID_SVXSTR_ASK_CHANGE_LINEEND ) );
+ MessageDialog aQueryBox( GetParentDialog()
+ ,"AskChangeLineEndDialog"
+ ,"cui/ui/querychangelineenddialog.ui");
if ( aQueryBox.Execute() == RET_YES )
ClickModifyHdl_Impl( this );
diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui
b/cui/uiconfig/ui/querychangelineenddialog.ui
new file mode 100644
index 0000000..ead7828
--- /dev/null
+++ b/cui/uiconfig/ui/querychangelineenddialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.6 -->
+ <object class="GtkMessageDialog" id="AskChangeLineEndDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Save arrowhead ?</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">The arrowhead was modified
without saving.</property>
+ <property name="secondary_text" translatable="yes">Would you like to save
the arrowhead now?</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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
