source/text/sdraw/guide/color_define.xhp | 84 +++++++++++++------------------
source/text/shared/00/00000406.xhp | 34 ++++++------
source/text/shared/optionen/01010501.xhp | 7 --
3 files changed, 55 insertions(+), 70 deletions(-)
New commits:
commit 9494a8065606166a5457d0e66caaaf7433fe9e12
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
Date: Mon Apr 2 21:27:54 2018 -0300
tdf#107079 Update custom color dialogs and guide
Change-Id: Ib8233c37b0352711e8b57d5c5eea9fb61ec8d75a
Reviewed-on: https://gerrit.libreoffice.org/52285
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/sdraw/guide/color_define.xhp
b/source/text/sdraw/guide/color_define.xhp
index 808ff16ed..ee7f3fa78 100644
--- a/source/text/sdraw/guide/color_define.xhp
+++ b/source/text/sdraw/guide/color_define.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,56 +18,44 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textsdrawguidecolor_definexml" indexer="include"
status="PUBLISH">
<title xml-lang="en-US" id="tit">Defining Custom Colors</title>
<filename>/text/sdraw/guide/color_define.xhp</filename>
</topic>
</meta>
- <body>
-<bookmark xml-lang="en-US" branch="index"
id="bm_id3149263"><bookmark_value>colors; defining and saving</bookmark_value>
- <bookmark_value>user-defined colors</bookmark_value>
- <bookmark_value>custom colors</bookmark_value>
-</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3149263" role="heading"
level="1"><variable id="color_define"><link
href="text/sdraw/guide/color_define.xhp" name="Defining Custom Colors">Defining
Custom Colors</link>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154511" role="paragraph">If you
want, you can mix a custom color and add it to a color table.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3155600" role="heading"
level="2">To define a custom color</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3150327"
role="listitem">Choose <emph>Format - Area</emph> and click the
<emph>Colors</emph> tab. A table of the predefined colors is
displayed.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154657"
role="warning">Changes made to the standard color table are permanent and are
saved automatically.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3166425"
role="paragraph">Click a color in the table that is similar to the one you want
to mix. The color appears in the upper preview box to the right of the
table.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152992"
role="paragraph">Select the RGB or CMYK color model in the box below the
preview boxes.</paragraph>
- <paragraph xml-lang="en-US" id="par_id4979705"
role="paragraph">%PRODUCTNAME uses only the RGB color model for printing in
color. The CMYK controls are provided only to ease the input of color values
using CMYK notation.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152987"
role="paragraph">The RGB color model mixes red, green and blue light to create
colors on a computer screen. In the RGB model, the three color components are
additive and can have values ranging from 0 (black) to 255 (white). The CMYK
color model combines Cyan (C), Magenta (M), Yellow (Y), and blacK (K, also used
for "Key") to create colors for printing. The four colors of the CMYK models
are subtractive and are defined as percentages. Black corresponds to 100 % and
white to 0 %.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3145386"
role="paragraph">Enter a numeric value in the boxes next to the color
components. The new color appears in the preview box directly above the color
model box.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152871" role="note">You can
also create a color using a color spectrum. Click the <emph>Edit</emph> button
to open the <link href="text/shared/optionen/01010501.xhp"
name="Color"><emph>Color</emph></link> dialog. Click a color. Use the Hue,
Saturation, and Brightness boxes to adjust your color selection.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153011" role="paragraph">Do
one of the following:</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147244" role="listitem">If
you want to replace the color in the standard color table that your custom
color is based on, click <emph>Modify</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3145116" role="listitem">If
you want to add your custom color to the standard color table, enter a name in
the <emph>Name</emph> text box and click <emph>Add</emph>.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
- <embed href="text/simpress/guide/palette_files.xhp#palette_files"/>
- <embed href="text/sdraw/guide/eyedropper.xhp#eyedropper"/>
- <paragraph xml-lang="en-US" id="par_id3145236" role="paragraph"><link
href="text/shared/01/03170000.xhp" name="Color bar">Color bar</link></paragraph>
- </section>
- </body>
-</helpdocument>
\ No newline at end of file
+<body>
+ <bookmark xml-lang="en-US" branch="index" id="bm_id3149263">
+ <bookmark_value>colors; defining</bookmark_value>
+ <bookmark_value>user-defined colors</bookmark_value>
+ <bookmark_value>custom colors</bookmark_value>
+ </bookmark>
+ <paragraph xml-lang="en-US" id="hd_id3149263" role="heading"
level="1"><variable id="color_define"><link
href="text/sdraw/guide/color_define.xhp" name="Defining Custom Colors">Defining
Custom Colors</link></variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154511" role="paragraph">Define
custom colors and add them to the <emph>Custom color</emph> palette.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155600" role="heading" level="2">To
define a custom color</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150327"
role="listitem">Choose <emph>Format - Area</emph>, click the <emph>Area</emph>
tab and press the <emph>Color</emph> button. A table of the predefined palette
colors is displayed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154657"
role="warning">Custom colors are saved in the <emph>Custom color</emph>
palette.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166425"
role="paragraph">Click a color in the table that is similar to the one you want
to define. You can select the similar color from any of the available color
palettes in the <emph>Color area</emph> on the left or the <emph>Recent
colors</emph> in the list below the color table. The color appears in the
<emph>New</emph> preview box to the right of the dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph role="paragraph" id="par_id41522705652544"
xml-lang="en-US">Click the <emph>Pick</emph> button to open the <link
href="text/shared/optionen/01010501.xhp" name="linkname">Pick a Color</link>
dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4979705"
role="note">%PRODUCTNAME uses only the RGB color model for printing in color.
The RGB values of the selected color are displayed below the preview
boxes.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id691522706451849" role="listitem"
xml-lang="en-US">Press the <emph>Add</emph> button to add the custom color to
the <emph>Custom color</emph> palette. A dialog box asking to enter a color
name appears. Enter a unique name for the new color within all color names
existing in the <emph>Custom color</emph> palette.</paragraph>
+ </listitem>
+ </list>
+ <paragraph role="tip" id="par_id701522707038880" xml-lang="en-US">To remove
a color from the Custom color palette, select the Custom color palette in the
Color area, select the color to be deleted and click
<emph>Delete</emph>.</paragraph>
+ <section id="relatedtopics">
+ <paragraph role="paragraph" id="par_id661522713547390"
xml-lang="en-US"><link href="text/shared/optionen/01010500.xhp"
name="Color">Color dialog</link>.</paragraph>
+ <embed href="text/sdraw/guide/eyedropper.xhp#eyedropper"/>
+ <paragraph xml-lang="en-US" id="par_id3145236" role="paragraph"><link
href="text/shared/01/03170000.xhp" name="Color bar">Color bar</link></paragraph>
+ </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/00/00000406.xhp
b/source/text/shared/00/00000406.xhp
index f7d45ac91..72ca906f0 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -170,23 +170,23 @@
<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US">Choose
<emph>Format - Area - Colors</emph> tab</paragraph>
</section>
<section id="color2">
-<paragraph role="paragraph" id="par_id3145729" xml-lang="en-US">Choose
<emph>Format - Area - Colors</emph> tab<emph> - Edit</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US">Choose
<emph>Format - 3D Effects</emph> icon on the <emph>Illumination</emph>
tab</paragraph>
-<section id="farbdial">
-<table id="tbl_id3152374">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US">
-<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in"
height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
- </image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3151037"
role="paragraph">Select color on the <emph>Color</emph> tab page</paragraph>
- </tablecell>
- </tablerow>
- </table>
- </section>
- </section>
+ <paragraph role="paragraph" id="par_id3145729" xml-lang="en-US">Choose
<emph>Format - Area - Area</emph>, press the <emph>Color</emph> button and
click the <emph>Pick</emph> button.</paragraph>
+ <section id="farbdial">
+ <table id="tbl_id3152374">
+ <tablerow>
+ <tablecell>
+ <paragraph role="paragraph" id="par_id3153876"
xml-lang="en-US">
+ <image id="img_id3148386" src="svx/res/colordlg.png"
width="0.2228in" height="0.2228in"><alt id="alt_id3148386"
xml-lang="en-US">Icon</alt>
+ </image>
+ </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151037"
role="paragraph">Press the <emph>Color Dialog</emph> button in the
<emph>Illumination</emph> tab of the <emph>3D Effects</emph> dialog.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ </section>
+</section>
<paragraph xml-lang="en-US" id="par_id3149403"
role="paragraph"><variable id="schriers">Choose <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - $[officename] -
Fonts</emph>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3150717"
role="paragraph"><variable id="scripting">Choose <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph></caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - $[officename] -
Security</emph>
diff --git a/source/text/shared/optionen/01010501.xhp
b/source/text/shared/optionen/01010501.xhp
index 5694ef602..0fb1730ff 100644
--- a/source/text/shared/optionen/01010501.xhp
+++ b/source/text/shared/optionen/01010501.xhp
@@ -26,8 +26,6 @@
</meta>
<body>
-
-
<paragraph id="hd_id3153126" role="heading" level="1"
xml-lang="en-US">Selecting a new color</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150771">
<bookmark_value>defining;colors</bookmark_value>
@@ -36,7 +34,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/ColorPicker"
id="bm_id3151211" localize="false"/>
-<paragraph id="par_id3150771" role="paragraph" xml-lang="en-US"><variable
id="farbentext"><ahelp hid=".">%PRODUCTNAME lets you define custom colors using
a two-dimensional graphic and numerical gradient chart of the Pick a Color
dialog.</ahelp></variable> Click <emph>OK</emph> to display the newly defined
color in the <emph>New</emph> preview box of the <emph>Colors</emph> tab, where
you can then decide if you want to add or replace the new color in the current
color palette.</paragraph>
+<paragraph id="par_id3150771" role="paragraph" xml-lang="en-US"><variable
id="farbentext"><ahelp hid=".">%PRODUCTNAME lets you define custom colors using
a two-dimensional graphic and numerical gradient chart of the <emph>Pick a
Color</emph> dialog.</ahelp></variable>.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#color2"/>
@@ -46,7 +44,7 @@
<paragraph id="par_id61884" role="paragraph" xml-lang="en-US"><image
id="img_id5337"
src="media/screenshots/cui/ui/colorpickerdialog/ColorPicker.png" width="19cm"
height="16cm"><alt xml-lang="en-US" id="alt_id5337">The Pick a Color
Window</alt>
<caption xml-lang="en-US" id="alt_id34144">Pick a Color
window</caption></image></paragraph>
<paragraph id="par_id3148944" role="paragraph" xml-lang="en-US">The Pick a
Color Dialog window consist of four main areas.</paragraph>
-
+<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/colorSlider"
id="bm_id3153572" localize="false"/>
<list type="unordered">
<listitem>
<paragraph id="par_id3148945" role="paragraph" xml-lang="en-US">The radio
buttons select the color component of the color. This color component can be
expressed in either RGB (Red, Green, Blue) or HSB (Hue, Saturation, Brightness)
color models. The CMYK color model is not selectable and is provided only to
ease the input of color values using CMYK notation. </paragraph>
@@ -55,7 +53,6 @@
<paragraph id="par_id3148946" role="paragraph" xml-lang="en-US">The spin
buttons are for entering the numerical value of the color component.</paragraph>
</listitem>
<listitem>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/colorSlider"
id="bm_id3153572" localize="false"/>
<paragraph id="par_id3148947" role="paragraph" xml-lang="en-US"><ahelp
hid=".">With the vertical color component slider you can modify the value of
each component of the color.</ahelp> With the large colored square you can
select the color component approximately.</paragraph>
</listitem>
<listitem>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
