From b8d3fdc2402fbb7a2e0ebff6921e310d9a7b74af Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Sun, 29 Oct 2023 09:26:28 -0300 Subject: 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 --- source/text/scalc/00/00000403.xhp | 20 +++++- source/text/scalc/01/04080000.xhp | 26 ++++---- source/text/scalc/01/07090000.xhp | 2 - source/text/scalc/01/zoom.xhp | 35 ++++------ source/text/scalc/main0103.xhp | 3 +- source/text/shared/00/00000403.xhp | 89 ++++++++++++++++++++++++-- source/text/shared/01/03010000.xhp | 110 +++++++++++++++++--------------- source/text/shared/01/ZoomMenu.xhp | 38 +++++++++++ source/text/shared/01/ZoomOptimal.xhp | 29 +++++++++ source/text/shared/01/ZoomPage.xhp | 28 ++++++++ source/text/shared/01/ZoomPageWidth.xhp | 30 +++++++++ source/text/shared/01/ZoomPercent.xhp | 33 ++++++++++ source/text/simpress/02/10020000.xhp | 100 ++++++++++++++--------------- source/text/smath/01/03060000.xhp | 11 ++-- 14 files changed, 398 insertions(+), 156 deletions(-) create mode 100644 source/text/shared/01/ZoomMenu.xhp create mode 100644 source/text/shared/01/ZoomOptimal.xhp create mode 100644 source/text/shared/01/ZoomPage.xhp create mode 100644 source/text/shared/01/ZoomPageWidth.xhp create mode 100644 source/text/shared/01/ZoomPercent.xhp (limited to 'source/text') 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 @@ CommandCtrl + ` -Choose View - Function List. +
+ + Choose View - Function List. + + Choose Insert - Function List + + + + + Icon Functions + + + Functions + + +
+ + Choose Functions. +
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 @@ - Function List + Function List /text/scalc/01/04080000.xhp - + formula list window function list window inserting functions; function list window - - + +

Function List

-Opens the Function List deck of the Sidebar, which displays all functions that can be inserted into your document. The Function List deck is similar to the Functions tab page of the Function Wizard. The functions are inserted with placeholders to be replaced with your own values. +Opens the Function List deck of the Sidebar, which displays all functions that can be inserted into your document. The Function List deck is similar to the Functions tab page of the Function Wizard. The functions are inserted with placeholders to be replaced with your own values.
- +
-The Function List window is a resizable dockable window. 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. - +The Function List window is a resizable dockable window. 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. +

Category List

- +

Function List

-Displays the available functions. 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 Insert Function into calculation sheet icon. - +Displays the available functions. 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 Insert Function into calculation sheet icon. +

Insert Function into calculation sheet

- Icon Insert Function + Icon Insert Function - Inserts the selected function into the document. + Inserts the selected function into the document.
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 @@ - - freeze rows and columns 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 @@ - Zoom + Zoom /text/scalc/01/zoom.xhp - + Zoom;spreadsheet Zoom in;spreadsheet Zoom out;spreadsheet
-

Zooming In and Out in Calc

- Zoom allows users to magnify and reduce the screen display. Multiple methods of zooming in and out are available in Calc. + Zoom allows users to magnify and reduce the screen display. Multiple methods of zooming in and out are available in Calc.
- Choose one of the following methods: - - - Choose menu View - Zoom, and select the magnification value in the submenu. - - - 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. - - - Drag the Zoom slider handle to adjust the magnification factor with the mouse. - - - Press CommandCtrl while rolling the mouse wheel. - - + + Choose menu View - Zoom, and select the magnification value in the submenu. + + 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. + Drag the Zoom slider handle to adjust the magnification factor with the mouse. + + Press CommandCtrl while rolling the mouse wheel.
- - Calc Zoom Slider + + Calc Zoom Slider 20% is the minimum zoom factor. 400% is the maximum.

Zooming with the Zoom slider

@@ -67,7 +58,7 @@ 50%, 75%, 100%, 150%, 200%: predefined zoom factors. - +
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 @@ -

Zoom

- + diff --git a/source/text/shared/00/00000403.xhp b/source/text/shared/00/00000403.xhp index f5b8dad1f4..dbcb3636c9 100644 --- a/source/text/shared/00/00000403.xhp +++ b/source/text/shared/00/00000403.xhp @@ -29,9 +29,89 @@

View Menu

-
+
- Choose View - Zoom. + Choose View - Zoom. +
+ +
+ + Choose View - Zoom - 50%. + Choose View - Zoom - 75%. + Choose View - Zoom - 100%. + Choose View - Zoom - 150%. + Choose View - Zoom - 200%. + + Choose View - 100%. + + + + + Icon Zoom 100% + + + Zoom 100% + + +
+
+
+ + Choose View - Zoom - Entire Page. + + Choose View - Entire Page. + On the View menu of the View tab, choose Entire Page. + + + + + Icon Zoom Entire Page + + + Zoom Entire Page + + +
+
+
+ + Choose View - Zoom - Page Width. + + Choose View - Page Width. + On the View menu of the View tab, choose Page Width. + + + + + Icon Zoom Page Width + + + Zoom Page Width + + +
+
+
+ + Choose View - Zoom - Optimal View. + + Choose View - Optimal View. + On the View menu of the View tab, choose Optimal View. + + + + + Icon Zoom Optimal View + + + Zoom Optimal View + + +
+
+
+ + Choose View - Zoom - Zoom. @@ -54,11 +134,6 @@ - - CommandCtrl + mouse wheel - Zoom also with (+) (-) (×) and (÷) on the number keypad.Zoom also with (+) (-) (×) and (÷) on the number keypad. - - Click or right-click the zoom factor displayed on the Zoom Slider.
diff --git a/source/text/shared/01/03010000.xhp b/source/text/shared/01/03010000.xhp index fbc253503b..655604a405 100644 --- a/source/text/shared/01/03010000.xhp +++ b/source/text/shared/01/03010000.xhp @@ -20,85 +20,91 @@ - Zoom & View Layout + Zoom & View Layout /text/shared/01/03010000.xhp - -
- + zooming;page views views; scaling screen; scaling pages; scaling mw deleted "scaling;" - - - - -

Zoom & View Layout

-Reduces or enlarges the screen display of %PRODUCTNAME. The current zoom factor is displayed as a percentage value in the Zoom Slider on the Status bar. + + + + + +
+

Zoom & View Layout

+Opens the Zoom & View Layout dialog to let you set the zoom factor to display the current document. You can also choose the view layout of the document.
+ +The current zoom factor is displayed as a percentage value in the Zoom Slider on the Status bar. +
- +
-Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the Status bar, and select the zoom factor that you want. +Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the Status bar, and select the zoom factor that you want. -

Zoom factor

-Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter. - - +

Zoom factor

+Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter. + + -

Optimal

-Resizes the display to fit the width of the selected cell area at the moment the command is started.Resizes the display to fit the width of the text in the document at the moment the command is started. - - +

Optimal

+Resizes the display to fit the width of the selected cell area at the moment the command is started.Resizes the display to fit the width of the text in the document at the moment the command is started. + + -

Fit width and height

-Resizes the display to fit the width and height of the selected cell area at the moment the command is started.Displays the entire page on your screen. - - +

Fit width and height

+Resizes the display to fit the width and height of the selected cell area at the moment the command is started.Displays the entire page on your screen. + + -

Fit width

-Displays the complete width of the document page. The top and bottom edges of the page may not be visible. +

Fit width

+Displays the complete width of the document page. The top and bottom edges of the page may not be visible.
- - - + + -

100 %

-Displays the document at its actual size. +

100 %

+ Displays the document at its actual size.
- - + +

Custom

Enter the zoom factor at which you want to display the document. Enter a percentage in the box. -

View layout

-For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.for this doc or all docs? answer: it's the same as before for the zoom factor. - - -

Automatic

-The automatic view layout displays pages side by side, as many as the zoom factor allows. - - -

Single page

-The single page view layout displays pages beneath each other, but never side by side. - - - -

Columns

-In columns view layout you see pages in a given number of columns side by side. Enter the number of columns. - - -

Book mode

-In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number. + + +

View layout

+ For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.for this doc or all docs? answer: it's the same as before for the zoom factor. + + +

Automatic

+ The automatic view layout displays pages side by side, as many as the zoom factor allows. + + +

Single page

+ The single page view layout displays pages beneath each other, but never side by side. + + + +

Columns

+ In columns view layout you see pages in a given number of columns side by side. Enter the number of columns. + + +

Book mode

+ In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number. +
+
diff --git a/source/text/shared/01/ZoomMenu.xhp b/source/text/shared/01/ZoomMenu.xhp new file mode 100644 index 0000000000..cf20dfd82e --- /dev/null +++ b/source/text/shared/01/ZoomMenu.xhp @@ -0,0 +1,38 @@ + + + + + + + Zoom Menu + /text/shared/01/ZoomMenu.xhp + + + + + +
+

Zoom

+ Opens a submenu with several zoom factors and commands. +
+
+ +
+ + + + + + +
+ +
+ +
diff --git a/source/text/shared/01/ZoomOptimal.xhp b/source/text/shared/01/ZoomOptimal.xhp new file mode 100644 index 0000000000..66c3a09708 --- /dev/null +++ b/source/text/shared/01/ZoomOptimal.xhp @@ -0,0 +1,29 @@ + + + + + + + Zoom Optimal + /text/shared/01/ZoomOptimal.xhp + + + + + +
+

Zoom Optimal

+ Resizes the display to include all of the objects on the slidepage. +
+
+ +
+ +
diff --git a/source/text/shared/01/ZoomPage.xhp b/source/text/shared/01/ZoomPage.xhp new file mode 100644 index 0000000000..025de172e3 --- /dev/null +++ b/source/text/shared/01/ZoomPage.xhp @@ -0,0 +1,28 @@ + + + + + + + Zoom to Entire Page + /text/shared/01/ZoomPage.xhp + + + + +
+

Entire Page

+ Displays the entire slidepage on your screen. +
+
+ +
+ +
diff --git a/source/text/shared/01/ZoomPageWidth.xhp b/source/text/shared/01/ZoomPageWidth.xhp new file mode 100644 index 0000000000..b660138951 --- /dev/null +++ b/source/text/shared/01/ZoomPageWidth.xhp @@ -0,0 +1,30 @@ + + + + + + + Zoom to Page Width + /text/shared/01/ZoomPageWidth.xhp + + + + +
+

Page Width

+ Displays the complete width of the + slidepage. The top and bottom edges of the + slidepage may not be visible. +
+
+ +
+ +
diff --git a/source/text/shared/01/ZoomPercent.xhp b/source/text/shared/01/ZoomPercent.xhp new file mode 100644 index 0000000000..ea5b115c04 --- /dev/null +++ b/source/text/shared/01/ZoomPercent.xhp @@ -0,0 +1,33 @@ + + + + + + + Zoom Percent Factors + /text/shared/01/ZoomPercent.xhp + + + + + + + + +
+

Zoom Percent Factors

+ Zoom at specified zoom factors. +
+
+ +
+ + +
diff --git a/source/text/simpress/02/10020000.xhp b/source/text/simpress/02/10020000.xhp index d2ae8097f0..55a477bba6 100644 --- a/source/text/simpress/02/10020000.xhp +++ b/source/text/simpress/02/10020000.xhp @@ -21,7 +21,7 @@ - Zoom + Zoom /text/simpress/02/10020000.xhp @@ -30,25 +30,25 @@
-increasing sizes of views +increasing sizes of views views; display sizes decreasing sizes of views zooming; in presentations views; shift function hand icon for moving slides - +

Zoom

-Reduces or enlarges the screen display of the current document. Click the arrow next to the icon to open the Zoom toolbar. +Reduces or enlarges the screen display of the current document. Click the arrow next to the icon to open the Zoom toolbar.
- Icon Zoom + Icon Zoom - Zoom + Zoom
@@ -57,144 +57,144 @@ - Icon Zoom ($[officename] Impress in Outline and Slide View) + Icon Zoom ($[officename] Impress in Outline and Slide View) - Zoom ($[officename] Impress in Outline and Slide View) + Zoom ($[officename] Impress in Outline and Slide View)
- +

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. +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 + Icon Zoom In - Zoom In + Zoom In
- +

Zoom Out

-Displays the slide at half its current size. +Displays the slide at half its current size. - Icon Zoom Out + Icon Zoom Out - Zoom Out + Zoom Out
- +

Zoom 100%

-Displays the slide at its actual size. +Displays the slide at its actual size. - Icon Zoom 100% + Icon Zoom 100% - Zoom 100% + Zoom 100%
- +

Previous Zoom

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

Next Zoom

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

Entire Page

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

Page Width

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

Optimal View

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

Object Zoom

-Resizes the display to fit the object(s) you selected. +Resizes the display to fit the object(s) you selected. - Icon Object Zoom + Icon Object Zoom - 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. +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 + Icon Shift - Shift + Shift
- \ No newline at end of file + diff --git a/source/text/smath/01/03060000.xhp b/source/text/smath/01/03060000.xhp index 54dae5f3e6..e276d01856 100644 --- a/source/text/smath/01/03060000.xhp +++ b/source/text/smath/01/03060000.xhp @@ -1,6 +1,4 @@ - - - -Show All +Show All /text/smath/01/03060000.xhp
-views; maximum size +views; maximum size maximum formula size formulas; maximum size - +

Show All

-Displays the entire formula in the maximum size possible so that all elements are included. The formula is reduced or enlarged so that all formula elements can be displayed in the work area. The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the context menu. The context menu in the work area also contains zoom commands. The zoom commands and icons are only available in Math documents, not for embedded Math objects. +Displays the entire formula in the maximum size possible so that all elements are included. The formula is reduced or enlarged so that all formula elements can be displayed in the work area. The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the context menu. The context menu in the work area also contains zoom commands. The zoom commands and icons are only available in Math documents, not for embedded Math objects.
-- cgit