Skip to content

Commit

Permalink
tdf#162607 Remove dup's in hid2file.js, .uno:ZoomPlus/Minus
Browse files Browse the repository at this point in the history
+ The .uno:ZoomPlus/Minus are global (shared)
+ Added ZoomPlus, ZoomPanning and ZoomMinus help pages
+ Deleted similar files in swriter/02/
+ Wrapped how-t-get icons in sections for import
+ refactor simpress/main0210.xhp

Change-Id: Ie5d58c0d43dd2d899e4849ec11cc72fae82ca515
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172618
Reviewed-by: Olivier Hallot <[email protected]>
Tested-by: Jenkins
  • Loading branch information
Olivier Hallot committed Aug 30, 2024
1 parent 31c8434 commit 71c24af
Show file tree
Hide file tree
Showing 11 changed files with 219 additions and 246 deletions.
3 changes: 3 additions & 0 deletions AllLangHelp_shared.mk
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/01/ZoomOptimal \
helpcontent2/source/text/shared/01/ZoomPage \
helpcontent2/source/text/shared/01/ZoomPageWidth \
helpcontent2/source/text/shared/01/ZoomPanning \
helpcontent2/source/text/shared/01/ZoomPercent \
helpcontent2/source/text/shared/01/ZoomPrevious \
helpcontent2/source/text/shared/01/ZoomPlus \
helpcontent2/source/text/shared/01/ZoomMinus \
helpcontent2/source/text/shared/02/01110000 \
helpcontent2/source/text/shared/02/01140000 \
helpcontent2/source/text/shared/02/01170000 \
Expand Down
2 changes: 0 additions & 2 deletions AllLangHelp_swriter.mk
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/02/06170000 \
helpcontent2/source/text/swriter/02/08010000 \
helpcontent2/source/text/swriter/02/08080000 \
helpcontent2/source/text/swriter/02/10010000 \
helpcontent2/source/text/swriter/02/10020000 \
helpcontent2/source/text/swriter/02/10030000 \
helpcontent2/source/text/swriter/02/10040000 \
helpcontent2/source/text/swriter/02/10050000 \
Expand Down
109 changes: 89 additions & 20 deletions source/text/shared/00/00000403.xhp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id371698697591986">Choose <menuitem>View - Object Zoom</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id561698695421110">
<section id="sy_zoomobjects">
<table id="tab_id561698695421110">
<tablerow>
<tablecell>
<paragraph id="par_id541698697594924" role="paragraph"><image src="cmd/lc_zoomobjects.svg" id="img_id751698695421112" width="1cm" height="1cm"><alt id="alt_id951698695421113">Icon Object Zoom</alt></image></paragraph>
Expand All @@ -48,7 +49,8 @@
<paragraph id="par_id371698697598467" role="paragraph">Object Zoom</paragraph>
</tablecell>
</tablerow>
</table>
</table>
</section>
</section>
<section id="zoompan">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
Expand All @@ -73,7 +75,8 @@
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id671698696715695">Choose <menuitem>View - Zoom Next</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id701698693506779">
<section id="sy_zoomnext">
<table id="tab_id701698693506779">
<tablerow>
<tablecell>
<paragraph id="par_id121698696719023" role="paragraph"><image src="cmd/lc_zoomnext.svg" id="img_id531698696506781" width="1cm" height="1cm"><alt id="alt_id521698636506782">Icon Zoom Next</alt></image></paragraph>
Expand All @@ -82,15 +85,19 @@
<paragraph id="par_id971698696722215" role="paragraph">Zoom Next</paragraph>
</tablecell>
</tablerow>
</table>
</table>
</section>
<embed href="text/shared/00/00000004.xhp#from_keyboard"/>
<paragraph role="paragraph" id="par_id21724973608563"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Period(.)</keycode>.</paragraph>
</section>
<section id="zoomprevious">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
<paragraph role="paragraph" id="par_id151698696267671">Choose <menuitem>View - Zoom - Zoom Previous</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_tabUI"/>
<paragraph role="paragraph" id="par_id461698696330337">Choose <menuitem>View - Zoom Previous</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id701698696506779">
<section id="sy_zoomprevious">
<table id="tab_id701698696506779">
<tablerow>
<tablecell>
<paragraph id="par_id491698696506780" role="paragraph"><image src="cmd/lc_zoomprevious.svg" id="img_id531698696506781" width="1cm" height="1cm"><alt id="alt_id521698696506782">Icon Zoom Previous</alt></image></paragraph>
Expand All @@ -99,7 +106,11 @@
<paragraph id="par_id801698696506784" role="paragraph">Zoom Previous</paragraph>
</tablecell>
</tablerow>
</table>
</table>
</section>
<embed href="text/shared/00/00000004.xhp#from_keyboard"/>
<paragraph role="paragraph" id="par_id331724973574174"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline>
<defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Comma(,)</keycode></paragraph>
</section>
<section id="zoompercent">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
Expand Down Expand Up @@ -129,16 +140,18 @@
<paragraph role="paragraph" id="par_id171698576339513">Choose <menuitem>View - Entire Page</menuitem>.</paragraph>
<paragraph role="paragraph" id="par_id151698576342561">On the <menuitem>View</menuitem> menu of the <menuitem>View</menuitem> tab, choose <menuitem>Entire Page</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id461698576212361">
<tablerow>
<tablecell>
<paragraph id="par_id421698576212362" role="paragraph"><image src="cmd/lc_zoompage.svg" id="img_id291698576212363" width="1cm" height="1cm"><alt id="alt_id811698576212364">Icon Zoom Entire Page</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id731698576212366" role="paragraph">Zoom Entire Page</paragraph>
</tablecell>
</tablerow>
</table>
<section id="sy_zoompage">
<table id="tab_id461698576212361">
<tablerow>
<tablecell>
<paragraph id="par_id421698576212362" role="paragraph"><image src="cmd/lc_zoompage.svg" id="img_id291698576212363" width="1cm" height="1cm"><alt id="alt_id811698576212364">Icon Zoom Entire Page</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph id="par_id731698576212366" role="paragraph">Zoom Entire Page</paragraph>
</tablecell>
</tablerow>
</table>
</section>
</section>
<section id="zoompagewidth">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
Expand All @@ -147,7 +160,8 @@
<paragraph role="paragraph" id="par_id181698574399639">Choose <menuitem>View - Page Width</menuitem>.</paragraph>
<paragraph role="paragraph" id="par_id651698574392407">On the <menuitem>View</menuitem> menu of the <menuitem>View</menuitem> tab, choose <menuitem>Page Width</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id71698576378191">
<section id="sy_zoompagewidth">
<table id="tab_id71698576378191">
<tablerow>
<tablecell>
<paragraph id="par_id541698576378192" role="paragraph"><image src="cmd/lc_zoompagewidth.svg" id="img_id821698576378193" width="1cm" height="1cm"><alt id="alt_id651698576378194">Icon Zoom Page Width</alt></image></paragraph>
Expand All @@ -156,7 +170,8 @@
<paragraph id="par_id491698576378196" role="paragraph">Zoom Page Width</paragraph>
</tablecell>
</tablerow>
</table>
</table>
</section>
</section>
<section id="zoomoptimal">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
Expand All @@ -165,7 +180,8 @@
<paragraph role="paragraph" id="par_id821698576433755">Choose <menuitem>View - Optimal View</menuitem>.</paragraph>
<paragraph role="paragraph" id="par_id671698576437451">On the <menuitem>View</menuitem> menu of the <menuitem>View</menuitem> tab, choose <menuitem>Optimal View</menuitem>.</paragraph>
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<table id="tab_id1001698576491026">
<section id="sy_zoomoptimal">
<table id="tab_id1001698576491026">
<tablerow>
<tablecell>
<paragraph id="par_id141698576491027" role="paragraph"><image src="cmd/lc_zoomoptimal.svg" id="img_id981698576491028" width="1cm" height="1cm"><alt id="alt_id951698576491029">Icon Zoom Optimal View</alt></image></paragraph>
Expand All @@ -174,7 +190,8 @@
<paragraph id="par_id661698576491031" role="paragraph">Zoom Optimal View</paragraph>
</tablecell>
</tablerow>
</table>
</table>
</section>
</section>
<section id="zoomviewlayout">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
Expand Down Expand Up @@ -202,6 +219,58 @@
</tablerow>
</table>
</section>
<section id="zoomplus">
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<section id="sy_zoomin">
<table id="tbl_id3150744">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145590"><image id="img_id3145596" src="cmd/lc_zoomin.svg" width="1cm" height="1cm"><alt id="alt_id3145596">Icon Zoom In</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3154505">Zoom In</paragraph>
</tablecell>
</tablerow>
</table>
</section>
<embed href="text/shared/00/00000004.xhp#from_keyboard"/>
<paragraph role="paragraph" id="par_id231724966747215" localize="false"><keycode>Ctrl + Shift + PgUp</keycode></paragraph>
</section>

