diff options
| author | Rishabh Kumar <kris.kr296@gmail.com> | 2016-08-02 23:53:38 +0530 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-08-03 14:19:51 +0000 |
| commit | 571866eaba914742a48938abb6c8495e97868bf1 (patch) | |
| tree | e2b80dbb49f0f011dea676d1a60cd2b24943b61b /include | |
| parent | 569825ea2b64f3682932cd07dae2b244854f4157 (diff) | |
[GSoC] Rework of color tab
New Features -
1. Multiple Palettes in color tab.
2. Remember the selected palette.
3. Recent colors.
4. Custom colors.
Change-Id: I36a438a0c282059ddcbda35f934fcd90337fd451
Reviewed-on: https://gerrit.libreoffice.org/26868
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/Palette.hxx | 10 | ||||
| -rw-r--r-- | include/svx/PaletteManager.hxx | 6 | ||||
| -rw-r--r-- | include/svx/dialogs.hrc | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index 1cbb83e2c94a..ffbd529fbe2f 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -29,7 +29,7 @@ class SvFileStream; typedef std::pair<Color, OUString> NamedColor; typedef std::vector< NamedColor > ColorList; -class Palette +class SVX_DLLPUBLIC Palette { public: virtual ~Palette(); @@ -43,7 +43,7 @@ public: // ASE = Adobe Swatch Exchange -class PaletteASE : public Palette +class SVX_DLLPUBLIC PaletteASE : public Palette { bool mbValidPalette; OUString maFPath; @@ -64,7 +64,7 @@ public: // GPL - this is *not* GNU Public License, but is the Gimp PaLette -class PaletteGPL : public Palette +class SVX_DLLPUBLIC PaletteGPL : public Palette { bool mbLoadedPalette; bool mbValidPalette; @@ -89,7 +89,7 @@ public: // SOC - Star Office Color-table -class PaletteSOC : public Palette +class SVX_DLLPUBLIC PaletteSOC : public Palette { bool mbLoadedPalette; OUString maFPath; @@ -108,4 +108,4 @@ public: #endif // INCLUDED_SVX_PALETTE_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index c8eb922df874..ceeea5d5a5e8 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -36,7 +36,7 @@ #include <vector> #include <memory> -class PaletteManager +class SVX_DLLPUBLIC PaletteManager { const sal_uInt16 mnMaxRecentColors; @@ -56,13 +56,17 @@ class PaletteManager public: PaletteManager(); ~PaletteManager(); + PaletteManager(const PaletteManager&) = delete; + PaletteManager& operator=(const PaletteManager&) = delete; void LoadPalettes(); void ReloadColorSet(SvxColorValueSet& rColorSet); void ReloadRecentColorSet(SvxColorValueSet& rColorSet); std::vector<OUString> GetPaletteList(); void SetPalette( sal_Int32 nPos ); sal_Int32 GetPalette(); + sal_Int32 GetPaletteCount() { return mnNumOfPalettes; } OUString GetPaletteName(); + OUString GetSelectedPalettePath(); long GetColorCount(); long GetRecentColorCount(); diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index de9f394cf63c..8e87be9b576f 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -239,7 +239,7 @@ #define RID_SVXSTR_MORENUMBERING (RID_SVX_START + 204) #define RID_SVXSTR_MOREBULLETS (RID_SVX_START + 205) -#define RID_SVXSTR_DEFAULT_PAL (RID_SVX_START + 206) +#define RID_SVXSTR_CUSTOM_PAL (RID_SVX_START + 206) #define RID_SVXSTR_DOC_COLORS (RID_SVX_START + 207) #define RID_SVXSTR_DOC_COLOR_PREFIX (RID_SVX_START + 208) |