From 710fc9b9337d8cdfb71a0b8ec09f7eac111d1128 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Fri, 19 Jun 2020 01:52:11 -0300 Subject: tdf#131825 3D Effects help pages * Rescued 3 buttons from OO.org 1.1.5 * add icons here and there * deleted extra page in IMPRESS * entry "3dEffects" in Index * entry in Contents Change-Id: Ia35000392d928750ebd95c64426ba1d1fa11f099 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96673 Tested-by: Jenkins Reviewed-by: Olivier Hallot (cherry picked from commit e9659fc582ebe6cd1bab8dbe405977d977b4c50a) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96702 Reviewed-by: Adolfo Jayme Barrientos --- AllLangHelp_simpress.mk | 1 - source/auxiliary/sdraw.tree | 1 + source/text/shared/00/00000010.xhp | 29 ++++---- source/text/shared/00/00000406.xhp | 2 +- source/text/shared/01/05350000.xhp | 91 +++++++++++++++++++++-- source/text/shared/01/05350200.xhp | 101 +++++++++++++------------ source/text/shared/01/05350300.xhp | 39 ++++++---- source/text/shared/01/05350400.xhp | 50 ++++++++----- source/text/shared/01/05350500.xhp | 139 +++++++++++++++++++---------------- source/text/shared/01/05350600.xhp | 38 ++++++---- source/text/shared/main0201.xhp | 26 +++---- source/text/simpress/02/10130000.xhp | 46 ------------ 12 files changed, 317 insertions(+), 246 deletions(-) delete mode 100644 source/text/simpress/02/10130000.xhp diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk index fd781c4c49..9f878a3560 100644 --- a/AllLangHelp_simpress.mk +++ b/AllLangHelp_simpress.mk @@ -135,7 +135,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\ helpcontent2/source/text/simpress/02/10100000 \ helpcontent2/source/text/simpress/02/10110000 \ helpcontent2/source/text/simpress/02/10120000 \ - helpcontent2/source/text/simpress/02/10130000 \ helpcontent2/source/text/simpress/02/11060000 \ helpcontent2/source/text/simpress/02/11070000 \ helpcontent2/source/text/simpress/02/11080000 \ diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree index 3eaea6e9aa..94e1130f27 100644 --- a/source/auxiliary/sdraw.tree +++ b/source/auxiliary/sdraw.tree @@ -62,6 +62,7 @@ Cross-Fading Two Objects + 3D Effects Combining Objects and Constructing Shapes diff --git a/source/text/shared/00/00000010.xhp b/source/text/shared/00/00000010.xhp index b62efc8c4a..28854b9730 100644 --- a/source/text/shared/00/00000010.xhp +++ b/source/text/shared/00/00000010.xhp @@ -1,6 +1,4 @@ - - - @@ -30,12 +27,16 @@ + + 3D Effects + +
- + -3D Effects -Specifies the properties of 3D object(s) in the current document. +

3D Effects

+Specifies the properties of 3D object(s) in the current document or converts a 2D object to 3D.
@@ -45,5 +46,83 @@ +
+ +

Apply

+Click here to apply the properties shown in the dialog to the selected object. + + + + + Apply icon + + + + Apply + + +
+ +

Update

+Click here to view in the dialog all the properties of the selected object. + + + + + Update Icon + + + + Update + + +
+ + +

Convert to 3-D

+Use this icon to convert a selected 2D object to a 3D object. You can also select several 2D objects and convert them to one single 3D object. To convert a group of 2D objects to 3D, you must first ungroup the selected objects. + + + + + Icon Convert to 3-D + + + + Convert to 3-D + + +
+ +

Convert to Rotation Object

+Click here to convert a selected 2D object to a 3D rotation object. You can also select several 2D objects and convert them to one single 3D rotation object. To convert a group of 2D objects to 3D, you must first ungroup the selected objects. + + + + + + Icon Convert to Rotation Object + + + + Convert to Rotation Object + + +
+

Perspective On/Off

+Click here to turn the perspective view on or off. + + + + + Icon Perspective On/Off + + + + Perspective On/Off + + +
+
diff --git a/source/text/shared/01/05350200.xhp b/source/text/shared/01/05350200.xhp index 9280de54ce..cb0a3e33cc 100644 --- a/source/text/shared/01/05350200.xhp +++ b/source/text/shared/01/05350200.xhp @@ -1,7 +1,4 @@ - - - - - - + Geometry @@ -30,113 +25,125 @@
-Geometry +

Geometry

Adjusts the shape of the selected 3D object. You can only modify the shape of a 3D object that was created by converting a 2D object. To convert a 2D object to 3D, select the object, right-click, and then choose Convert - To 3D, or Convert - To 3D Rotation Object. + + + + + Geometry Icon + + + + Geometry + + +
-Geometry +

Geometry

