From 71c24af82c60bcbaf4a02bcdfa7a762bc0e3da92 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Thu, 29 Aug 2024 21:17:23 -0300 Subject: [PATCH] tdf#162607 Remove dup's in hid2file.js, .uno:ZoomPlus/Minus + 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 Tested-by: Jenkins --- AllLangHelp_shared.mk | 3 + AllLangHelp_swriter.mk | 2 - source/text/shared/00/00000403.xhp | 109 +++++++++++++++++---- source/text/shared/01/ZoomMinus.xhp | 32 ++++++ source/text/shared/01/ZoomOptimal.xhp | 2 +- source/text/shared/01/ZoomPanning.xhp | 29 ++++++ source/text/shared/01/ZoomPlus.xhp | 32 ++++++ source/text/simpress/02/10020000.xhp | 136 ++++---------------------- source/text/swriter/02/10010000.xhp | 48 --------- source/text/swriter/02/10020000.xhp | 49 ---------- source/text/swriter/main0210.xhp | 23 +++-- 11 files changed, 219 insertions(+), 246 deletions(-) create mode 100644 source/text/shared/01/ZoomMinus.xhp create mode 100644 source/text/shared/01/ZoomPanning.xhp create mode 100644 source/text/shared/01/ZoomPlus.xhp delete mode 100644 source/text/swriter/02/10010000.xhp delete mode 100644 source/text/swriter/02/10020000.xhp diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 6569d379ca..9c88410460 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -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 \ diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 53e9ac17d7..9233b24a29 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -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 \ diff --git a/source/text/shared/00/00000403.xhp b/source/text/shared/00/00000403.xhp index bfbb5c9c27..d155192751 100644 --- a/source/text/shared/00/00000403.xhp +++ b/source/text/shared/00/00000403.xhp @@ -39,7 +39,8 @@ Choose View - Object Zoom. - +
+
Icon Object Zoom @@ -48,7 +49,8 @@ Object Zoom -
+ +
@@ -73,7 +75,8 @@ Choose View - Zoom Next. - +
+
Icon Zoom Next @@ -82,7 +85,10 @@ Zoom Next -
+ +
+ + CommandCtrl+Period(.).
@@ -90,7 +96,8 @@ Choose View - Zoom Previous. - +
+
Icon Zoom Previous @@ -99,7 +106,11 @@ Zoom Previous -
+ +
+ + Command + Ctrl+Comma(,)
@@ -129,16 +140,18 @@ Choose View - Entire Page. On the View menu of the View tab, choose Entire Page. - - - - Icon Zoom Entire Page - - - Zoom Entire Page - - -
+
+ + + + Icon Zoom Entire Page + + + Zoom Entire Page + + +
+
@@ -147,7 +160,8 @@ Choose View - Page Width. On the View menu of the View tab, choose Page Width. - +
+
Icon Zoom Page Width @@ -156,7 +170,8 @@ Zoom Page Width -
+ +
@@ -165,7 +180,8 @@ Choose View - Optimal View. On the View menu of the View tab, choose Optimal View. - +
+
Icon Zoom Optimal View @@ -174,7 +190,8 @@ Zoom Optimal View -
+ +
@@ -202,6 +219,58 @@
+
+ +
+ + + + Icon Zoom In + + + Zoom In + + +
+
+ + Ctrl + Shift + PgUp +
+ +
+ +
+ + + + Icon Zoom Out + + + Zoom Out + + +
+
+ + Ctrl + Shift + PgDown +
+ +
+ +
+ + + + Icon Shift + + + Shift + + +
+
+
+
diff --git a/source/text/shared/01/ZoomMinus.xhp b/source/text/shared/01/ZoomMinus.xhp new file mode 100644 index 0000000000..eb10dfbfa3 --- /dev/null +++ b/source/text/shared/01/ZoomMinus.xhp @@ -0,0 +1,32 @@ + + + + + + + Zoom Out + /text/shared/01/ZoomMinus.xhp + + + + + + +zoom;zoom out + +
+

Zoom Out

+ Decreases the zoom factor of the current document view. +
+
+ +
+ + diff --git a/source/text/shared/01/ZoomOptimal.xhp b/source/text/shared/01/ZoomOptimal.xhp index 9dae5a8f56..2fa0e012d2 100644 --- a/source/text/shared/01/ZoomOptimal.xhp +++ b/source/text/shared/01/ZoomOptimal.xhp @@ -19,7 +19,7 @@

Optimal

