From 1c3cb6eb5e055097a40879c7f3481afe5d2e83d7 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Fri, 19 Jun 2020 19:19:27 -0300 Subject: Refactor 3D settings toolbar page Change-Id: Ide0f71114947e5d6910d5b244d718810e1ec6361 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96763 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit 0060857100afbdb8ef9d7c10bf5a26e48cc8d7bc) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96708 Reviewed-by: Adolfo Jayme Barrientos --- source/text/sdraw/01/3dsettings_toolbar.xhp | 193 ++++++++++++++++++++++++++++ source/text/sdraw/main0200.xhp | 9 +- source/text/sdraw/main0210.xhp | 23 ++-- source/text/shared/02/01140000.xhp | 42 +++--- source/text/shared/3dsettings_toolbar.xhp | 73 ----------- source/text/simpress/main0200.xhp | 9 +- source/text/simpress/main0210.xhp | 27 ++-- 7 files changed, 242 insertions(+), 134 deletions(-) create mode 100644 source/text/sdraw/01/3dsettings_toolbar.xhp delete mode 100644 source/text/shared/3dsettings_toolbar.xhp (limited to 'source/text') diff --git a/source/text/sdraw/01/3dsettings_toolbar.xhp b/source/text/sdraw/01/3dsettings_toolbar.xhp new file mode 100644 index 0000000000..ab7d095065 --- /dev/null +++ b/source/text/sdraw/01/3dsettings_toolbar.xhp @@ -0,0 +1,193 @@ + + + + + + + 3D-Settings + /text/sdraw/01/3dsettings_toolbar.xhp + + + +
+

3D-Settings

+ The 3D Settings toolbar controls properties of selected 3D objects. +
+ +

Extrusion On/Off

+ Switches the 3D effects on and off for the selected objects. + + + + + Icon Extrusion On/Off + + + + Extrusion On/Off + + +
+ +

Tilt Down

+ Tilts the selected object downwards by five degrees. + + + + + Icon Tilt Down + + + + Tilt Down + + +
+ +

Tilt Up

+ Tilts the selected object upwards by five degrees. + + + + + Icon Tilt Up + + + + Tilt Up + + +
+ +

Tilt Left

+ Tilts the selected object left by five degrees. + + + + + Icon Tilt Left + + + + Tilt Left + + +
+ +

Tilt Right

+ Tilts the selected object right by five degrees. + + + + + Icon Tilt Right + + + + Tilt Right + + +
+ +

Depth

+ Opens the Extrusion Depth window. + Select an extrusion depth. + + + + + Icon Depth + + + + Depth + + +
+ + +Enter an extrusion depth. + +

Direction

+ Opens the Extrusion Direction window. + + + + + Icon Direction + + + + Direction + + +
+ +Select a direction.UFI: same ID for Direction and Lighting direction +Select a perspective or parallel extrusion method. + +

Lighting

+ Opens the Extrusion Lighting window. + + + + + Icon Lighting + + + + Lighting + + +
+ Select a lighting direction. + Select a lighting intensity. + +

Surface

+ Opens the Extrusion Surface window. + + + + + Icon Surface + + + + Surface + + +
+ Select a surface material or a wireframe display. + +

3D Color

+ Opens the Extrusion Color toolbar. + + + + + Icon Color + + + + Color + + +
+ + diff --git a/source/text/sdraw/main0200.xhp b/source/text/sdraw/main0200.xhp index 06d07c7a2b..3af4d77134 100644 --- a/source/text/sdraw/main0200.xhp +++ b/source/text/sdraw/main0200.xhp @@ -1,6 +1,4 @@ - - - @@ -28,8 +25,8 @@
-Toolbars - +

Toolbars +

This section provides an overview of the toolbars available in $[officename] Draw.
@@ -65,7 +62,7 @@
- +
diff --git a/source/text/sdraw/main0210.xhp b/source/text/sdraw/main0210.xhp index a288bfe762..bd2a51f701 100644 --- a/source/text/sdraw/main0210.xhp +++ b/source/text/sdraw/main0210.xhp @@ -1,6 +1,4 @@ - - - @@ -28,24 +25,24 @@
-Drawing Bar +

Drawing Bar

The Drawing bar holds the main drawing tools.
-Rectangle +

Rectangle

Draws a filled rectangle where you drag in the current document. Click where you want to place a corner of the rectangle, and drag to the size you want. To draw a square, hold down Shift while you drag. -Ellipse +

Ellipse

Draws a filled oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag. -Text +

Text

Draws a text box where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. -Lines and Arrows +

Lines and Arrows

Opens the Arrows toolbar to insert lines and arrows. @@ -61,9 +58,9 @@ -Points +

Points

Enables you to edit points on your drawing. -Glue Points +

Glue Points

Enables you to edit glue points on your drawing. @@ -73,15 +70,15 @@ -From File +

From File

-Form Controls +

Form Controls

-Extrusion On/Off +

Extrusion On/Off

Switches the 3D effects on and off for the selected objects. diff --git a/source/text/shared/02/01140000.xhp b/source/text/shared/02/01140000.xhp index 75f4fe1f49..eb93027a12 100644 --- a/source/text/shared/02/01140000.xhp +++ b/source/text/shared/02/01140000.xhp @@ -46,7 +46,7 @@
-Show Draw Functions +

