strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#105000 Make Material palette entries localizable

Browse source 
Change-Id: I8e208ed6b807e43ce53c5604ccb5d544c28189e5
Reviewed-on: https://gerrit.libreoffice.org/77419
Reviewed-by: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
This commit is contained in:
Kovács László Zoltán 2019-08-13 15:46:56 +02:00 committed by László Németh
parent 655f458157
commit 16006492d6
4 changed files with 124 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
extras/source/palettes/material.soc
View file

@ -3,19 +3,19 @@
<office:color-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
<!-- Grey palette -->
<draw:color draw:name="Grey" draw:color="#9E9E9E"/>
<draw:color draw:name="Grey 50" draw:color="#FAFAFA"/>
<draw:color draw:name="Grey 100" draw:color="#F5F5F5"/>
<draw:color draw:name="Grey 200" draw:color="#EEEEEE"/>
<draw:color draw:name="Grey 300" draw:color="#E0E0E0"/>
<draw:color draw:name="Grey 400" draw:color="#BDBDBD"/>
<draw:color draw:name="Grey 600" draw:color="#757575"/>
<draw:color draw:name="Grey 700" draw:color="#616161"/>
<draw:color draw:name="Grey 800" draw:color="#424242"/>
<draw:color draw:name="Grey 900" draw:color="#212121"/>
<draw:color draw:name="Grey A200" draw:color="#000000"/>
<draw:color draw:name="Grey A400" draw:color="#000000"/>
<!-- Gray palette -->
<draw:color draw:name="Gray" draw:color="#9E9E9E"/>
<draw:color draw:name="Gray 50" draw:color="#FAFAFA"/>
<draw:color draw:name="Gray 100" draw:color="#F5F5F5"/>
<draw:color draw:name="Gray 200" draw:color="#EEEEEE"/>
<draw:color draw:name="Gray 300" draw:color="#E0E0E0"/>
<draw:color draw:name="Gray 400" draw:color="#BDBDBD"/>
<draw:color draw:name="Gray 600" draw:color="#757575"/>
<draw:color draw:name="Gray 700" draw:color="#616161"/>
<draw:color draw:name="Gray 800" draw:color="#424242"/>
<draw:color draw:name="Gray 900" draw:color="#212121"/>
<draw:color draw:name="Gray A200" draw:color="#000000"/>
<draw:color draw:name="Gray A400" draw:color="#000000"/>
<!-- Yellow palette -->
<draw:color draw:name="Yellow" draw:color="#FFEB3B"/>
@ -255,17 +255,17 @@
<draw:color draw:name="Brown A200" draw:color="#FFFFFF"/>
<draw:color draw:name="Brown A400" draw:color="#FFFFFF"/>
<!-- Blue Grey palette -->
<draw:color draw:name="Blue Grey" draw:color="#607D8B"/>
<draw:color draw:name="Blue Grey 50" draw:color="#ECEFF1"/>
<draw:color draw:name="Blue Grey 100" draw:color="#CFD8DC"/>
<draw:color draw:name="Blue Grey 200" draw:color="#B0BEC5"/>
<draw:color draw:name="Blue Grey 300" draw:color="#90A4AE"/>
<draw:color draw:name="Blue Grey 400" draw:color="#78909C"/>
<draw:color draw:name="Blue Grey 600" draw:color="#546E7A"/>
<draw:color draw:name="Blue Grey 700" draw:color="#455A64"/>
<draw:color draw:name="Blue Grey 800" draw:color="#37474F"/>
<draw:color draw:name="Blue Grey 900" draw:color="#263238"/>
<draw:color draw:name="Blue Grey A200" draw:color="#FFFFFF"/>
<draw:color draw:name="Blue Grey A400" draw:color="#FFFFFF"/>
<!-- Blue Gray palette -->
<draw:color draw:name="Blue Gray" draw:color="#607D8B"/>
<draw:color draw:name="Blue Gray 50" draw:color="#ECEFF1"/>
<draw:color draw:name="Blue Gray 100" draw:color="#CFD8DC"/>
<draw:color draw:name="Blue Gray 200" draw:color="#B0BEC5"/>
<draw:color draw:name="Blue Gray 300" draw:color="#90A4AE"/>
<draw:color draw:name="Blue Gray 400" draw:color="#78909C"/>
<draw:color draw:name="Blue Gray 600" draw:color="#546E7A"/>
<draw:color draw:name="Blue Gray 700" draw:color="#455A64"/>
<draw:color draw:name="Blue Gray 800" draw:color="#37474F"/>
<draw:color draw:name="Blue Gray 900" draw:color="#263238"/>
<draw:color draw:name="Blue Gray A200" draw:color="#FFFFFF"/>
<draw:color draw:name="Blue Gray A400" draw:color="#FFFFFF"/>
</office:color-table>