- Resizes the display to include all of the objects on the slidepage. + Resizes the display to include all of the objects on the slidepage.
diff --git a/source/text/shared/01/ZoomPanning.xhp b/source/text/shared/01/ZoomPanning.xhp new file mode 100644 index 0000000000..648f3b2a0c --- /dev/null +++ b/source/text/shared/01/ZoomPanning.xhp @@ -0,0 +1,29 @@ + + + + + + + Zoom Panning + /text/shared/01/ZoomPanning.xhp + + + + + +
+

Shift

+ Moves the slidepage within the %PRODUCTNAME window. Place the pointer on the slidepage, and drag to move the slidepage. When you release the mouse, the last tool you used is selected. +
+
+ +
+ + diff --git a/source/text/shared/01/ZoomPlus.xhp b/source/text/shared/01/ZoomPlus.xhp new file mode 100644 index 0000000000..07fddf9751 --- /dev/null +++ b/source/text/shared/01/ZoomPlus.xhp @@ -0,0 +1,32 @@ + + + + + + + Zoom In + /text/shared/01/ZoomPlus.xhp + + + + + + +zoom;zoom in + +
+

Zoom In

+ Increases the zoom factor of the current document view. +
+
+ +
+ + diff --git a/source/text/simpress/02/10020000.xhp b/source/text/simpress/02/10020000.xhp index bed36d8111..2bf2e0664e 100644 --- a/source/text/simpress/02/10020000.xhp +++ b/source/text/simpress/02/10020000.xhp @@ -65,33 +65,12 @@
- -

Zoom In

-Displays the slide at two times its current size. -You can also select the Zoom In tool and drag a rectangular frame around the area you want to enlarge. - - - - Icon Zoom In - - - Zoom In - - -
- -

Zoom Out

-Displays the slide at half its current size. - - - - Icon Zoom Out - - - Zoom Out - - -
+ + + You can also select the Zoom & Pan tool and drag a rectangular frame around the area you want to enlarge. + + +

Zoom 100%

Displays the slide at its actual size. @@ -106,95 +85,20 @@ -

Previous Zoom

-Returns the display of the slide to the previous zoom factor you applied. You can also press CommandCtrl+Comma(,). - - - - Icon Previous Zoom - - - Previous Zoom - - -
- -

Next Zoom

-Undoes the action of the Previous Zoom command. You can also press CommandCtrl+Period(.). - - - - Icon Next Zoom - - - Next Zoom - - -
- -

Entire Page

-Displays the entire slide on your screen. - - - - Icon Print Preview - - - Entire Page - - -
- -

Page Width

-Displays the complete width of the slide. The top and bottom edges of the slide may not be visible. - - - - Icon Zoom Page Width - - - Page Width - - -
- -

Optimal View

-Resizes the display to include all of the objects on the slide. - - - - Icon Optimal View - - - Optimal View - - -
+ + + + + + + + + + + + + + -

Object Zoom

-Resizes the display to fit the object(s) you selected. - - - - Icon Object Zoom - - - Object Zoom - - -
- -

Shift

-Moves the slide within the $[officename] window. Place the pointer on the slide, and drag to move the slide. When you release the mouse, the last tool you used is selected. - - - - Icon Shift - - - Shift - - -
diff --git a/source/text/swriter/02/10010000.xhp b/source/text/swriter/02/10010000.xhp deleted file mode 100644 index 3e41e50884..0000000000 --- a/source/text/swriter/02/10010000.xhp +++ /dev/null @@ -1,48 +0,0 @@ - - - - - -Zoom In -/text/swriter/02/10010000.xhp - - -Sun Microsystems, Inc. - - - -
- -

Zoom In

- Zooms in to get a close-up view of the document. -
-
- - - - Icon Zoom In - - - Zoom In - - -
-
- - diff --git a/source/text/swriter/02/10020000.xhp b/source/text/swriter/02/10020000.xhp deleted file mode 100644 index 59e5eb66a0..0000000000 --- a/source/text/swriter/02/10020000.xhp +++ /dev/null @@ -1,49 +0,0 @@ - - - - - -Zoom Out -/text/swriter/02/10020000.xhp - - -Sun Microsystems, Inc. - - - -
- -

Zoom Out

-Zooms out to see more of the document at a reduced size. -
-
- - - - -Zoom Out Icon - - -Zoom Out - - -
-
- - diff --git a/source/text/swriter/main0210.xhp b/source/text/swriter/main0210.xhp index 4f2ffe356e..b19c63ddbf 100644 --- a/source/text/swriter/main0210.xhp +++ b/source/text/swriter/main0210.xhp @@ -16,20 +16,19 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - -Print Preview Bar (Writer) +Print Preview Bar (Writer) /text/swriter/main0210.xhp @@ -49,11 +48,15 @@ - - + + + + - - + + + +

Print