Kaydet (Commit) d2b2b791 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert show redlines warning box to new-style message dialog

Change-Id: I5d7e205c8908fab6ff70065961d77b3b91d82461
üst fea12c47
......@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
sw/uiconfig/swriter/ui/outlinepositionpage \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
......
......@@ -43,7 +43,6 @@
#define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15)
#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17)
#define MSG_DISABLE_READLINE_QUESTION (RC_COMCORE_BEGIN + 18)
#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
......
......@@ -39,7 +39,7 @@
#include <UndoInsert.hxx>
#include <UndoDelete.hxx>
#include <breakit.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/layout.hxx>
#include "comcore.hrc"
#include "editsh.hxx"
#include <fmtfld.hxx>
......@@ -2700,8 +2700,8 @@ void SwDoc::checkRedlining(RedlineMode_t& _rReadlineMode)
if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT
&& !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) )
{
WarningBox aWarning( pParent,SW_RES(MSG_DISABLE_READLINE_QUESTION));
sal_uInt16 nResult = aWarning.Execute();
MessageDialog aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui");
sal_uInt16 nResult = aQuery.Execute();
mbReadlineChecked = sal_True;
if ( nResult == RET_YES )
{
......
......@@ -776,13 +776,6 @@ ToolBox RID_MODULE_TOOLBOX
Scroll = TRUE ;
};
WarningBox MSG_DISABLE_READLINE_QUESTION
{
BUTTONS = WB_YES_NO;
DEFBUTTON = WB_DEF_YES ;
Message [ en-US ] = "In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Do you want to show the changes to avoid delays?";
};
String STR_ROTATE_TO_STANDARD_ORIENTATION
{
Text [ en-US ] = "This image is rotated. Would you like to rotate it into standard orientation?";
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkMessageDialog" id="QueryShowChangesDialog">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Show changes?</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 show changes to avoid delays?</property>
<property name="secondary_text" translatable="yes">In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays.</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>
......@@ -4,7 +4,7 @@
<object class="GtkMessageDialog" id="SaveAsHTMLDialog">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Save as HTML</property>
<property name="title" translatable="yes">Save as HTML?</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">question</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment