source/text/shared/guide/floating_toolbar.xhp |   39 ++++++++++++++------------
 1 file changed, 21 insertions(+), 18 deletions(-)

New commits:
commit eec60108b90928b81d094f7f37250164467d8cd6
Author:     Ming Hua <[email protected]>
AuthorDate: Fri Dec 25 17:41:25 2020 +0100
Commit:     Ilmari Lauhakangas <[email protected]>
CommitDate: Sun Dec 27 17:46:11 2020 +0100

    tdf#139122 Add information about locking/unlocking toolbars
    
    The toolbars in the default "Standar Toolbar" UI are locked by default
    since 7.0, so "Using Toolbars" help page is updated to reflect this
    change and information about locking and unlocking toolbars are added.
    
    Also update the entire page to use new XML tags, and some general
    clean-up.
    
    + add a paragraph at the beginning of the page explaining the
      docked/floating status of toolbars, and mention that toolbars are
      docked and locked by default
    + add two sections about unlocking and locking docked toolbars and
      corresponding bookmark
    * move description of toolbar handle from undocking section to unlocking
      section
    - remove unnecessary list structure in the section about undocking
      toolbars
    * use more specific XML tags throughout the page, such as <h1><h2><h3>
      tags instead of <paragraph> for headings, as well as <warning><note>
      tags instead of <paragraph>, and <menuitem> tags instead of <emph>,
      where appropriate.
    * use en-dash instead of ASCII hyphen for menu items
    - delete old comments intended as changelogs and no longer relevant
    
    The "Part of the main window - Toolbars" section of _Getting Started
    Guide 6.4_ (Chapter 1, pages 20-22) is used as reference.
    
    Change-Id: Id6256c75cd99e7b7db69bbff2a4d36be72a2d7cf
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/108297
    Tested-by: Jenkins
    Reviewed-by: Ilmari Lauhakangas <[email protected]>
    Reviewed-by: Seth Chaiklin <[email protected]>

diff --git a/source/text/shared/guide/floating_toolbar.xhp 
b/source/text/shared/guide/floating_toolbar.xhp
index 9cc5c4a86..3a4dfb82f 100644
--- a/source/text/shared/guide/floating_toolbar.xhp
+++ b/source/text/shared/guide/floating_toolbar.xhp
@@ -32,6 +32,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152801">
   <bookmark_value>toolbars;docking/undocking</bookmark_value>
   <bookmark_value>toolbars;viewing/closing</bookmark_value>
+  <bookmark_value>toolbars;locking/unlocking</bookmark_value>
   <bookmark_value>closing;toolbars</bookmark_value>
   <bookmark_value>docking;toolbars</bookmark_value>
   <bookmark_value>fixing toolbars</bookmark_value>
@@ -47,40 +48,42 @@
   <bookmark_value>icon bars, see toolbars</bookmark_value>
   <bookmark_value>button bars, see toolbars</bookmark_value>
 </bookmark>
-<comment>mw added one index entry and changed a "toolbars;" entry.</comment>
 
-<paragraph id="hd_id3152801" role="heading" level="1" 
xml-lang="en-US"><variable id="floating_toolbar"><link 
href="text/shared/guide/floating_toolbar.xhp" name="Using Toolbars">Using 
Toolbars</link> </variable></paragraph>
+<h1 id="hd_id3152801" xml-lang="en-US"><variable id="floating_toolbar"><link 
href="text/shared/guide/floating_toolbar.xhp" name="Using Toolbars">Using 
Toolbars</link> </variable></h1>
+<paragraph id="par_id201608908867251" role="paragraph" 
xml-lang="en-US">Toolbars in %PRODUCTNAME can be either docked as part of the 
main window, or floating as a separate window. By default, the visible toolbars 
and the ones you open with <menuitem>View – Toolbars</menuitem> are docked, and 
their positions are locked.</paragraph>
 <paragraph id="par_id3143267" role="paragraph" xml-lang="en-US">Some toolbar 
icons, for example the <emph>Font Color</emph> icon, can open another toolbar. 
Click the arrow next to the icon to open a toolbar containing further 
icons.</paragraph>
 <paragraph id="par_id3155450" role="paragraph" xml-lang="en-US">You now have a 
choice: either click the icon that you want to activate, or seize the toolbar 
by its title bar and drag it while holding down the mouse button. </paragraph>
 
-<paragraph id="hd_id733970" role="heading" level="2" xml-lang="en-US">Context 
of Toolbars</paragraph><comment>UFI: new CWS toolbarbehavior, #i50428 
etc</comment><comment>UFI: #i63811</comment>
+<h2 id="hd_id733970" xml-lang="en-US">Context of Toolbars</h2>
 <paragraph id="par_id341196" role="paragraph" xml-lang="en-US">Some toolbars 
open automatically depending on the context. For example, when you click inside 
a table in a text document, the Table toolbar opens. When you click inside a 
numbered paragraph, the Bullets and Numbering toolbar opens.</paragraph>
-<paragraph id="par_id190920161856181370" role="warning" 
xml-lang="en-US">Toolbars are hidden by default when the <link 
href="text/shared/01/notebook_bar.xhp">Notebook bar</link> is 
active.</paragraph>
+<warning id="par_id190920161856181370" xml-lang="en-US">Toolbars are hidden by 
default when the <link href="text/shared/01/notebook_bar.xhp">Notebook 
bar</link> is active.</warning>
 
