source/text/shared/00/00000403.xhp  |  147 ++++++++++++++++++++++++++----------
 source/text/shared/00/edit_menu.xhp |   40 ++++++---
 source/text/shared/01/03110000.xhp  |   14 +--
 source/text/shared/01/04180100.xhp  |   19 ++--
 4 files changed, 149 insertions(+), 71 deletions(-)

New commits:
commit d8edb78135c45defa38dc4edd2103b687b6326f8
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Sun Jun 18 09:36:49 2023 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sun Jun 18 15:09:05 2023 +0200

    tdf#155875 Tabbed UI commands Writer in Help pages
    
    + refactoring
    + Writer View menu (part 8 - end for View menu)
    
    Change-Id: Icaa6d102faa114c1fe93525c249563fc8644fa9b
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153232
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/shared/00/00000403.xhp 
b/source/text/shared/00/00000403.xhp
index 6337cc3795..f5b8dad1f4 100644
--- a/source/text/shared/00/00000403.xhp
+++ b/source/text/shared/00/00000403.xhp
@@ -30,11 +30,37 @@
 <body>
 <h1 id="hd_id3156304">View Menu</h1>
 <section id="zoom">
-<paragraph role="paragraph" id="par_id3146936">Choose <menuitem>View - Zoom - 
Zoom</menuitem>.</paragraph>
-<paragraph role="paragraph" id="par_id3149962"><switchinline 
select="appl"><caseinline select="DRAW">Zoom also with (+) (-) (×) and (÷) on 
the number keypad
-</caseinline><caseinline select="IMPRESS">Zoom also with (+) (-) (×) and (÷) 
on the number keypad.</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152895">Click or right-click the zoom 
factor displayed on the Zoom Slider in the <emph>Status</emph> bar.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id3146936">Choose <menuitem>View - 
Zoom</menuitem>.</paragraph>
+    <switch select="appl">
+        <case select="WRITER">
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id571687091234072">Choose 
<menuitem>Home - Zoom</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id51687091238048">Choose 
<menuitem>View - Zoom</menuitem>.</paragraph>
+        </case>
+        <default>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id971687091241800">Choose 
<menuitem>View - Zoom</menuitem>.</paragraph>
+        </default>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tab_id421687091274225">
+        <tablerow>
+            <tablecell>
+                <paragraph id="par_id961687091274226" role="paragraph"><image 
src="cmd/lc_zoom.svg" id="img_id801687091274227" width="1cm"  height="1cm"><alt 
id="alt_id51687091274228">Icon Zoom</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph id="par_id191687091274230" 
role="paragraph">Zoom</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+    <paragraph role="paragraph" id="par_id571687091551425"><switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>
 + mouse wheel</keycode></paragraph>
+    <paragraph role="paragraph" id="par_id3149962"><switchinline 
select="appl"><caseinline select="DRAW">Zoom also with (+) (-) (×) and (÷) on 
the number keypad.</caseinline><caseinline select="IMPRESS">Zoom also with (+) 
(-) (×) and (÷) on the number keypad.</caseinline></switchinline></paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_statusbar"/>
+    <paragraph role="paragraph" id="par_id3152895">Click or right-click the 
zoom factor displayed on the Zoom Slider.</paragraph>
 </section>
+
 <section id="viewtoolbars">
     <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
     <paragraph role="paragraph" id="par_id3156183">Choose <menuitem>View - 
Toolbars</menuitem>.</paragraph>
@@ -60,45 +86,86 @@
 <paragraph role="paragraph" id="par_id3153717"><variable 
id="hypdiamailnews">Click <emph>Hyperlink</emph> icon on <emph>Standard</emph> 
bar, click <emph>Mail</emph>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3149415"><variable id="hypdiadok">Click 
<emph>Hyperlink</emph> icon on <emph>Standard</emph> bar, click 
<emph>Document</emph>.</variable></paragraph>
 <paragraph role="paragraph" id="par_id3150129"><variable 
