tdf#154996 Add tabbed UI commands in Help page

+ refactoring
+ Add comments submenu

Change-Id: I465ea7c0518272e08f5af403f7502a1d10043b5b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/152632
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

7 files changed, 149 insertions, 11 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index dbe48539d4..cb60ea34e8 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -790,6 +790,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/submenu_text \
     helpcontent2/source/text/shared/submenu_spacing \
     helpcontent2/source/text/shared/menu/forms \
+    helpcontent2/source/text/shared/menu/comment_menu \
     helpcontent2/source/text/shared/menu/insert_chart \
     helpcontent2/source/text/shared/menu/insert_form_control \
     helpcontent2/source/text/shared/menu/insert_shape \
diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp
index f25bf60339..41e82a2653 100644
--- a/source/text/shared/00/edit_menu.xhp
+++ b/source/text/shared/00/edit_menu.xhp
@@ -230,8 +230,11 @@
     <paragraph role="paragraph" id="par_id3152417"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + A</keycode></paragraph>
 </section>
 
+<section id="changes">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id3145251">Choose <menuitem>Edit - Track Changes</menuitem>.</paragraph>
+</section>
 
-<paragraph role="paragraph" id="par_id3145251"><variable id="aenderungen">Choose <menuitem>Edit - Track Changes</menuitem>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3153336"><variable id="aufzeichnen">Choose <menuitem>Edit - Track Changes - Record</menuitem>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3150594"><variable id="anzeigen">Choose <menuitem>Edit - Track Changes - Show</menuitem>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3153845"><variable id="rotlinie">Choose <menuitem>Edit - Track Changes - Manage</menuitem>.</variable></paragraph>
@@ -250,6 +253,27 @@
 <paragraph role="paragraph" id="par_id3149488">Choose <menuitem>Edit - Track Changes - Manage - List</menuitem> tab.<br/>Click an entry in the list and open the context menu.<br/>Choose <emph>Edit Comment</emph>.</paragraph>
 </section>
 
+<section id="comment_menu">
+    <switch select="appl">
+        <case select="WRITER">
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id171685981254743">Choose <menuitem>Edit - Comment</menuitem>.</paragraph>
+            <section id="ctxmnu">
+                <embed href="text/shared/00/00000004.xhp#from_context"/>
+                <paragraph role="paragraph" id="par_id501685985116612">Click on the comment to select and then open the context menu.</paragraph>
+                <h4 id="hd_id211685985284382">On the Comment note:</h4>
+                <paragraph role="paragraph" id="par_id321685985156516">Click on the drop-down list of the selected comment.</paragraph>
+            </section>
+        </case>
+        <case select="IMPRESS"><embed href="text/shared/00/edit_menu.xhp#ctxmnu"/></case>
+        <case select="DRAW"><embed href="text/shared/00/edit_menu.xhp#ctxmnu"/></case>
+        <case select="CALC"></case>
+        <case select="MATH"></case>
+        <case select="BASE"></case>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+    <paragraph role="paragraph" id="par_id711685981703647">Choose <menuitem>Review</menuitem>.</paragraph>
+</section>
 
 <section id="find">
     <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
diff --git a/source/text/shared/01/02230000.xhp b/source/text/shared/01/02230000.xhp
index 1cf241bc1a..acf87fb23a 100644
--- a/source/text/shared/01/02230000.xhp
+++ b/source/text/shared/01/02230000.xhp
@@ -20,23 +20,21 @@
 
 <meta>
   <topic id="textshared0102230000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Track Changes</title>
+    <title id="tit">Track Changes</title>
     <filename>/text/shared/01/02230000.xhp</filename>
   </topic>
 </meta>
 
 <body>
-
-
 <section id="track_changes">
-<bookmark xml-lang="en-US" branch="hid/.uno:ChangesMenu" id="bm_id8352305" localize="false"/>
+<bookmark branch="hid/.uno:ChangesMenu" id="bm_id8352305" localize="false"/>
 
 <h1 id="hd_id3152952"><link href="text/shared/01/02230000.xhp">Track Changes</link></h1>
-<paragraph id="par_id3145759" role="paragraph" xml-lang="en-US"><ahelp hid=".">Lists the commands that are available for tracking changes in your file.</ahelp></paragraph>
+<paragraph id="par_id3145759" role="paragraph"><ahelp hid=".">Lists the commands that are available for tracking changes in your file.</ahelp></paragraph>
 </section>
 
 <section id="howtoget">
-<embed href="text/shared/00/edit_menu.xhp#aenderungen"/>
+<embed href="text/shared/00/edit_menu.xhp#changes"/>
 </section>
 <embed href="text/shared/01/02230100.xhp#record_changes"/>
 <embed href="text/shared/01/02230150.xhp#red_protect"/>