<section id="zoomminus">
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<section id="sy_zoomout">
<table id="tbl_id3149882">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145247"><image id="img_id3145355" src="cmd/lc_zoomout.svg" width="1cm" height="1cm"><alt id="alt_id3145355">Icon Zoom Out</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3150565">Zoom Out</paragraph>
</tablecell>
</tablerow>
</table>
</section>
<embed href="text/shared/00/00000004.xhp#from_keyboard"/>
<paragraph role="paragraph" id="par_id211724967653346" localize="false"><keycode>Ctrl + Shift + PgDown</keycode></paragraph>
</section>

<section id="zoompanning">
<embed href="text/shared/00/00000004.xhp#from_toolbars"/>
<section id="sy_zoompanning">
<table id="tbl_id3149819">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3151253"><image id="img_id3151259" src="cmd/lc_zoompanning.svg" width="1cm" height="1cm"><alt id="alt_id3151259">Icon Shift</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3156354">Shift</paragraph>
</tablecell>
</tablerow>
</table>
</section>
</section>


<section id="viewtoolbars">
<embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
Expand Down
32 changes: 32 additions & 0 deletions source/text/shared/01/ZoomMinus.xhp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->

<meta>
<topic id="textshared01ZoomMinusxhp" indexer="include" status="PUBLISH">
<title id="tit">Zoom Out</title>
<filename>/text/shared/01/ZoomMinus.xhp</filename>
</topic>
</meta>
<body>