id="hypdianeudok">Click <emph>Hyperlink</emph> icon on <emph>Standard</emph> 
bar, click <emph>New Document</emph>.</variable></paragraph>
-<section id="full_screen">
-<paragraph role="paragraph" id="par_id3159269">Choose <menuitem>View - Full 
Screen</menuitem>.</paragraph>
-<paragraph role="paragraph" 
id="par_id3149578"><keycode>Shift+</keycode><switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+J</keycode></paragraph>
-<switch select="appl">
-<case select="WRITER">
-<section id="syfullscreen">
-<table id="tbl_id3150275">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153257">
-<image id="img_id3148473" src="cmd/sc_fullscreen.png" width="1cm" 
height="1cm"><alt id="alt_id3148473">Icon</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153627">Full Screen (in Print 
Preview)</paragraph>
-</tablecell>
-</tablerow>
-</table>
 
+<section id="full_screen">
+    <switch select="appl">
+        <case select="BASE"/>
+        <case select="IMPRESS"/>
+        <case select="DRAW"/>
+        <default>
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id3159269">Choose 
<menuitem>View - Full Screen</menuitem>.</paragraph>
+        </default>
+    </switch>
+    <switch select="appl">
+        <case select="MATH"/>
+        <case select="IMPRESS"/>
+        <case select="DRAW"/>
+        <case select="BASE"/>
+        <default>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id821687089742815">Choose 
<menuitem>View - Full Screen</menuitem>.</paragraph>
+        </default>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <section id="syfullscreen">
+        <table id="tbl_id3150275">
+            <tablerow>
+                <tablecell>
+                    <paragraph role="paragraph" id="par_id3153257"><image 
id="img_id3148473" src="cmd/lc_fullscreen.svg" width="1cm" height="1cm"><alt 
id="alt_id3148473">Icon Full Screen</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph role="paragraph" id="par_id3153627">Full 
Screen</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
+    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+    <paragraph role="paragraph" id="par_id3149578"><switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>
 + Shift + J</keycode></paragraph>
 </section>
-</case>
-</switch>
-</section>
+
 <section id="data_sources">
-<paragraph role="paragraph" id="par_id3147559">If a text document or 
spreadsheet is open:</paragraph>
-<paragraph role="paragraph" id="par_id3145069">Menu <emph>View - Data 
Sources</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149046"><switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+F4</keycode>
 keys</paragraph>
-<section id="sydata_sources">
-<table id="tbl_id3149456">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153778">
-<image id="img_id3153524" src="cmd/sc_viewdatasourcebrowser.png" width="1cm" 
height="1cm"><alt id="alt_id3153524">Icon</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3146908">Data Sources</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
+    <switch select="appl">
+        <case select="IMPRESS"/>
+        <case select="DRAW"/>
+        <case select="MATH"/>
+        <case select="BASE"/>
+        <default>
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id3145069">Menu <emph>View - 
Data Sources</emph>.</paragraph>
+        </default>
+    </switch>
+    <switch select="appl">
+        <case select="WRITER">
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id251687088275100">Choose 
<menuitem>References - Data Sources</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id241687087681423">On the 
<menuitem>Tools</menuitem> menu of the <menuitem>Tools</menuitem> tab, choose 
<menuitem>Data Sources</menuitem>.</paragraph>
+        </case>
+    </switch>
+    <switch select="appl">
+        <case select="MATH"/>
+        <case select="BASE"/>
+        <case select="WRITER"/>
+        <default>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id241687087681422">On the 
<menuitem>Tools</menuitem> menu of the <menuitem>Tools</menuitem> tab, choose 
<menuitem>Data Sources</menuitem>.</paragraph>
+        </default>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <section id="sydata_sources">
+        <table id="tbl_id3149456">
+            <tablerow>
+                <tablecell>
+                    <paragraph role="paragraph" id="par_id3153778"><image 
id="img_id3153524" src="cmd/lc_viewdatasourcebrowser.svg" width="1cm" 
height="1cm"><alt id="alt_id3153524">Icon Data Sources</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph role="paragraph" id="par_id3146908">Data 
Sources</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
+    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+    <paragraph role="paragraph" id="par_id3149046"><switchinline 
select="sys"><caseinline 
select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>
 + Shift + F4</keycode></paragraph>
 </section>
 
 <section id="htmlsource">
