9c4eef7d80
Format-only changes had 1) disabled (in Manage Changes
dialog window) or 2) bad rejection (Track Changes toolbar
icons and Edit->Track Changes menu item functions
"Reject"/"Reject All" resulted acception of the tracked
format-only changes instead of rejection).
Because format-only changes haven't had real rejection
support, yet, this commit 1) adds an often useful
reject-like function in the Manage Changes dialog window:
instead of disabling Reject/Reject All, now these buttons
clears direct text formatting in the area of the tracked
format-only changes. Because this may be not a rejection
(ie. the original text can contain direct text formatting),
the labels of the button warn about it: "Reject/Clear
formatting" and "Reject All/Clear formatting".
Note: "Reject All" still rejects only
insertions/deletions at (now first) pressing,
as from commit a8a3928bd3.
2) Icons and menu items "Reject"/"Reject All" clear
direct text formatting in the areas of the tracked
format-only changes. Note: this is still not ideal,
but it can help to avoid of unintended direct
text formatting until implementing upcoming ODF 1.3
change tracking.
Change-Id: I87c3ac6165019cae9c49ed4591eaadef9e06beb5
Reviewed-on: https://gerrit.libreoffice.org/67080
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
262 lines
12 KiB
XML
262 lines
12 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!-- Generated with glade 3.20.0 -->
|
|
<interface domain="svx">
|
|
<requires lib="gtk+" version="3.18"/>
|
|
<object class="GtkDialog" id="AcceptRejectChangesDialog">
|
|
<property name="can_focus">False</property>
|
|
<property name="border_width">6</property>
|
|
<property name="title" translatable="yes" context="acceptrejectchangesdialog|AcceptRejectChangesDialog">Manage Changes</property>
|
|
<property name="type_hint">dialog</property>
|
|
<child internal-child="vbox">
|
|
<object class="GtkBox" id="dialog-vbox1">
|
|
<property name="can_focus">False</property>
|
|
<property name="orientation">vertical</property>
|
|
<property name="spacing">12</property>
|
|
<child internal-child="action_area">
|
|
<object class="GtkButtonBox" id="dialog-action_area1">
|
|
<property name="can_focus">False</property>
|
|
<property name="layout_style">end</property>
|
|
<child>
|
|
<object class="GtkButton" id="accept">
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|accept">_Accept</property>
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="receives_default">True</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">0</property>
|
|
<property name="secondary">True</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
<object class="GtkButton" id="reject">
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|reject">_Reject</property>
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="receives_default">True</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">1</property>
|
|
<property name="secondary">True</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
<object class="GtkButton" id="acceptall">
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|acceptall">A_ccept All</property>
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="receives_default">True</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">2</property>
|
|
<property name="secondary">True</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
<object class="GtkButton" id="rejectall">
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|rejectall">R_eject All</property>
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="receives_default">True</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">3</property>
|
|
<property name="secondary">True</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
<object class="GtkButton" id="undo">
|
|
<property name="label">gtk-undo</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="receives_default">True</property>
|
|
<property name="no_show_all">True</property>
|
|
<property name="use_stock">True</property>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">4</property>
|
|
<property name="secondary">True</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
<object class="GtkButton" id="close">
|
|
<property name="label">gtk-close</property>
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="can_default">True</property>
|
|
<property name="has_default">True</property>
|
|
<property name="receives_default">True</property>
|
|
<property name="use_stock">True</property>
|
|
</object>
|
|
<packing>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="position">5</property>
|
|
</packing>
|
|
</child>
|
|
</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>
|
|
<child>
|
|
<placeholder/>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
<action-widgets>
|
|
<action-widget response="0">accept</action-widget>
|
|
<action-widget response="0">reject</action-widget>
|
|
<action-widget response="0">acceptall</action-widget>
|
|
<action-widget response="0">rejectall</action-widget>
|
|
<action-widget response="0">undo</action-widget>
|
|
<action-widget response="-7">close</action-widget>
|
|
</action-widgets>
|
|
</object>
|
|
<object class="GtkMenu" id="calcmenu">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<child>
|
|
<object class="GtkMenuItem" id="calcedit">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcedit">Edit Comment...</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkMenuItem" id="calcsort">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcsort">Sorting</property>
|
|
<property name="use_underline">True</property>
|
|
<child type="submenu">
|
|
<object class="GtkMenu">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="calcaction">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcaction">Action</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="calcposition">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcposition">Position</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="calcauthor">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcauthor">Author</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="calcdate">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcdate">Date</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="calcdesc">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|calcdesc">Description</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
<object class="GtkMenu" id="writermenu">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<child>
|
|
<object class="GtkMenuItem" id="writeredit">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writeredit">Edit Comment...</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkMenuItem" id="writersort">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writersort">Sort By</property>
|
|
<property name="use_underline">True</property>
|
|
<child type="submenu">
|
|
<object class="GtkMenu">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="writeraction">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writeraction">Action</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="writerauthor">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writerauthor">Author</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="writerdate">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writerdate">Date</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="writerdesc">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writerdesc">Comment</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
<child>
|
|
<object class="GtkRadioMenuItem" id="writerposition">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="label" translatable="yes" context="acceptrejectchangesdialog|writerposition">Document Position</property>
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</child>
|
|
</object>
|
|
</interface>
|