diff --git a/source/text/shared/01/02230300.xhp b/source/text/shared/01/02230300.xhp
index fd2c6174c4..d54a9bd357 100644
--- a/source/text/shared/01/02230300.xhp
+++ b/source/text/shared/01/02230300.xhp
@@ -35,7 +35,7 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/comment/edit" id="bm_id3153883" localize="false"/>
 
 <section id="trackchangecommenthead">
-    <h1 id="hd_id3083278">Insert Track Change Comment</h1>
+  <h1 id="hd_id3083278"><variable id="h1"><link href="text/shared/01/02230300.xhp">Insert Track Change Comment</link></variable></h1>
 <paragraph role="paragraph" id="par_id3148983" xml-lang="en-US"><variable id="kommentartext"><ahelp hid=".">Enter a comment for the recorded change.</ahelp>
         </variable></paragraph>
 </section>
diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp
index a14d58412b..1731affd0e 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -42,7 +42,7 @@
     <section id="comment">
         <bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id8906707" localize="false"/>
         <bookmark xml-lang="en-US" branch="hid/.uno:EditAnnotation" id="bm_id8905607" localize="false"/>
-        <h1 id="hd_id3154100"><link href="text/shared/01/04050000.xhp">Comment</link></h1>
+        <h1 id="hd_id3154100"><variable id="h1"><link href="text/shared/01/04050000.xhp">Comment</link></variable></h1>
         <paragraph id="par_id3151100" role="paragraph" xml-lang="en-US"><variable id="notizbearbeitentext"><ahelp hid=".">Inserts a comment around the selected text, presentation slide, drawing page or at the current spreadsheet cursor position.</ahelp></variable></paragraph>
     </section>
     <section id="howtoget">
