tdf#155876 UI cmds Calc-View Zoom menu (10)

+ refactoring + WIP wrt Zoom Change-Id: Iaecb1a48fb32312f98376b32763b9dbe72e53814 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/158621 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
author: Olivier Hallot <olivier.hallot@libreoffice.org> 2023-10-29 09:26:28 -0300
committer: Olivier Hallot <olivier.hallot@libreoffice.org> 2023-10-29 13:29:31 +0100
commit: b8d3fdc2402fbb7a2e0ebff6921e310d9a7b74af (patch)
tree: eb572e9b55c7f1426371bac4585de33c4121bb6c /source/text/scalc
parent: 8a7af8662da76f6e65249a263dfa1c85501cad2f (diff)
5 files changed, 46 insertions, 40 deletions
diff --git a/source/text/scalc/00/00000403.xhp b/source/text/scalc/00/00000403.xhp
index c697cce6e8..1d40aded4e 100644
--- a/source/text/scalc/00/00000403.xhp
+++ b/source/text/scalc/00/00000403.xhp
@@ -169,7 +169,25 @@
   <paragraph role="paragraph" id="par_id71698505976996"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + `</keycode></paragraph>
 </section>
 
-<paragraph id="par_id3155383" role="paragraph"><variable id="functionlist">Choose <menuitem>View - Function List</menuitem>.</variable></paragraph>
+<section id="functionlist1">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3155383" role="paragraph"><variable id="functionlist">Choose <menuitem>View - Function List</menuitem>.</variable></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id891698515012167">Choose <menuitem>Insert - Function List</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id691698515563474">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id501698515563475" role="paragraph"><image src="cmd/lc_dbviewfunctions.svg" id="img_id471698515563476" width="1cm"  height="1cm"><alt id="alt_id611698515563477">Icon Functions</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id441698515563479" role="paragraph">Functions</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+  <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+  <paragraph role="paragraph" id="par_id871698515174178">Choose <menuitem>Functions</menuitem>.</paragraph>
+</section>
 
 <section id="splitwindow">
   <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
diff --git a/source/text/scalc/01/04080000.xhp b/source/text/scalc/01/04080000.xhp
index 6f513dc526..88ebbd70aa 100644
--- a/source/text/scalc/01/04080000.xhp
+++ b/source/text/scalc/01/04080000.xhp
@@ -20,48 +20,48 @@
 
 <meta>
   <topic id="textscalc0104080000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Function List</title>
+    <title id="tit">Function List</title>
     <filename>/text/scalc/01/04080000.xhp</filename>
   </topic>
 </meta>
 
 <body>
 
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154126">
+<bookmark branch="index" id="bm_id3154126">
   <bookmark_value>formula list window</bookmark_value>
   <bookmark_value>function list window</bookmark_value>
   <bookmark_value>inserting functions; function list window</bookmark_value>
 </bookmark>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:FunctionBox" id="bm_id998166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/functionpanel/@@nowidget@@" id="bm_id314550752" localize="false"/>
+<bookmark branch="hid/.uno:FunctionBox" id="bm_id998166" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/functionpanel/@@nowidget@@" id="bm_id314550752" localize="false"/>
 
 <h1 id="hd_id3154126"><variable id="function_list_title"><link href="text/scalc/01/04080000.xhp">Function List</link></variable></h1>
-<paragraph id="par_id3151118" role="paragraph" xml-lang="en-US"><variable id="function_list_text"><ahelp hid="HID_SC_FUNCTIONLIST">Opens the Function List deck of the Sidebar, which displays all functions that can be inserted into your document.</ahelp></variable> The <emph>Function List</emph> deck is similar to the <emph>Functions</emph> tab page of the <link href="text/scalc/01/04060000.xhp">Function Wizard</link>. The functions are inserted with placeholders to be replaced with your own values.</paragraph>
+<paragraph id="par_id3151118" role="paragraph"><variable id="function_list_text"><ahelp hid="HID_SC_FUNCTIONLIST">Opens the Function List deck of the Sidebar, which displays all functions that can be inserted into your document.</ahelp></variable> The <emph>Function List</emph> deck is similar to the <emph>Functions</emph> tab page of the <link href="text/scalc/01/04060000.xhp">Function Wizard</link>. The functions are inserted with placeholders to be replaced with your own values.</paragraph>
 
 <section id="howtoget">
-  <embed href="text/scalc/00/00000403.xhp#functionlist"/>
+  <embed href="text/scalc/00/00000403.xhp#functionlist1"/>
 </section>
-<paragraph id="par_id3152576" role="paragraph" xml-lang="en-US">The <emph>Function List</emph> window is a resizable <link href="text/shared/00/00000005.xhp#docking">dockable window</link>. Use it to quickly enter functions in the spreadsheet. By double-clicking an entry in the functions list, the respective function is directly inserted with all parameters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/functionpanel/category" id="bm_id3149960" localize="false"/>
+<paragraph id="par_id3152576" role="paragraph">The <emph>Function List</emph> window is a resizable <link href="text/shared/00/00000005.xhp#docking">dockable window</link>. Use it to quickly enter functions in the spreadsheet. By double-clicking an entry in the functions list, the respective function is directly inserted with all parameters.</paragraph>
+<bookmark branch="hid/modules/scalc/ui/functionpanel/category" id="bm_id3149960" localize="false"/>
 
 <h2 id="hd_id3145799">Category List</h2>
 <embed href="text/scalc/01/04060000.xhp#kategorienliste"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/functionpanel/funclist" id="bm_id3147126" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/functionpanel/funclist" id="bm_id3147126" localize="false"/>
 
 <h2 id="hd_id3153160">Function List</h2>
-<paragraph id="par_id3149412" role="paragraph" xml-lang="en-US"><ahelp hid="modules/scalc/ui/functionpanel/funclist">Displays the available functions.</ahelp> When you select a function, the area below the list box displays a short description. To insert the selected function double-click it or click the <emph>Insert Function into calculation sheet</emph> icon.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/functionpanel/insert" id="bm_id3150752" localize="false"/>
+<paragraph id="par_id3149412" role="paragraph"><ahelp hid="modules/scalc/ui/functionpanel/funclist">Displays the available functions.</ahelp> When you select a function, the area below the list box displays a short description. To insert the selected function double-click it or click the <emph>Insert Function into calculation sheet</emph> icon.</paragraph>
+<bookmark branch="hid/modules/scalc/ui/functionpanel/insert" id="bm_id3150752" localize="false"/>
 
 <h2 id="hd_id3146971">Insert Function into calculation sheet</h2>
 
 <table id="tbl_id3153711">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3150043" role="paragraph" xml-lang="en-US"> <image id="img_id3159267" src="sc/res/fx.png" width="1cm" height="1cm"><alt id="alt_id3159267" xml-lang="en-US">Icon Insert Function</alt></image></paragraph>
+      <paragraph id="par_id3150043" role="paragraph"> <image id="img_id3159267" src="sc/res/fx.png" width="1cm" height="1cm"><alt id="alt_id3159267">Icon Insert Function</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3147345" role="paragraph" xml-lang="en-US"><ahelp hid="modules/scalc/ui/functionpanel/insert">Inserts the selected function into the document.</ahelp></paragraph>
+      <paragraph id="par_id3147345" role="paragraph"><ahelp hid="modules/scalc/ui/functionpanel/insert">Inserts the selected function into the document.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
diff --git a/source/text/scalc/01/07090000.xhp b/source/text/scalc/01/07090000.xhp
index ba8bd0489f..d8e6ce6fa6 100644
--- a/source/text/scalc/01/07090000.xhp
+++ b/source/text/scalc/01/07090000.xhp
@@ -26,8 +26,6 @@
 </meta>
 
 <body>
-
-
 <bookmark branch="hid/.uno:FreezePanes" id="bm_id6343491" localize="false"/>
 <bookmark branch="index" id="bm_id131698514300971">
   <bookmark_value>freeze rows and columns</bookmark_value>
diff --git a/source/text/scalc/01/zoom.xhp b/source/text/scalc/01/zoom.xhp
index be58d10bdf..b70cfd7eb1 100644
--- a/source/text/scalc/01/zoom.xhp
+++ b/source/text/scalc/01/zoom.xhp
@@ -11,40 +11,31 @@
 
 <meta>
     <topic id="textscalc01zoomxhp" indexer="include" status="PUBLISH">
-        <title id="tit" xml-lang="en-US">Zoom</title>
+        <title id="tit" >Zoom</title>
         <filename>/text/scalc/01/zoom.xhp</filename>
     </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id61678279382558">
+<bookmark  branch="index" id="bm_id61678279382558">
     <bookmark_value>Zoom;spreadsheet</bookmark_value>
     <bookmark_value>Zoom in;spreadsheet</bookmark_value>
     <bookmark_value>Zoom out;spreadsheet</bookmark_value>
 </bookmark>
 <section id="ZoomHead">
-    <bookmark id="bm_id191674151617148" xml-lang="en-US" branch="hid/CHANGE ME" localize="false"/>
     <h1 id="hd_id301674151617149"><variable id="h1"><link href="text/scalc/01/zoom.xhp">Zooming In and Out in Calc</link></variable></h1>
-    <paragraph id="par_id841674151617153" role="paragraph" xml-lang="en-US">Zoom allows users to magnify and reduce the screen display. Multiple methods of zooming in and out are available in Calc.</paragraph>
+    <paragraph id="par_id841674151617153" role="paragraph" >Zoom allows users to magnify and reduce the screen display. Multiple methods of zooming in and out are available in Calc.</paragraph>
 </section>
 <section id="howtoget">
-    <paragraph role="paragraph" id="par_id791678229927893">Choose one of the following methods:</paragraph>
-    <list type="unordered">
-        <listitem>
-            <paragraph id="par_id91678230156720"  role="listitem">Choose menu <menuitem>View - Zoom</menuitem>, and select the magnification value in the submenu.</paragraph>
-        </listitem>
-        <listitem>
-            <paragraph id="par_id421678230024566"  role="listitem">Click the plus (or minus) icon on the zoom slider in the status bar. The screen size increases (or decreases) by 10% with each click.</paragraph>
-        </listitem>
-        <listitem>
-            <paragraph id="par_id511678230735657"  role="listitem">Drag the Zoom slider handle to adjust the magnification factor with the mouse.</paragraph>
-        </listitem>
-        <listitem>
-            <paragraph id="par_id461674152484428"  role="listitem">Press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> while rolling the mouse wheel.</paragraph>
-        </listitem>
-    </list>
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph id="par_id91678230156720"  role="paragraph">Choose menu <menuitem>View - Zoom</menuitem>, and select the magnification value in the submenu.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_statusbar"/>
+    <paragraph id="par_id421678230024566"  role="paragraph">Click the plus (or minus) icon on the zoom slider in the status bar. The screen size increases (or decreases) by 10% with each click.</paragraph>
+    <paragraph id="par_id511678230735657"  role="paragraph">Drag the Zoom slider handle to adjust the magnification factor with the mouse.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+    <paragraph id="par_id461674152484428"  role="paragraph">Press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> while rolling the mouse wheel.</paragraph>
 </section>
-    <paragraph role="paragraph" id="par_id71678262942683" xml-lang="en-US">
-        <image src="media/helpimg/scalc/calczoomslider.png" id="img_id721678262942684" width="282px" height="40px"><alt xml-lang="en-US" id="alt_id461678262942685">Calc Zoom Slider</alt></image>
+    <paragraph role="paragraph" id="par_id71678262942683">
+        <image src="media/helpimg/scalc/calczoomslider.png" id="img_id721678262942684" width="282px" height="40px"><alt  id="alt_id461678262942685">Calc Zoom Slider</alt></image>
     </paragraph>
 <note id="par_id41678230455376">20% is the minimum zoom factor. 400% is the maximum.</note>
 <h2 id="hd_id101678230496709">Zooming with the Zoom slider</h2>
@@ -67,7 +58,7 @@
         <paragraph id="par_id991678233902146" localize="false" role="listitem"><menuitem>50%, 75%, 100%, 150%, 200%</menuitem>: predefined zoom factors.</paragraph>
     </listitem>
 </list>
-<embed href="text/shared/01/03010000.xhp#zoom"/>
+<embed href="text/shared/01/03010000.xhp#zoomlayout"/>
 <section id="relatedtopics">
     <embed href="text/scalc/02/10050000.xhp#h1"/>
     <embed href="text/scalc/02/10060000.xhp#h1"/>
diff --git a/source/text/scalc/main0103.xhp b/source/text/scalc/main0103.xhp
index 94be270514..3352b49a37 100644
--- a/source/text/scalc/main0103.xhp
+++ b/source/text/scalc/main0103.xhp
@@ -63,8 +63,7 @@
 <embed href="text/shared/01/04180100.xhp#data_sources"/>
 <embed href="text/shared/01/03110000.xhp#full_screen"/>
 
-<h2 id="hd_id3125863"><link href="text/shared/01/03010000.xhp">Zoom</link></h2>
-<embed href="text/shared/01/03010000.xhp#zoom_text"/>
+<embed href="text/shared/01/ZoomMenu.xhp#zoommenu"/>
 </body>
 
 </helpdocument>
author	Olivier Hallot <olivier.hallot@libreoffice.org>	2023-10-29 09:26:28 -0300
committer	Olivier Hallot <olivier.hallot@libreoffice.org>	2023-10-29 13:29:31 +0100
commit	b8d3fdc2402fbb7a2e0ebff6921e310d9a7b74af (patch)
tree	eb572e9b55c7f1426371bac4585de33c4121bb6c /source/text/scalc
parent	8a7af8662da76f6e65249a263dfa1c85501cad2f (diff)