Show Draw Functions

Click to open or close the Drawing bar, where you can add shapes, lines, text, and callouts to the current document.
@@ -64,8 +64,8 @@
-You can change which buttons are visible in the toolbars. Right-click a toolbar to access the Visible Buttons command. -Selection +You can change which buttons are visible in the toolbars. Right-click a toolbar to access the Visible Buttons command. +

Selection

@@ -77,7 +77,7 @@
-Line +

Line

@@ -88,9 +88,9 @@
-To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select Invisible in the Line Style box on the Drawing Object Properties bar. +To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select Invisible in the Line Style box on the Drawing Object Properties bar. -Rectangle +

Rectangle

@@ -102,7 +102,7 @@
-Ellipse +

Ellipse

@@ -114,7 +114,7 @@
-Polygon +

Polygon

@@ -132,7 +132,7 @@
-Curve +

Curve

@@ -144,7 +144,7 @@
-Freeform Line +

Freeform Line

@@ -156,7 +156,7 @@
-Arc +

Arc

@@ -168,7 +168,7 @@
-Ellipse Pie +

Ellipse Pie

@@ -180,7 +180,7 @@
-Circle Segment +

Circle Segment

@@ -193,7 +193,7 @@
-Text Box +

Text Box

@@ -206,7 +206,7 @@
-Text Animation +

Text Animation

@@ -218,7 +218,7 @@
-Callouts +

Callouts

@@ -241,19 +241,19 @@ -Points +

Points

Enables you to edit points on your drawing. -From File +

From File

-Extrusion On/Off +

Extrusion On/Off

Switches the 3D effects on and off for the selected objects.
-Vertical Callouts +

Vertical Callouts

@@ -267,7 +267,7 @@
-Vertical Text +

Vertical Text

diff --git a/source/text/shared/3dsettings_toolbar.xhp b/source/text/shared/3dsettings_toolbar.xhp deleted file mode 100644 index 795bb3ed51..0000000000 --- a/source/text/shared/3dsettings_toolbar.xhp +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - 3D-Settings - /text/shared/3dsettings_toolbar.xhp - - - -
-3D-Settings - The 3D Settings toolbar controls properties of selected 3D objects. -
- -Extrusion On/Off - Switches the 3D effects on and off for the selected objects. - -Tilt Down - Tilts the selected object downwards by five degrees. - -Tilt Up - Tilts the selected object upwards by five degrees. - -Tilt Left - Tilts the selected object left by five degrees. - -Tilt Right - Tilts the selected object right by five degrees. - -Depth - Opens the Extrusion Depth window. - Select an extrusion depth. - - -Enter an extrusion depth. - -Direction - Opens the Extrusion Direction window. - -Select a direction.UFI: same ID for Direction and Lighting direction -Select a perspective or parallel extrusion method. - -Lighting - Opens the Extrusion Lighting window. - Select a lighting direction. - Select a lighting intensity. - -Surface - Opens the Extrusion Surface window. - Select a surface material or a wireframe display. - -3D Color - Opens the Extrusion Color toolbar. - - diff --git a/source/text/simpress/main0200.xhp b/source/text/simpress/main0200.xhp index b21cd69b61..716cd6aa31 100644 --- a/source/text/simpress/main0200.xhp +++ b/source/text/simpress/main0200.xhp @@ -1,6 +1,4 @@ - - - @@ -28,8 +25,8 @@
-Toolbars - +

Toolbars +

@@ -76,7 +73,7 @@
- +
diff --git a/source/text/simpress/main0210.xhp b/source/text/simpress/main0210.xhp index af29ba7b17..b675d8bce4 100644 --- a/source/text/simpress/main0210.xhp +++ b/source/text/simpress/main0210.xhp @@ -1,6 +1,4 @@ - - - @@ -29,13 +26,13 @@
-Drawing Bar +

Drawing Bar

The Drawing bar contains frequently used editing tools. Click the arrow next to an icon to open a toolbar that contains additional commands.
You can view the Drawing bar also from a text document or spreadsheet. The set of visible icons can be slightly different according to the current document type.
-Select +

Select

To select an object on the current slide, click the Select tool (white arrow) on the Drawing bar, and then click the object. To select more than one object, hold down Shift while you click. To select an object that is behind another object, hold OptionAlt, and then click the object. To select the next underlying object in the stacking, hold OptionAlt, and then click again. To return the selection to the previously selected object, hold down Shift + OptionAlt, and then click. @@ -45,19 +42,19 @@ -Rectangle +

Rectangle

Draws a filled rectangle where you drag in the current document. Click where you want to place a corner of the rectangle, and drag to the size you want. To draw a square, hold down Shift while you drag. -Ellipse +

Ellipse

Draws a filled oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag. -Text +

Text

Draws a text box where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. -Lines and Arrows +

Lines and Arrows

Opens the Arrows toolbar to insert lines and arrows. @@ -73,29 +70,29 @@ -Points +

Points

Enables you to edit points on your drawing. -Glue Points +

Glue Points

Enables you to edit glue points on your drawing. -From File +

From File

-Rotate +

Rotate

This tool is used to rotate the object. -Extrusion On/Off +

Extrusion On/Off

Switches the 3D effects on and off for the selected objects. -Interaction +

Interaction

-- cgit