-<paragraph id="hd_id4224372" role="heading" level="3" xml-lang="en-US">To 
Close a Toolbar Temporarily</paragraph>
-<paragraph id="par_id295724" role="paragraph" xml-lang="en-US">Click the icon 
in the toolbar's title bar, or choose <emph>Close Toolbar</emph> from the 
context menu. The toolbar will be shown automatically again when the context 
becomes active again.</paragraph>
+<h3 id="hd_id4224372" xml-lang="en-US">To Close a Toolbar Temporarily</h3>
+<paragraph id="par_id295724" role="paragraph" xml-lang="en-US">Click the icon 
in the toolbar's title bar, or choose <menuitem>Close Toolbar</menuitem> from 
the context menu. The toolbar will be shown automatically again when the 
context becomes active again.</paragraph>
 
-<paragraph id="hd_id1905575" role="heading" level="3" xml-lang="en-US">To 
Close a Toolbar Permanently</paragraph>
-<paragraph id="par_id9776909" role="paragraph" xml-lang="en-US">While the 
toolbar is visible, choose <emph>View - Toolbars</emph> and click the name of 
the toolbar to remove the check mark.</paragraph>
+<h3 id="hd_id1905575" xml-lang="en-US">To Close a Toolbar Permanently</h3>
+<paragraph id="par_id9776909" role="paragraph" xml-lang="en-US">While the 
toolbar is visible, choose <menuitem>View – Toolbars</menuitem> and click the 
name of the toolbar to remove the check mark.</paragraph>
 
-<paragraph id="par_idN1077E" role="heading" level="2" xml-lang="en-US">To Show 
a Closed Toolbar</paragraph>
+<h2 id="hd_idN1077E" xml-lang="en-US">To Show a Closed Toolbar</h2>
 
 <list type="unordered">
   <listitem>
-    <paragraph id="par_idN10785" role="paragraph" xml-lang="en-US">Choose 
<emph>View - Toolbars</emph> and click the name of the toolbar.</paragraph>
+    <paragraph id="par_idN10785" role="paragraph" xml-lang="en-US">Choose 
<menuitem>View – Toolbars</menuitem> and click the name of the 
toolbar.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id7296975" role="paragraph" xml-lang="en-US">Choose 
<emph>View - Toolbars - Reset</emph> to reset the toolbars to their default 
context sensitive behavior. Now some toolbars will be shown automatically, 
dependent on the context.</paragraph>
+    <paragraph id="par_id7296975" role="paragraph" xml-lang="en-US">Choose 
<menuitem>View – Toolbars – Reset</menuitem> to reset the toolbars to their 
default context sensitive behavior. Now some toolbars will be shown 
automatically, dependent on the context.</paragraph>
   </listitem></list>
 
-<paragraph id="par_idN106E9" role="heading" level="2" xml-lang="en-US">To Make 
a Toolbar a Floating Toolbar</paragraph>
+<h2 id="hd_id981608909383980" xml-lang="en-US">To Unlock a Docked Toolbar</h2>
+<paragraph id="par_id21608909469876" role="paragraph" 
xml-lang="en-US">Right-click the toolbar and choose <menuitem>Lock Toolbar 
Position</menuitem> from the context menu so that it is unchecked. A small 
vertical handle appears at the start of an unlocked toolbar, which you can use 
to move the toolbar.</paragraph>
 
-<list type="unordered">
-  <listitem>
-    <paragraph id="par_idN106EF" role="paragraph" xml-lang="en-US">Click the 
handle at the start of the toolbar, and drag the toolbar into the 
document.<comment>UFI: removed a para about floating 
windows</comment></paragraph>
-  </listitem></list>
+<h2 id="hd_id911608910290237" xml-lang="en-US">To Lock a Docked Toolbar</h2>
+<paragraph id="par_id741608910160801" role="paragraph" xml-lang="en-US">You 
can lock the position of a toolbar by choosing <menuitem>Lock Toolbar 
Position</menuitem> again from the context menu, so that it is 
checked.</paragraph>
+
+<h2 id="hd_idN106E9" xml-lang="en-US">To Make a Toolbar a Floating Toolbar</h2>
+<paragraph id="par_idN106EF" role="paragraph" xml-lang="en-US">Click the 
toolbar handle and drag the toolbar into the document.</paragraph>
 
-<paragraph id="par_idN106F2" role="heading" level="2" xml-lang="en-US">To 
Reattach a Floating Toolbar</paragraph>
+<h2 id="hd_idN106F2" xml-lang="en-US">To Reattach a Floating Toolbar</h2>
 
 <list type="unordered">
   <listitem>
@@ -95,7 +98,7 @@
   </listitem></list>
 
 <section id="docking_win">
-<paragraph id="par_idN107AC" role="note" xml-lang="en-US">Docking toolbars and 
windows by drag-and-drop depends on your system's window manager settings. You 
must enable your system to show the full window contents when you move a 
window, instead of showing just the outer frame.</paragraph>
+<note id="par_idN107AC" xml-lang="en-US">Docking toolbars and windows by 
drag-and-drop depends on your system's window manager settings. You must enable 
your system to show the full window contents when you move a window, instead of 
showing just the outer frame.</note>
 </section>
 </section>
 
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to