<bookmark branch="hid/.uno:ZoomMinus" id="bm_id1487383" localize="false"/>
<bookmark branch="index" id="bm_id481724969909101">
<bookmark_value>zoom;zoom out</bookmark_value>
</bookmark>
<section id="zoomminus">
<h1 id="hd_id681724964305745"><variable id="h1"><link href="text/shared/01/ZoomMinus.xhp">Zoom Out</link></variable></h1>
<paragraph id="par_id81724964305748" role="paragraph">Decreases the zoom factor of the current document view.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#zoomminus"/>
</section>
</body>
</helpdocument>
2 changes: 1 addition & 1 deletion source/text/shared/01/ZoomOptimal.xhp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<bookmark branch="hid/.uno:ZoomOptimal" id="bm_id651698535231512" localize="false"/>
<section id="zoomoptimal">
<h1 id="hd_id431698535281191"><variable id="h1"><link href="text/shared/01/ZoomOptimal.xhp">Optimal</link></variable></h1>
<paragraph id="par_id951698535281193" role="paragraph">Resizes the display to include all of the objects on the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</paragraph>
<paragraph id="par_id951698535281193" role="paragraph">Resizes the display to include all of the objects on the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#zoomoptimal"/>
Expand Down
29 changes: 29 additions & 0 deletions source/text/shared/01/ZoomPanning.xhp
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->

<meta>
<topic id="textshared01ZoomPanningxhp" indexer="include" status="PUBLISH">
<title id="tit">Zoom Panning</title>
<filename>/text/shared/01/ZoomPanning.xhp</filename>
</topic>
</meta>

<body>
<bookmark branch="hid/.uno:ZoomPanning" id="bm_id3625141" localize="false"/>
<section id="zoompanning">
<h1 id="hd_id791724972773405"><variable id="h1"><link href="text/shared/01/ZoomPanning.xhp">Shift</link></variable></h1>
<paragraph id="par_id391724972773409" role="paragraph">Moves the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline> within the %PRODUCTNAME window. Place the pointer on the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>, and drag to move the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>. When you release the mouse, the last tool you used is selected.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#zoompanning"/>
</section>
</body>
</helpdocument>
32 changes: 32 additions & 0 deletions source/text/shared/01/ZoomPlus.xhp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->

<meta>
<topic id="textshared01ZoomPlusxhp" indexer="include" status="PUBLISH">
<title id="tit">Zoom In</title>
<filename>/text/shared/01/ZoomPlus.xhp</filename>
</topic>
</meta>
<body>

<bookmark branch="hid/.uno:ZoomPlus" id="bm_id1487383" localize="false"/>
<bookmark branch="index" id="bm_id481724969909101">
<bookmark_value>zoom;zoom in</bookmark_value>
</bookmark>
<section id="zoomplus">
<h1 id="hd_id681724964305745"><variable id="h1"><link href="text/shared/01/ZoomPlus.xhp">Zoom In</link></variable></h1>
<paragraph id="par_id81724964305748" role="paragraph">Increases the zoom factor of the current document view.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#zoomplus"/>
</section>
</body>
</helpdocument>
Loading

0 comments on commit 71c24af

Please sign in to comment.