25
include/svx/strings.hrc
View file

@ -619,6 +619,31 @@
#define RID_SVXSTR_COLOR_SPRINGGREEN NC_("RID_SVXSTR_COLOR_SPRINGGREEN", "Spring Green")
#define RID_SVXSTR_COLOR_CHARTREUSEGREEN NC_("RID_SVXSTR_COLOR_CHARTREUSEGREEN", "Chartreuse Green")
#define RID_SVXSTR_COLOR_ROSE NC_("RID_SVXSTR_COLOR_ROSE", "Rose")
//Elements of the Material color palette
#define RID_SVXSTR_COLOR_MATERIAL_GRAY_A NC_("RID_SVXSTR_COLOR_MATERIAL_GRAY_A", "Gray A")
#define RID_SVXSTR_COLOR_MATERIAL_YELLOW_A NC_("RID_SVXSTR_COLOR_MATERIAL_YELLOW_A", "Yellow A")
#define RID_SVXSTR_COLOR_MATERIAL_AMBER_A NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER_A", "Amber A")
#define RID_SVXSTR_COLOR_MATERIAL_AMBER NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER", "Amber")
#define RID_SVXSTR_COLOR_MATERIAL_ORANGE_A NC_("RID_SVXSTR_COLOR_MATERIAL_ORANGE_A", "Orange A")
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A", "Deep Orange A")
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE", "Deep Orange")
#define RID_SVXSTR_COLOR_MATERIAL_RED_A NC_("RID_SVXSTR_COLOR_MATERIAL_RED_A", "Red A")
#define RID_SVXSTR_COLOR_MATERIAL_PINK_A NC_("RID_SVXSTR_COLOR_MATERIAL_PINK_A", "Pink A")
#define RID_SVXSTR_COLOR_MATERIAL_PURPLE_A NC_("RID_SVXSTR_COLOR_MATERIAL_PURPLE_A", "Purple A")
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A", "Deep Purple A")
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE", "Deep Purple")
#define RID_SVXSTR_COLOR_MATERIAL_INDIGO_A NC_("RID_SVXSTR_COLOR_MATERIAL_INDIGO_A", "Indigo A")
#define RID_SVXSTR_COLOR_MATERIAL_BLUE_A NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_A", "Blue A")
#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A", "Light Blue A")
#define RID_SVXSTR_COLOR_MATERIAL_CYAN_A NC_("RID_SVXSTR_COLOR_MATERIAL_CYAN_A", "Cyan A")
#define RID_SVXSTR_COLOR_MATERIAL_TEAL_A NC_("RID_SVXSTR_COLOR_MATERIAL_TEAL_A", "Teal A")
#define RID_SVXSTR_COLOR_MATERIAL_GREEN_A NC_("RID_SVXSTR_COLOR_MATERIAL_GREEN_A", "Green A")
#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A", "Light Green A")
#define RID_SVXSTR_COLOR_MATERIAL_LIME_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIME_A", "Lime A")
#define RID_SVXSTR_COLOR_MATERIAL_BROWN_A NC_("RID_SVXSTR_COLOR_MATERIAL_BROWN_A", "Brown A")
#define RID_SVXSTR_COLOR_MATERIAL_BROWN NC_("RID_SVXSTR_COLOR_MATERIAL_BROWN", "Brown")
#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A", "Blue Gray A")
#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY", "Blue Gray")
/* Old default color names, probably often used in saved files */
#define RID_SVXSTR_COLOR_BLUE_CLASSIC NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic")
#define RID_SVXSTR_COLOR_BLUEGREY NC_("RID_SVXSTR_COLOR_BLUEGREY", "Blue gray")

26
svx/inc/strings.hxx
View file