diff --git a/source/text/shared/00/edit_menu.xhp 
b/source/text/shared/00/edit_menu.xhp
index 0fc6afc000..e233478ffb 100644
--- a/source/text/shared/00/edit_menu.xhp
+++ b/source/text/shared/00/edit_menu.xhp
@@ -374,22 +374,34 @@
 </default>
 </switch>
 </section>
+
 <section id="navigator">
-<paragraph role="paragraph" id="par_id3152960">Choose <menuitem>View - 
Navigator</menuitem>.</paragraph>
-<paragraph role="paragraph" id="par_id941683841117366">Press 
<keycode>F5</keycode></paragraph>
-<paragraph role="paragraph" id="par_id3163824">On the <emph>Standard</emph> 
bar or the <emph>Sidebar</emph>, click</paragraph>
-<table id="tbl_id3155515">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3159183">
-<image id="img_id3154508" src="cmd/lc_navigator.svg" width="1cm" 
height="1cm"><alt id="alt_id3154508">Icon Navigator 
On/Off</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147359">Navigator On/Off</paragraph>
-</tablecell>
-</tablerow>
-</table>
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id3152960">Choose <menuitem>View - 
Navigator</menuitem>.</paragraph>
+    <switch select="appl">
+        <case select="WRITER">
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id791687085753159">Choose 
<menuitem>Home - Navigator</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id791687085753160">Choose 
<menuitem>View - Navigator</menuitem>.</paragraph>
+        </case>
+    </switch>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tbl_id3155515">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3159183">
+                    <image id="img_id3154508" src="cmd/lc_navigator.svg" 
width="1cm" height="1cm"><alt id="alt_id3154508">Icon Navigator 
On/Off</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3147359">Navigator 
On/Off</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+    <paragraph role="paragraph" 
id="par_id941683841117366"><keycode>F5</keycode></paragraph>
 </section>
+
+
 <paragraph role="paragraph" id="par_id3147338"><variable id="litdat">Choose 
<menuitem>Tools - Bibliography Database</menuitem>.</variable></paragraph>
 
 <section id="link">
diff --git a/source/text/shared/01/03110000.xhp 
b/source/text/shared/01/03110000.xhp
index f4c1db365a..5a948f8272 100644
--- a/source/text/shared/01/03110000.xhp
+++ b/source/text/shared/01/03110000.xhp
@@ -20,27 +20,27 @@
 
 <meta>
   <topic id="textshared0103110000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Full Screen</title>
+    <title id="tit">Full Screen</title>
     <filename>/text/shared/01/03110000.xhp</filename>
   </topic>
 </meta>
 <body>
 <section id="full_screen">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3160463">
+<bookmark branch="index" id="bm_id3160463">
   <bookmark_value>full screen view</bookmark_value>
   <bookmark_value>screen; full screen views</bookmark_value>
   <bookmark_value>complete screen view</bookmark_value>
   <bookmark_value>views;full screen</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:FullScreen" id="bm_id2234144" 
localize="false"/>
+<bookmark branch="hid/.uno:FullScreen" id="bm_id2234144" localize="false"/>
 <h1 id="hd_id3160463"><link href="text/shared/01/03110000.xhp">Full 
Screen</link></h1>
-  <paragraph id="par_id3148983" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">Shows or hides the menus and toolbars in Writer or Calc. To exit the 
full screen mode, click the <emph>Full Screen</emph> button or press the 
<emph>Esc</emph> key.</ahelp></paragraph>
+  <paragraph id="par_id3148983" role="paragraph"><ahelp hid=".">Shows or hides 
the menus and toolbars in Writer or Calc. To exit the full screen mode, click 
the <emph>Full Screen</emph> button or press the <emph>Esc</emph> 
key.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000403.xhp#full_screen"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_FULLSCREENTOOLBOX" 
id="bm_id3154673" localize="false"/>
-<paragraph id="par_id3152594" role="paragraph" xml-lang="en-US"><ahelp 
hid="HID_FULLSCREENTOOLBOX">In Writer and Calc, you can also use the shortcut 
keys <switchinline select="sys"><caseinline 
select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline>+<emph>Shift</emph>+<emph>J</emph>
 to switch between the normal and full screen mode.</ahelp></paragraph>