Define the shape properties for the selected 3D object. -Rounded edges +

Rounded edges

Enter the amount by which you want to round the corners of the selected 3D object. -Scaled depth +

Scaled depth

Enter the amount by which to increase or decrease the area of the front side of the selected 3D object. -Rotation angle +

Rotation angle

Enter the angle in degrees to rotate the selected 3D rotation object. -Depth +

Depth

Enter the extrusion depth for the selected 3D object. This option is not valid for 3D rotation objects. -Segments +

Segments

You can change the number of segments that are used to draw a 3D rotation object. -Horizontal +

Horizontal

Enter the number of horizontal segments to use in the selected 3D rotation object. -Vertical +

Vertical

Enter the number of vertical segments to use in the selected 3D rotation object -Normals +

Normals

Allows you to modify the rendering style of the 3D surface. -Object-Specific +

Object-Specific

Renders the 3D surface according to the shape of the object. For example, a circular shape is rendered with a spherical surface. - - -Icon - + + +Icon + - + Object-Specific
-Flat +

Flat

Renders the 3D surface as polygons. - + -Icon - +Icon + - + Flat
-Spherical +

Spherical

Renders a smooth 3D surface. - + -Icon - +Icon + - + Spherical
-Invert Normals +

Invert Normals

Inverts the light source. - + -Icon - +Icon + - + Invert Normals
-Double-sided Illumination +

Double-sided Illumination

Lights the object from the outside and the inside. To use an ambient light source, click this button, and then click the Invert Normals button. - + -Icon - +Icon + - + Double-sided illumination
-Double-Sided +

Double-Sided

Closes the shape of a 3D object that was created by extruding a freeform line (Convert - To 3D). - + -Icon - +Icon - + Double-Sided
+
diff --git a/source/text/shared/01/05350300.xhp b/source/text/shared/01/05350300.xhp index 85c948e0d0..75be4bb01e 100644 --- a/source/text/shared/01/05350300.xhp +++ b/source/text/shared/01/05350300.xhp @@ -1,6 +1,4 @@ - - - @@ -32,43 +29,55 @@
-Shading +

Shading

Sets the shading and shadow options for the selected 3D object. + + + + + Icon Shading + + + + Shading + + +
-Shading +

Shading

Specify the type of shading to apply to the selected 3D object. -Mode +

Mode

Select the shading method that you want to use. Flat shading assigns a single color to a single polygon on the surface of the object. Gouraud shading blends colors across the polygons. Phong shading averages the color of each pixel based on the pixels that surround it, and requires the most processing power. -Shadow +

Shadow

Adds or removes a shadow from the selected 3D object. - + -Icon - +Icon - + 3D Shadowing On/Off
-Surface angle +

Surface angle

Enter an angle from 0 to 90 degrees for casting the shadow. -Camera +

Camera

Set the camera options for the selected 3D object. -Distance +

Distance

Enter the distance to leave between the camera and the center of the selected object. -Focal length +

Focal length

Enter the focal length of the camera, where a small value corresponds to a "fisheye" lens, and a large value to a telephoto lens. +
diff --git a/source/text/shared/01/05350400.xhp b/source/text/shared/01/05350400.xhp index 579d59519c..fa6a985492 100644 --- a/source/text/shared/01/05350400.xhp +++ b/source/text/shared/01/05350400.xhp @@ -1,6 +1,4 @@ - - - @@ -32,13 +29,25 @@
-Illumination +

Illumination

Define the light source for the selected 3D object. + + + + + Icon Illumination + + + + Illumination + + +
-Illumination +

Illumination

Specify the light source for the object, as well as the color of the light source and of the ambient light. You can define up to eight different light sources. @@ -48,16 +57,16 @@ -Light source +

Light source

Click twice to turn the light source on, and then select a color for the light from the list. If you want, you can also set the color of the surrounding light, by selecting a color from the Ambient light box. You can also press the Spacebar to turn the light source on or off. - + -Icon - +Icon Light is on + - + Light is on @@ -65,33 +74,34 @@
- + -Icon - +Icon Light is off + - + Light is off
-Color Selection +

Color Selection

Select a color for the current light source. -Select Color in the color dialog +

Select Color in the color dialog

-Ambient light +

Ambient light

-Color Selection +

Color Selection

Select a color for the ambient light. -Select Color Through the Color Dialog +

Select Color Through the Color Dialog

-Preview +

Preview

Displays a preview of the light source changes. +
diff --git a/source/text/shared/01/05350500.xhp b/source/text/shared/01/05350500.xhp index 93e3e7faa1..c5de946e6e 100644 --- a/source/text/shared/01/05350500.xhp +++ b/source/text/shared/01/05350500.xhp @@ -1,6 +1,4 @@ - - - @@ -32,199 +29,211 @@
-Textures +