@ -91,7 +91,31 @@
#define RID_SVXSTR_COLOR_SPRINGGREEN_DEF "Spring Green"
#define RID_SVXSTR_COLOR_CHARTREUSEGREEN_DEF "Chartreuse Green"
#define RID_SVXSTR_COLOR_ROSE_DEF "Rose"
// Reference strings for the Material palette
#define RID_SVXSTR_COLOR_MATERIAL_GRAY_A_DEF "Gray A"
#define RID_SVXSTR_COLOR_MATERIAL_YELLOW_A_DEF "Yellow A"
#define RID_SVXSTR_COLOR_MATERIAL_AMBER_A_DEF "Amber A"
#define RID_SVXSTR_COLOR_MATERIAL_AMBER_DEF "Amber"
#define RID_SVXSTR_COLOR_MATERIAL_ORANGE_A_DEF "Orange A"
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A_DEF "Deep Orange A"
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_DEF "Deep Orange"
#define RID_SVXSTR_COLOR_MATERIAL_RED_A_DEF "Red A"
#define RID_SVXSTR_COLOR_MATERIAL_PINK_A_DEF "Pink A"
#define RID_SVXSTR_COLOR_MATERIAL_PURPLE_A_DEF "Purple A"
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A_DEF "Deep Purple A"
#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_DEF "Deep Purple"
#define RID_SVXSTR_COLOR_MATERIAL_INDIGO_A_DEF "Indigo A"
#define RID_SVXSTR_COLOR_MATERIAL_BLUE_A_DEF "Blue A"
#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A_DEF "Light Blue A"
#define RID_SVXSTR_COLOR_MATERIAL_CYAN_A_DEF "Cyan A"
#define RID_SVXSTR_COLOR_MATERIAL_TEAL_A_DEF "Teal A"
#define RID_SVXSTR_COLOR_MATERIAL_GREEN_A_DEF "Green A"
#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A_DEF "Light Green A"
#define RID_SVXSTR_COLOR_MATERIAL_LIME_A_DEF "Lime A"
#define RID_SVXSTR_COLOR_MATERIAL_BROWN_A_DEF "Brown A"
#define RID_SVXSTR_COLOR_MATERIAL_BROWN_DEF "Brown"
#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A_DEF "Blue Gray A"
#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_DEF "Blue Gray"
// Reference-strings for standard-gradient-table
#define RID_SVXSTR_GRDT0_DEF "Gradient"
#define RID_SVXSTR_GRDT1_DEF "Linear blue/white"

48
svx/source/unodraw/unoprov.cxx
View file

@ -1664,6 +1664,30 @@ static const char* SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_SPRINGGREEN_DEF,
RID_SVXSTR_COLOR_CHARTREUSEGREEN_DEF,
RID_SVXSTR_COLOR_ROSE_DEF,
RID_SVXSTR_COLOR_MATERIAL_GRAY_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_YELLOW_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_AMBER_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_AMBER_DEF,
RID_SVXSTR_COLOR_MATERIAL_ORANGE_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_DEF,
RID_SVXSTR_COLOR_MATERIAL_RED_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_PINK_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_PURPLE_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_DEF,
RID_SVXSTR_COLOR_MATERIAL_INDIGO_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_BLUE_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_CYAN_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_TEAL_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_GREEN_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_LIME_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_BROWN_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_BROWN_DEF,
RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A_DEF,
RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_DEF,
RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF,
RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF,
RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF,
@ -1752,6 +1776,30 @@ static const char* SvxUnoColorNameResId[] =
RID_SVXSTR_COLOR_SPRINGGREEN,
RID_SVXSTR_COLOR_CHARTREUSEGREEN,
RID_SVXSTR_COLOR_ROSE,
RID_SVXSTR_COLOR_MATERIAL_GRAY_A,
RID_SVXSTR_COLOR_MATERIAL_YELLOW_A,
RID_SVXSTR_COLOR_MATERIAL_AMBER_A,
RID_SVXSTR_COLOR_MATERIAL_AMBER,
RID_SVXSTR_COLOR_MATERIAL_ORANGE_A,
RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A,
RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE,
RID_SVXSTR_COLOR_MATERIAL_RED_A,
RID_SVXSTR_COLOR_MATERIAL_PINK_A,
RID_SVXSTR_COLOR_MATERIAL_PURPLE_A,
RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A,
RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE,
RID_SVXSTR_COLOR_MATERIAL_INDIGO_A,
RID_SVXSTR_COLOR_MATERIAL_BLUE_A,
RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A,
RID_SVXSTR_COLOR_MATERIAL_CYAN_A,
RID_SVXSTR_COLOR_MATERIAL_TEAL_A,
RID_SVXSTR_COLOR_MATERIAL_GREEN_A,
RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A,
RID_SVXSTR_COLOR_MATERIAL_LIME_A,
RID_SVXSTR_COLOR_MATERIAL_BROWN_A,
RID_SVXSTR_COLOR_MATERIAL_BROWN,
RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A,
RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY,
RID_SVXSTR_COLOR_LIBRE_GREEN_1,
RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT,
RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT,