From bad16f67a7083d7e154b1679f0c137bf13d2907f Mon Sep 17 00:00:00 2001
From: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Date: Thu, 5 Nov 2020 15:38:39 +0200
Subject: tdf#105088 Update Help after changes in form control UI elements

Change-Id: I767199f899ee88040ad276bd9ed13f271f224169
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105372
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
---
 source/text/shared/00/00040501.xhp      | 32 ++++++++++++++++----------------
 source/text/shared/02/01170000.xhp      |  2 +-
 source/text/shared/guide/formfields.xhp | 19 +++++++++++++++----
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/source/text/shared/00/00040501.xhp b/source/text/shared/00/00040501.xhp
index 0bb86822cb..e7f2895d3b 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -49,7 +49,7 @@
         </table>
     </section>
     <section id="formulareigenschaften">
-        <paragraph role="paragraph" id="par_id3149292">Open context menu of a selected form element - choose <emph>Form</emph>.</paragraph>
+        <paragraph role="paragraph" id="par_id3149292">Open context menu of a selected form element - choose <menuitem>Form Properties</menuitem>.</paragraph>
         <section id="syformulareigenschaften">
             <table id="tbl_id3144432">
                 <tablerow>
@@ -64,23 +64,23 @@
         </section>
     </section>
     <section id="formulareigenschaftenallgemein">
-        <paragraph role="paragraph" id="par_id3150447">Open context menu of a selected form element - choose <emph>Form - General</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id3144448">Open <emph>Form Controls</emph> toolbar or <emph>Form Design</emph> toolbar, click <emph>Form</emph> icon - <emph>General</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3150447">Open context menu of a selected form element - choose <menuitem>Form Properties - General</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3144448">Open <widget>Form Design</widget> toolbar, click <widget>Form Properties</widget> icon - <widget>General</widget> tab.</paragraph>
     </section>
     <section id="formulareigenschaftendaten">
-        <paragraph role="paragraph" id="par_id3145786">Open context menu of a selected form element - choose <emph>Form - Data</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id3158156">Open <emph>Form Controls</emph> toolbar or <emph>Form Design</emph> toolbar, click <emph>Form</emph> icon - <emph>Data</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3145786">Open context menu of a selected form element - choose <menuitem>Form Properties - Data</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3158156">Open <widget>Form Design</widget> toolbar, click <widget>Form Properties</widget> icon - <widget>Data</widget> tab.</paragraph>
     </section>
     <section id="xformsdatatab">
-        <paragraph role="paragraph" id="par_id1979125">Open context menu of a selected control on an <emph>XML Form</emph> document, choose <emph>Control - Data</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id1769463">Open <emph>Form Controls</emph> toolbar of an <emph>XML Form</emph> document, click <emph>Control</emph> icon - <emph>Data</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id1979125">Open context menu of a selected control on an <emph>XML Form</emph> document, choose <menuitem>Control Properties - Data</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id1769463">Open <widget>Form Controls</widget> toolbar of an <emph>XML Form</emph> document, click <widget>Control</widget> icon - <widget>Data</widget> tab.</paragraph>
     </section>
     <section id="formulareigenschaftenereignisse">
-        <paragraph role="paragraph" id="par_id3145364">Open context menu of a selected form element - choose <emph>Form - Events</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id3153575">Open <emph>Form Controls</emph> toolbar or <emph>Form Design</emph> toolbar, click <emph>Form</emph> icon - <emph>Events</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3145364">Open context menu of a selected form element - choose <menuitem>Form Properties - Events</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3153575">Open <widget>Form Design</widget> toolbar, click <widget>Form Properties</widget> icon - <widget>Events</widget> tab.</paragraph>
     </section>
     <section id="controleigenschaften">
-        <paragraph role="paragraph" id="par_id3147234">Open context menu of a selected form element - choose <emph>Control</emph>.</paragraph>
+        <paragraph role="paragraph" id="par_id3147234">Open context menu of a selected form element - choose <menuitem>Control Properties</menuitem>.</paragraph>
         <section id="sycontroleigenschaften">
             <table id="tbl_id3151112">
                 <tablerow>
@@ -95,16 +95,16 @@
         </section>
     </section>
     <section id="controleigenschaftenallgemein">
-        <paragraph role="paragraph" id="par_id3153943">Open context menu of a selected form element - choose <emph>Control - General</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id3159198">Open <emph>Form Controls</emph> toolbar or <emph>Form Design</emph> toolbar, click <emph>Control</emph> icon - <emph>General</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3153943">Open context menu of a selected form element - choose <menuitem>Control Properties - General</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3159198">Open <widget>Form Design</widget> toolbar, click <widget>Control</widget> icon - <widget>General</widget> tab.</paragraph>
     </section>
     <section id="controleigenschaftendaten">
-        <paragraph role="paragraph" id="par_id3153203">Open context menu of a selected form element - choose <emph>Control - Data</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id3150048">Open <emph>Form Controls</emph> toolbar or <emph>Form Design</emph> toolbar, click <emph>Control</emph> icon - <emph>Data</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3153203">Open context menu of a selected form element - choose <menuitem>Control Properties - Data</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3150048">Open <widget>Form Design</widget> toolbar, click <widget>Control</widget> icon - <widget>Data</widget> tab.</paragraph>
     </section>
     <section id="controleigenschaftenereignisse">
-        <paragraph role="paragraph" id="par_id3153334">Open context menu of a selected form element - choose <emph>Control - Events</emph> tab.</paragraph>
-        <paragraph role="paragraph" id="par_id3153744">Open <emph>Form Controls</emph> toolbar or <emph>Form Design</emph> toolbar, click <emph>Control</emph> icon - <emph>Events</emph> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3153334">Open context menu of a selected form element - choose <menuitem>Control Properties - Events</menuitem> tab.</paragraph>
+        <paragraph role="paragraph" id="par_id3153744">Open <widget>Form Design</widget> toolbar, click <widget>Control Properties</widget> icon - <widget>Events</widget> tab.</paragraph>
     </section>
     <section id="tabordner">
         <paragraph role="paragraph" id="par_id6058839">On <emph>Form Design</emph> bar, click</paragraph>
diff --git a/source/text/shared/02/01170000.xhp b/source/text/shared/02/01170000.xhp
index 8ed1ceac4b..f9892fe031 100644
--- a/source/text/shared/02/01170000.xhp
+++ b/source/text/shared/02/01170000.xhp
@@ -83,7 +83,7 @@
 <h2 id="par_idN10C87" xml-lang="en-US">Modifying a Control</h2>
 <list type="ordered">
   <listitem>
-    <paragraph role="paragraph" id="par_id3148645" xml-lang="en-US">Right-click the control and choose <emph>Control</emph>. A dialog opens where you can define the properties of the control.</paragraph>
+    <paragraph role="paragraph" id="par_id3148645" xml-lang="en-US">Right-click the control and choose <menuitem>Control Properties</menuitem>. A dialog opens where you can define the properties of the control.</paragraph>
   </listitem>
   <listitem>
     <paragraph role="paragraph" id="par_id3153363" xml-lang="en-US">To specify a accelerator key for a control, add a tilde (<emph>~</emph>) in front of the character in the label for the control.</paragraph>
diff --git a/source/text/shared/guide/formfields.xhp b/source/text/shared/guide/formfields.xhp
index b3a7728db8..5e249e6cdd 100644
--- a/source/text/shared/guide/formfields.xhp
+++ b/source/text/shared/guide/formfields.xhp
@@ -44,14 +44,25 @@
             <paragraph xml-lang="en-US" id="par_id3154751" role="listitem">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3145345" role="listitem">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
+            <table id="tab_id841604586347865">
+                <tablerow>
+                    <tablecell>
+                        <paragraph role="paragraph" id="par_id951604586347866">
+                            <image src="cmd/32/pushbutton.png" id="img_id741604586347866" width="1cm" height="1cm"><alt id="alt_id641604586347866">Push Button Icon</alt></image>
+                        </paragraph>
+                    </tablecell>
+                    <tablecell>
+                        <paragraph xml-lang="en-US" id="par_id3145345" role="listitem">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
+                    </tablecell>
+                </tablerow>
+            </table>
             <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem">The mouse pointer changes to a cross-hair.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3159233" role="listitem">In the document, drag to draw the button.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem">Right-click the button and choose <emph>Control</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem">Right-click the button and choose <menuitem>Control Properties</menuitem>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem">Specify the properties of the button.</paragraph>
@@ -69,7 +80,7 @@
             <paragraph xml-lang="en-US" id="par_id3147350" role="listitem">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN10828" role="listitem">Right-click the button and choose <emph>Form</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10828" role="listitem">Right-click the button and choose <menuitem>Form Properties</menuitem>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem">The <emph>Form Properties</emph> dialog opens.</paragraph>
@@ -82,4 +93,4 @@
          <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
-- 
cgit