Textures

Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface texture to the selected object. To quickly apply a surface texture, open the Gallery, hold down Shift+CommandCtrl, and then drag an image onto the selected 3D object. + + + + + Icon Textures + + + + Textures + + +
-Textures +

Textures

Sets the texture properties. -Type +

Type

Set the color properties of the texture. -Black & White +

Black & White

Converts the texture to black and white. - + -Icon - +Icon Black & White + - + Black & White
-Color +

Color

Converts the texture to color. - + -Icon - +Icon Color + - + Color
-Mode +

Mode

Show or hide shading. -Only Texture +

Only Texture

Applies the texture without shading. - + -Icon - +Icon Only Texture + - + Only Texture
-Texture and Shading +

Texture and Shading

Applies the texture with shading. To define the shading options for the texture, click the Shading button in this dialog. - + -Icon - +Icon Texture and Shading + - + Texture and Shading
-Projection X +

Projection X

Set the options for displaying the texture. -Object-specific +

Object-specific

Automatically adjusts the texture based on the shape and size of the object. - + -Icon - +Icon Object-specific + - + Object-specific
-Parallel +

Parallel

Applies the texture parallel to the horizontal axis. - + -Icon - +Icon + - + Parallel
-Circular +

Circular

Wraps the horizontal axis of the texture pattern around a sphere. - + -Icon +Icon Circular - + Circular
-Projection Y +

Projection Y

Click the respective buttons to define the texture for the object Y axis. -Object-specific +

Object-specific

Automatically adjusts the texture based on the shape and size of the object. - + -Icon - +Icon Object-Specific + - + Object-specific
-Parallel +

Parallel

Applies the texture parallel to the vertical axis. - + -Icon - +Icon Parallel + - + Parallel
-Circular +

Circular

Wraps the vertical axis of the texture pattern around a sphere. - + -Icon - +Icon Circular + - + Circular
-Filter +

Filter

Filters out some of the 'noise' that can occur when you apply a texture to a 3D object. -Filtering On/Off +

Filtering On/Off

Blurs the texture slightly to remove unwanted speckles. - + -Icon - +Icon Filtering On/Off + - + Filtering On/Off
- +
diff --git a/source/text/shared/01/05350600.xhp b/source/text/shared/01/05350600.xhp index 6586af0ece..e55b4707d2 100644 --- a/source/text/shared/01/05350600.xhp +++ b/source/text/shared/01/05350600.xhp @@ -1,6 +1,4 @@ - - - @@ -32,42 +29,55 @@
-Material +

Material

Changes the coloring of the selected 3D object. + + + + + Icon Material + + + + Material + + +
-Material +

Material

Assigns a predefined color scheme or lets you create your own color scheme. -Favorites +

Favorites

Select a predefined color scheme, or select User-defined to define a custom color scheme. -Object color +

Object color

Select the color that you want to apply to the object. -Select Color Through the Color Dialog +

Select Color Through the Color Dialog

-Illumination color +

Illumination color

Select the color to illuminate the object. -Select Color Through the Color Dialog +

Select Color Through the Color Dialog

-Specular +

Specular

Sets the light reflection properties for the selected object. -Color +

Color

Select the color that you want the object to reflect. -Select Color Through the Color Dialog +

Select Color Through the Color Dialog

-Intensity +

Intensity

Enter the intensity of the specular effect. +
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp index 80e68fd211..39f5c4a6c8 100644 --- a/source/text/shared/main0201.xhp +++ b/source/text/shared/main0201.xhp @@ -1,6 +1,4 @@ - - - - - + Standard Bar @@ -29,17 +25,17 @@
-Standard Bar +

Standard Bar

The Standard bar is available in every $[officename] application.
-Open File +

Open File

-Save As +

Save As

@@ -98,28 +94,28 @@ -Insert Chart +

Insert Chart

Creates a chart in the current document. -Sort Descending / Sort Ascending +

Sort Descending / Sort Ascending

Sorts the selection from the highest to the lowest value, or from the lowest to the highest value using the column that contains the cursor. -Chart +

Chart

Creates a chart in the current document. -Display Grid +

Display Grid

-Chart +

Chart

Creates a chart in the current document. - +
@@ -150,7 +146,7 @@
-What's this +

What's this

Enables extended help tips under the mouse pointer till the next click.
diff --git a/source/text/simpress/02/10130000.xhp b/source/text/simpress/02/10130000.xhp deleted file mode 100644 index bc20b926d5..0000000000 --- a/source/text/simpress/02/10130000.xhp +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - -3D Effects -/text/simpress/02/10130000.xhp - - -Sun Microsystems, Inc. - - - -
-3D Effects -Specifies the properties of a 3D object or converts a 2D object to 3D.UFI: this will be not visible by default. But users can configure it if they find out how. -
- - - - - - - -Format - 3D Effects - -
-- cgit