From 6aeeef8807fef36295b65d0a300a21466bfbeda0 Mon Sep 17 00:00:00 2001
From: László Németh <nemeth@numbertext.org>
Date: Tue, 19 Jan 2021 15:55:21 +0100
Subject: tdf#116757 sw ChangesInMargin: add "Show Insertions in Margin"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

layout mode to allow to show the original text inline,
i.e. only deletions, while insertions are showed in margin
(opposite of the Show Deletions in Margin mode).

Add a menu to the Show Changes icon on the
Changes toolbar with menu items for the 3 layout modes
"All Changes Inline", "Deletions in Margin" and
"Insertions in Margin" with the following behavior:

– Selecting a menu item turns on also the Show Changes mode
  to show the result immediately;

– Disabling Show Changes mode always show the final text, i.e.
  only insertions. Enabling Show Changes mode again shows the
  changes according to the last Show Changes mode selected in
  the menu.

– The new "Insertions in Margin" mode is intended to be only a
  run-time option, i.e. it's not possible to set it as a default
  Show Changes mode in Options, unlike "Deletions in Margin".

Change-Id: Ie4dc9fe3b4b201fa9976ef04877af649e242ab46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109649
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
---
 .../data/org/openoffice/Office/UI/Controller.xcu   | 28 ++++++++++++++++++++++
 .../org/openoffice/Office/UI/GenericCommands.xcu   | 11 +++++++++
 .../org/openoffice/Office/UI/WriterCommands.xcu    | 24 +++++++++++++++++++
 3 files changed, 63 insertions(+)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 10a67fab1140..9aaa6fd2a934 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -509,6 +509,20 @@
           <value>3dobjectsbar</value>
         </prop>
       </node>
+      <node oor:name="c41" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ShowTrackedChangesMenu</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.ResourceMenuController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>showtrackedchanges</value>
+        </prop>
+      </node>
       <node oor:name="WindowListMenu" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:WindowList</value>
@@ -709,6 +723,20 @@
           <value>3dobjectsbar;.uno:Cube</value>
         </prop>
       </node>
+      <node oor:name="ShowTrackedChangesController" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ShowTrackedChanges</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>.uno:ShowTrackedChangesMenu</value>
+        </prop>
+      </node>
       <node oor:name="ConnectorToolBox" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ConnectorToolbox</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 1db21b1af629..c39a8e987762 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6843,6 +6843,17 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:ShowTrackedChangesMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Change View</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="en-US">View</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:AVMediaPlayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Me~dia Player</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 72721e20f55e..588d0fd16379 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -706,6 +706,30 @@
           <value xml:lang="en-US">To ~Paragraph</value>
         </prop>
       </node>
+      <node oor:name=".uno:SetTrackedChangesInText" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Show All Changes Inline</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="en-US">All ~Changes Inline</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SetTrackedDeletionsInMargin" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Show Deletions In Margin</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Deletions In Margin</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:SetTrackedInsertionsInMargin" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Show Insertions In Margin</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Insertions In Margin</value>
+        </prop>
+      </node>
       <node oor:name=".uno:ToggleObjectLayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Change Position</value>
-- 
cgit