tdf#135089 update location of Presenter Console settings

...and update various headings and section order.

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

3 files changed, 32 insertions, 26 deletions

diff --git a/source/text/shared/optionen/01070500.xhp b/source/text/shared/optionen/01070500.xhp
index dca01427c2..e596d5223c 100644
--- a/source/text/shared/optionen/01070500.xhp
+++ b/source/text/shared/optionen/01070500.xhp
@@ -97,19 +97,6 @@
 <paragraph role="paragraph" id="par_id3155443" xml-lang="en-US"><ahelp hid="modules/simpress/ui/optimpressgeneralpage/metricFields">Defines the spacing between tab stops.</ahelp></paragraph>
 
 <switch select="appl">
-    <case select="IMPRESS">
-        <h2 id="hd_id3156383">Presentation</h2>
-        <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/enremotcont" id="bm_id3154757" localize="false"/>
-        <h3 id="hd_id3155903">Enable remote control</h3>
-        <paragraph role="paragraph" id="par_id3155963" xml-lang="en-US"><ahelp hid="modules/simpress/ui/optimpressgeneralpage/enremotcont">Specifies that you want to enable Bluetooth remote control while Impress is running.</ahelp> Unmark<emph> Enable remote control</emph> to disable remote controlling.</paragraph>
-
-        <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/enprsntcons" id="bm_id3154757" localize="false"/>
-        <h3 id="hd_id3155904">Enable Presenter Console</h3>
-        <paragraph role="paragraph" id="par_id3155964" xml-lang="en-US"><ahelp hid=".">Specifies that you want to enable the <link href="text/simpress/guide/presenter_console.xhp">Presenter Console</link> during slideshows.</ahelp></paragraph>
-    </case>
-</switch>
-
-<switch select="appl">
     <case select="DRAW">
         <h2 id="hd_id3163806">Scale</h2>
         <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/scaleBox" id="bm_id3146317" localize="false"/>
diff --git a/source/text/simpress/01/06080000.xhp b/source/text/simpress/01/06080000.xhp
index e635eb2ee1..70781d19f0 100644
--- a/source/text/simpress/01/06080000.xhp
+++ b/source/text/simpress/01/06080000.xhp
@@ -39,7 +39,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/PresentationDialog" id="bm_id3151241" localize="false"/>
 
 <h1 id="hd_id3153818">Slide Show Settings</h1>
-<paragraph id="par_id3148606" role="paragraph" xml-lang="en-US"><variable id="praesent"><ahelp hid=".uno:PresentationDialog">Defines settings for your slide show, including which slide to start from, the way you advance the slides, the type of presentation, and pointer options.</ahelp></variable></paragraph>
+<paragraph id="par_id3148606" role="paragraph" xml-lang="en-US"><variable id="praesent"><ahelp hid=".uno:PresentationDialog">Defines settings for your slide show, including how to display it, which slide to start from, the way you advance the slides, and whether you want to use the presenter console or control it remotely.</ahelp></variable></paragraph>
 
 <section id="howtoget">
 <embed href="text/simpress/00/00000407.xhp#praesent"/>
@@ -85,11 +85,15 @@
 <h3 id="hd_id3166420">Show logo</h3>
 <paragraph id="par_id3154501" role="paragraph" xml-lang="en-US"><ahelp hid="modules/simpress/ui/presentationdialog/showlogo">Displays the $[officename] logo on the pause slide.</ahelp> The logo cannot be exchanged.</paragraph>
 
-<h2 id="hd_id3150130">Options</h2>
+<h2 id="hd_id3150130">Presentation Options</h2>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/manualslides" id="bm_id3147367" localize="false"/>
 
-<h3 id="hd_id3149883">Change slides manually</h3>
+<h3 id="hd_id3149883">Disable automatic change of slide</h3>
 <paragraph id="par_id3147373" role="paragraph" xml-lang="en-US"><ahelp hid="modules/simpress/ui/presentationdialog/manualslides">Slides never change automatically when this box is selected.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/changeslidesbyclick" id="bm_id3149713" localize="false"/>
+
+<h3 id="hd_id3152478">Change slides by clicking on background</h3>
+<paragraph id="par_id3156305" role="paragraph" xml-lang="en-US"><ahelp hid="modules/simpress/ui/presentationdialog/changeslidesbyclick">Advances to the next slide when you click on the background of a slide.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/pointervisible" id="bm_id3150266" localize="false"/>
 
 <h3 id="hd_id3155439">Mouse pointer visible</h3>
@@ -101,25 +105,40 @@
 <note id="par_id3150475">Anything you write with the pen will appear in your slides after exiting the slideshow. The properties of the pen can be changed by choosing the <emph>Pen Width</emph> or <emph>Change pen Color</emph> command in the context menu of the running slide show.</note>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/animationsallowed" id="bm_id3147171" localize="false"/>
 
-<h3 id="hd_id3153718">Animations allowed</h3>
+<h3 id="hd_id3153718">Enable animated images</h3>
 <paragraph id="par_id3083445" role="paragraph" xml-lang="en-US"><ahelp hid="modules/simpress/ui/presentationdialog/animationsallowed">Displays all frames of animated GIF files during the slide show.</ahelp> If this option is not selected, only the first frame of an animated GIF file is displayed.<comment>see #i63884</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/changeslidesbyclick" id="bm_id3149713" localize="false"/>