diff --git a/source/text/shared/menu/comment_menu.xhp b/source/text/shared/menu/comment_menu.xhp
new file mode 100644
index 0000000000..53046ded9c
--- /dev/null
+++ b/source/text/shared/menu/comment_menu.xhp
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="commentsmenu" indexer="include" status="PUBLISH">
+        <title id="tit">Comments Menu</title>
+        <filename>/text/shared/menu/comment_menu.xhp</filename>
+    </topic>
+</meta>
+<body>
+<section id="comment_menu">
+    <h1 id="hd_id381685980724188"><variable id="h1"><link href="text/shared/menu/comment_menu.xhp">Comments Menu</link></variable></h1>
+    <paragraph role="paragraph" id="par_id941603125587454">Shows a submenu that gives options to reply to comments from other users, resolve and delete comments.</paragraph>
+</section>
+<section id="howtoget">
+    <embed href="text/shared/00/edit_menu.xhp#comment_menu"/>
+</section>
+
+<bookmark branch="hid/modules/simpress/ui/annotationtagmenu/.uno:ReplyToAnnotation" id="bm_id911685996545399" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/annotation/reply" id="bm_id701685995022707" localize="false"/>
+<h2 id="hd_id771685982803183">Reply Comment</h2>
+<paragraph role="paragraph" id="par_id491685993001013">Inserts a new comment adjacent to the comment to which you want to reply. The comment anchor is the same for all comments in the thread.</paragraph>
+<table id="tab_id711685992961743">
+    <tablerow>
+        <tablecell>
+            <paragraph id="par_id341685992961744" role="paragraph">
+                <image src="cmd/lc_replycomment.svg" id="img_id911685992961745" width="1cm" height="1cm"><alt id="alt_id541685992961746">Icon Reply Comment</alt></image>
+            </paragraph>
+        </tablecell>
+        <tablecell>
+            <paragraph id="par_id661685992961748" role="paragraph">Reply Comment</paragraph>
+        </tablecell>
+    </tablerow>
+</table>
+
+<switch select="appl">
+    <case select="WRITER">
+        <tip id="par_id931685994600871">Replying a comment creates a comment thread.</tip>
+        <bookmark branch="hid/modules/swriter/ui/annotation/resolve" id="bm_id281685995057172" localize="false"/>
+        <bookmark branch="hid/modules/swriter/ui/annotation/unresolve" id="bm_id491685995061740" localize="false"/>
+        <h2 id="hd_id951685982807912">Resolve / Unresolve</h2>
+        <paragraph role="paragraph" id="par_id751685993265436">Marks the comment as <emph>Resolved</emph> (or <emph>Unresolved</emph>). When you mark the comment resolved, the word <emph>Resolved</emph> is inserted under the date in the comment box. When marking unresolved, the word <emph>Resolved</emph> is removed.</paragraph>
+
+        <bookmark branch="hid/modules/swriter/ui/annotation/resolvethread" id="bm_id761685995105517" localize="false"/>
+        <bookmark branch="hid/modules/swriter/ui/annotation/unresolvethread" id="bm_id571685995109653" localize="false"/>
+        <h2 id="hd_id541685982812304">Resolve Thread</h2>
+        <paragraph role="paragraph" id="par_id171685994484069">Marks the comment thread as <emph>Resolved</emph> (or <emph>Unresolved</emph>). All comments in the thread are marked <emph>Resolved</emph> (or <emph>Unresolved)</emph>.</paragraph>
+    </case>
+</switch>
+<bookmark branch="hid/modules/simpress/ui/annotationtagmenu/.uno:DeleteAnnotation" id="bm_id651685996207008" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/annotation/delete" id="bm_id981685995158358" localize="false"/>
+<h2 id="hd_id811685982816727">Delete Comment</h2>
+<paragraph role="paragraph" id="par_id241685994046592">Deletes the comment.</paragraph>
+<table id="tab_id721685994175302">
+    <tablerow>
+        <tablecell>
+            <paragraph id="par_id721685994175303" role="paragraph">
+                <image src="cmd/lc_deleteannotation.svg" id="img_id161685994175304" width="1cm"  height="1cm"><alt id="alt_id751685994175306">Icon Delete Comment</alt></image>
+            </paragraph>
+        </tablecell>
+        <tablecell>
+            <paragraph id="par_id641685994175307" role="paragraph">Delete Comment</paragraph>
+        </tablecell>
+    </tablerow>
+</table>
+<switch select="appl">
+    <case select="WRITER">
+        <bookmark branch="hid/modules/swriter/ui/annotation/deletethread" id="bm_id571685994832063" localize="false"/>
+        <h2 id="hd_id411685982821640">Delete Comment Thread</h2>
+        <paragraph role="paragraph" id="par_id941685994231483">Deletes all comments of the same thread.</paragraph>
+    </case>
+</switch>
+
+<bookmark branch="hid/modules/simpress/ui/annotationtagmenu/.uno:DeleteAllAnnotationByAuthor" id="bm_id51685996157456" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/annotation/deleteby" id="bm_id121685995198504" localize="false"/>
+<h2 id="hd_id801685982825543">Delete Comment By</h2>
+<paragraph role="paragraph" id="par_id631685994308029">Deletes all comments of the same author.</paragraph>
+
+<bookmark branch="hid/modules/simpress/ui/annotationtagmenu/.uno:DeleteAllAnnotation" id="bm_id961685996455055" localize="false"/>
+<bookmark branch="hid/modules/swriter/ui/annotation/deleteall" id="bm_id681685995221864" localize="false"/>
+<h2 id="hd_id321685982829794">Delete All Comments</h2>
+<paragraph role="paragraph" id="par_id131685994324823">Deletes all comments of the document.</paragraph>
+<table id="tab_id521685994350878">
+    <tablerow>
+        <tablecell>
+            <paragraph id="par_id881685994350879" role="paragraph">
+                <image src="cmd/lc_deleteallannotation.svg" id="img_id501685994350880" width="1cm"  height="1cm"><alt id="alt_id131685994350881">Icon Delete All Comments</alt></image>
+            </paragraph>
+        </tablecell>
+        <tablecell>
+            <paragraph id="par_id371685994350883" role="paragraph">Delete All Comments</paragraph>
+        </tablecell>
+    </tablerow>
+</table>
+
+<switch select="appl">
+    <case select="WRITER">
+        <bookmark branch="hid/modules/swriter/ui/annotation/formatall" id="bm_id131685995922759" localize="false"/>
+        <h2 id="hd_id701685995308264">Format All Comments</h2>
+        <paragraph role="paragraph" id="par_id481685995582479">Opens the <link href="text/shared/01/05020000.xhp">Format Character</link> dialog to set font, font effects, position and highlighting of all comments text.</paragraph>
+    </case>
+</switch>
+<section id="relatedtopics">
+    <paragraph role="paragraph" id="par_id101685982362184" localize="false"><embedvar href="text/shared/01/04050000.xhp#h1" markup="ignore"/></paragraph>
+    <paragraph role="paragraph" id="par_id251685982514049" localize="false"><embedvar href="text/shared/01/02230300.xhp#h1" markup="ignore"/></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/swriter/main0102.xhp b/source/text/swriter/main0102.xhp
index e9cd0dd655..997ce5c4cd 100644
--- a/source/text/swriter/main0102.xhp
+++ b/source/text/swriter/main0102.xhp
@@ -50,9 +50,8 @@
 <embed href="text/swriter/01/goto.xhp#goto"/>
 
 <embed href="text/shared/01/02230000.xhp#track_changes"/>
+<embed href="text/shared/menu/comment_menu.xhp#comment_menu"/>
 
-<h2 id="hd_id11603124968334">Comment</h2>
-<paragraph role="paragraph" id="par_id941603125587454">Shows a submenu that gives options to reply to comments from other users, resolve and delete comments.</paragraph><comment>When a submenu for Comment is made, then replace label and description with an embed - 19.10.20</comment>
 <embed href="text/shared/02/09070000.xhp#hyperlink"/>
 <embed href="text/swriter/01/edit_reference_submenu.xhp#edit_reference_head"/>