-<paragraph id="par_id3154318" role="note" xml-lang="en-US">You can still use 
shortcut keys in <emph>Full Screen</emph> mode, even though the menus are 
unavailable. <switchinline select="sys"><caseinline select="WIN">To open the 
<emph>View</emph> menu, press 
<emph>Alt</emph>+<emph>V</emph>.</caseinline></switchinline></paragraph>
+<bookmark branch="hid/SFX2_HID_FULLSCREENTOOLBOX" id="bm_id3154673" 
localize="false"/>
+<paragraph id="par_id3152594" role="paragraph"><ahelp 
hid="HID_FULLSCREENTOOLBOX">In Writer and Calc, you can also use the shortcut 
keys <switchinline select="sys"><caseinline 
select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline>+<emph>Shift</emph>+<emph>J</emph>
 to switch between the normal and full screen mode.</ahelp></paragraph>
+<note id="par_id3154318">You can still use shortcut keys in <emph>Full 
Screen</emph> mode, even though the menus are unavailable. <switchinline 
select="sys"><caseinline select="WIN">To open the <emph>View</emph> menu, press 
<emph>Alt</emph>+<emph>V</emph>.</caseinline></switchinline></note>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/04180100.xhp 
b/source/text/shared/01/04180100.xhp
index a23004e952..c57817a3a2 100644
--- a/source/text/shared/01/04180100.xhp
+++ b/source/text/shared/01/04180100.xhp
@@ -20,34 +20,33 @@
 
 <meta>
   <topic id="textshared0104180100xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Data Sources</title>
+    <title id="tit">Data Sources</title>
     <filename>/text/shared/01/04180100.xhp</filename>
   </topic>
 </meta>
 
 <body>
 
-
 <section id="data_sources">
-<bookmark xml-lang="en-US" branch="hid/.uno:DataImport" id="bm_id8802771" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ViewDataSourceBrowser" 
id="bm_id750714" localize="false"/>
+<bookmark branch="hid/.uno:DataImport" id="bm_id8802771" localize="false"/>
+<bookmark branch="hid/.uno:ViewDataSourceBrowser" id="bm_id750714" 
localize="false"/>
 
 <h1 id="hd_id3156053"><link href="text/shared/01/04180100.xhp">Data 
Sources</link></h1>
-<paragraph id="par_id3149495" role="paragraph" xml-lang="en-US"><ahelp 
hid=".">Lists the databases that are registered in <item 
type="productname">%PRODUCTNAME</item> and lets you manage the contents of the 
databases.</ahelp></paragraph>
+<paragraph id="par_id3149495" role="paragraph"><ahelp hid=".">Lists the 
databases that are registered in <item type="productname">%PRODUCTNAME</item> 
and lets you manage the contents of the databases.</ahelp></paragraph>
 </section>
 
 <section id="howtoget">
 <embed href="text/shared/00/00000403.xhp#data_sources"/>
 </section>
 <embed href="text/shared/guide/database_main.xhp#database_main"/>
-<paragraph id="par_id3156136" role="note" xml-lang="en-US">The <emph>Data 
sources</emph> command is only available when a text document or a spreadsheet 
is open.</paragraph>
-<paragraph id="par_id3154823" role="paragraph" xml-lang="en-US">You can insert 
fields from a database into your file or you can create forms to access the 
database.</paragraph>
+<note id="par_id3156136">The <emph>Data sources</emph> command is only 
available when a text document or a spreadsheet is open.</note>
+<paragraph id="par_id3154823" role="paragraph">You can insert fields from a 
database into your file or you can create forms to access the 
database.</paragraph>
 
 <section id="relatedtopics">
-<paragraph id="par_id3156427" role="paragraph" xml-lang="en-US"><link 
href="text/shared/main0212.xhp">Table Data bar</link></paragraph>
+<paragraph id="par_id3156427" role="paragraph"><link 
href="text/shared/main0212.xhp">Table Data bar</link></paragraph>
 <embed href="text/shared/guide/dragdrop_beamer.xhp#dragdrop_beamer"/>
-<paragraph id="par_id3153311" role="paragraph" xml-lang="en-US"><link 
href="text/shared/02/01170000.xhp">Forms</link></paragraph>
+<paragraph id="par_id3153311" role="paragraph"><link 
href="text/shared/02/01170000.xhp">Forms</link></paragraph>
 </section>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>

Reply via email to