diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-10-14 16:51:25 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2018-10-27 22:43:14 +0200 |
| commit | 68c73b2cc26313de315e828cb9f8db53d9aeb6bf (patch) | |
| tree | daa39ae56cf63a3eb1498d054d6f501f335832c0 /include | |
| parent | d666b6b19d3e400561edc585d967ecab266c6b8f (diff) | |
tdf#108751 Show currently selected color name in color button tooltip
Based on Heiko Tietze's work in
I26f0500527d2b86049948ca64e636e1ff566f262
Change-Id: I20541dd6ad155a39c0f87361088b44923406064f
Reviewed-on: https://gerrit.libreoffice.org/61815
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/strings.hrc | 6 | ||||
| -rw-r--r-- | include/svx/tbxcolorupdate.hxx | 7 | ||||
| -rw-r--r-- | include/svx/xdef.hxx | 7 | ||||
| -rw-r--r-- | include/tools/color.hxx | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index e0b57303719e..b93953e046e7 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -552,6 +552,12 @@ #define RID_SVXSTR_GRAFMODE_GREYS NC_("RID_SVXSTR_GRAFMODE_GREYS", "Grayscale") #define RID_SVXSTR_GRAFMODE_MONO NC_("RID_SVXSTR_GRAFMODE_MONO", "Black/White") #define RID_SVXSTR_GRAFMODE_WATERMARK NC_("RID_SVXSTR_GRAFMODE_WATERMARK", "Watermark") +// Default colors +#define RID_SVXSTR_COLOR_DEFAULT_FONT NC_("RID_SVXSTR_COLOR_DEFAULT_FONTCOLOR", "Dark Red 2") +#define RID_SVXSTR_COLOR_DEFAULT_FRAMELINE NC_("RID_SVXSTR_COLOR_DEFAULT_FRAMELINE", "Blue") +#define RID_SVXSTR_COLOR_DEFAULT_HIGHLIGHT NC_("RID_SVXSTR_COLOR_DEFAULT_HIGHLIGHT", "Yellow") +#define RID_SVXSTR_COLOR_DEFAULT_SHAPE_STROKE NC_("RID_SVXSTR_COLOR_DEFAULT_SHAPE_STROKE", "Dark Blue 1") +#define RID_SVXSTR_COLOR_DEFAULT_SHAPE_FILLING NC_("RID_SVXSTR_COLOR_DEFAULT_SHAPE_FILLING", "Light Blue 2") // Elements of the standard color palette #define RID_SVXSTR_COLOR_BLACK NC_("RID_SVXSTR_COLOR_BLACK", "Black") #define RID_SVXSTR_COLOR_GREY NC_("RID_SVXSTR_COLOR_GREY", "Gray") diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index 2c3b61b8f386..8f5b7902b757 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -26,6 +26,8 @@ #include <tools/color.hxx> #include <vcl/vclptr.hxx> +#include <svx/Palette.hxx> + class ToolBox; class VirtualDevice; @@ -43,9 +45,11 @@ namespace svx class SVX_DLLPUBLIC ToolboxButtonColorUpdater { public: - ToolboxButtonColorUpdater( sal_uInt16 nSlotId, sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, bool bWideButton = false); + ToolboxButtonColorUpdater( sal_uInt16 nSlotId, sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, bool bWideButton, + const OUString& rCommandLabel ); ~ToolboxButtonColorUpdater(); + void Update( const NamedColor& rNamedColor ); void Update( const Color& rColor, bool bForceUpdate = false ); Color const & GetCurrentColor() const { return maCurColor; } @@ -60,6 +64,7 @@ namespace svx tools::Rectangle maUpdRect; Size maBmpSize; bool mbWasHiContrastMode; + OUString maCommandLabel; }; diff --git a/include/svx/xdef.hxx b/include/svx/xdef.hxx index 75ea49bc8c3a..aa539648cad0 100644 --- a/include/svx/xdef.hxx +++ b/include/svx/xdef.hxx @@ -78,8 +78,11 @@ class XLineTransparenceItem; class XLineWidthItem; class XSecondaryFillColorItem; -#define COL_DEFAULT_SHAPE_FILLING ::Color(0x729fcf) -#define COL_DEFAULT_SHAPE_STROKE ::Color(0x3465a4) +#define COL_DEFAULT_FONT ::Color(0xC9211E) // dark red 2 +#define COL_DEFAULT_FRAMELINE ::Color(0x2A6099) // blue +#define COL_DEFAULT_HIGHLIGHT ::Color(0xFFFF00) // yellow +#define COL_DEFAULT_SHAPE_FILLING ::Color(0x729fcf) // light blue 2 +#define COL_DEFAULT_SHAPE_STROKE ::Color(0x3465a4) // dark blue 1 #define XATTR_START 1000 diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 1b8fb3eecdd1..26d587b7e1f5 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -241,7 +241,6 @@ constexpr ::Color COL_BLUE ( 0x00, 0x00, 0x80 ); constexpr ::Color COL_GREEN ( 0x00, 0x80, 0x00 ); constexpr ::Color COL_CYAN ( 0x00, 0x80, 0x80 ); constexpr ::Color COL_RED ( 0x80, 0x00, 0x00 ); -constexpr ::Color COL_RED_FONTCOLOR ( 0xCE, 0x18, 0x1E ); constexpr ::Color COL_MAGENTA ( 0x80, 0x00, 0x80 ); constexpr ::Color COL_BROWN ( 0x80, 0x80, 0x00 ); constexpr ::Color COL_GRAY ( 0x80, 0x80, 0x80 ); @@ -255,7 +254,6 @@ constexpr ::Color COL_LIGHTRED ( 0xFF, 0x00, 0x00 ); constexpr ::Color COL_LIGHTMAGENTA ( 0xFF, 0x00, 0xFF ); constexpr ::Color COL_LIGHTGRAYBLUE ( 0xE0, 0xE0, 0xFF ); constexpr ::Color COL_YELLOW ( 0xFF, 0xFF, 0x00 ); -constexpr ::Color COL_YELLOW_HIGHLIGHT ( 0xFF, 0xF2, 0x00 ); constexpr ::Color COL_WHITE ( 0xFF, 0xFF, 0xFF ); constexpr ::Color COL_TRANSPARENT ( 0xFF, 0xFF, 0xFF, 0xFF ); constexpr ::Color COL_AUTO ( 0xFF, 0xFF, 0xFF, 0xFF ); |