-
-<h3 id="hd_id3152478">Change slides by clicking on background</h3>
-<paragraph id="par_id3156305" role="paragraph" xml-lang="en-US"><ahelp hid="modules/simpress/ui/presentationdialog/changeslidesbyclick">Advances to the next slide when you click on the background of a slide.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/alwaysontop" id="bm_id3150758" localize="false"/>
 
-<h3 id="hd_id3150960">Presentation always on top</h3>
+<h3 id="hd_id3150960">Keep presentation always on top</h3>
 <paragraph id="par_id3150764" role="paragraph" xml-lang="en-US"><ahelp hid="modules/simpress/ui/presentationdialog/alwaysontop">The $[officename] window remains on top during the presentation. No other program will show its window in front of your presentation.</ahelp></paragraph>
 
-<h2 id="hd_id6086611">Multiple Displays</h2>
+<h2 id="hd_id6086611">Display</h2>
 <paragraph id="par_id5446943" role="paragraph" xml-lang="en-US">By default the primary display is used for slide show mode. If the current desktop is displayed on more than one display, you can select which display to use for full screen slide show mode. If the current desktop spans only one display, or if the multi display feature is not supported on the current system, you cannot select another display.</paragraph>
+<note id="par_id2321543">These settings are saved in the user configuration and not inside the document.</note>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/presentationdialog/presdisplay_cb" id="bm_id6976836" localize="false"/>
 
 <h3 id="hd_id4962309">Presentation display</h3>
 <paragraph id="par_id5168919" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select a display to use for full screen slide show mode.</ahelp></paragraph>
 <paragraph id="par_id4846339" role="paragraph" xml-lang="en-US">If the system allows the user to span a window over all available displays, you can also select "All displays". In this case the presentation is spanned over all available displays.</paragraph>
-<note id="par_id2321543">This setting is saved in the user configuration and not inside the document.</note>
+
+<bookmark branch="hid/modules/simpress/ui/presentationdialog/presdisplay_cb" id="bm_id42864" localize="false"/>
+<h3 id="hd_id801700814088862">Presenter console</h3>
+<paragraph role="paragraph" id="par_id811700817391617">The <link href="text/simpress/guide/presenter_console.xhp"><emph>Presenter console</emph></link> provides extra controls and tools useful to the presenter. You can choose to use it in windowed or full screen mode, or disable it entirely.</paragraph>
+
+<bookmark branch="hid/modules/simpress/ui/presentationdialog/shownavigationbutton" id="bm_id52328" localize="false"/>
+<h3 id="hd_id841700817775313">Show navigation bar</h3>
+<paragraph role="paragraph" id="par_id971700817802604">The navigation bar allows the presenter to control the presentation with buttons at the bottom left of the screen, either with the mouse pointer or directly on display if a touch screen is used.</paragraph>
+
+<bookmark branch="hid/modules/simpress/ui/presentationdialog/frameremote" id="bm_id34884" localize="false"/>
+<h2 id="hd_id591700817455799">Remote control</h2>
+
+<bookmark branch="hid/modules/simpress/ui/presentationdialog/enableremote" id="bm_id45734" localize="false"/>
+<h3 id="hd_id141700819107315">Enable remote control</h3>
+<paragraph role="paragraph" id="par_id3155963" xml-lang="en-US">Specifies that you want to enable Bluetooth remote control while Impress is running. Unmark<emph> Enable remote control</emph> to disable remote controlling.</paragraph>
+
+<bookmark branch="hid/modules/simpress/ui/presentationdialog/learnmore" id="bm_id47615" localize="false"/>
+<paragraph role="paragraph" id="par_id941700818283800">A link directs you to the <link href="https://hub.libreoffice.org/impress-remote">available options to install the application</link> on your device.</paragraph>
+
 </body>
 
 </helpdocument>
diff --git a/source/text/simpress/guide/presenter_console.xhp b/source/text/simpress/guide/presenter_console.xhp
index 97535a5bbb..e80b60aed2 100644
--- a/source/text/simpress/guide/presenter_console.xhp
+++ b/source/text/simpress/guide/presenter_console.xhp
@@ -33,10 +33,10 @@
     <paragraph role="paragraph" id="par_id21512577205388" xml-lang="en-US">To enable the Presenter Console:</paragraph>
     <list type="unordered">
         <listitem>
-            <paragraph id="par_id351512577323192" role="listitem" xml-lang="en-US">Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME Impress - General</item>.</paragraph>
+            <paragraph id="par_id351512577323192" role="listitem" xml-lang="en-US">Choose <item type="menuitem">Slide Show - Slide Show Settings</item>.</paragraph>
         </listitem>
         <listitem>
-            <paragraph id="par_id411512577389978" role="listitem" xml-lang="en-US">Select <emph>Enable Presenter Console</emph> in the Presentation area.</paragraph>
+            <paragraph id="par_id411512577389978" role="listitem" xml-lang="en-US">In the <emph>Display - Presenter console</emph> dropdown, select either <emph>Full screen</emph> or <emph>Windowed</emph>.</paragraph>
         </listitem>
     </list>
     <embed href="text/shared/06/simpress_screenshots.xhp#simpressgeneraldialog"/>