From 571866eaba914742a48938abb6c8495e97868bf1 Mon Sep 17 00:00:00 2001 From: Rishabh Kumar Date: Tue, 2 Aug 2016 23:53:38 +0530 Subject: [GSoC] Rework of color tab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips Reviewed-by: Tomaž Vajngerl --- cui/uiconfig/ui/colorpage.ui | 1348 +++++++++++++++++++++--------------------- 1 file changed, 672 insertions(+), 676 deletions(-) (limited to 'cui/uiconfig') diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index bb9823f55609..dd908c532b2b 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -13,15 +13,10 @@ 1 10 - + True False - res/sc05501.png - - - True - False - res/sc05502.png + res/sc10350.png True @@ -29,44 +24,119 @@ True True 6 - vertical + 6 True False True - True 0 none True False - True - True 6 12 - + True False - True - True - 12 + start + start + 6 - + True False - True - 6 - 12 + vertical + 3 - + True False 0 - C_olor: - True + 0 + Palette : + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + + 0 + 0 + 1 + 1 + + + + + True + False + vertical + 3 + + + True + False + 0 + Recent Colors + + + False + True + 0 + + + + + True + False + True + True + + + False + True + 1 + + + + + 0 + 2 + 1 + 1 + + + + + True + False + 3 + True + + + gtk-add + True + True + True + True 0 @@ -76,10 +146,43 @@ - + + RGB + True + False + 0 + True + True + + + 0 + 1 + 1 + 1 + + + + + CMYK + True + False + 0 + True + True + + + 1 + 1 + 1 + 1 + + + + + Delete True - False - start + True + True 1 @@ -88,40 +191,209 @@ 1 + + + 0 + 3 + 1 + 1 + + + + + True + False + start + vertical - + + True + False + True + True + + + False + False + 0 + + + + + 0 + 1 + 1 + 1 + + + + + + + + + True + False + Colors + + + + + + + + False + True + 0 + + + + + True + False + start + 0 + none + + + True + False + 6 + 12 + + + True + False + vertical + 12 + + + True + False + vertical + + True False + True True - 6 - - - True - False - 0 - Color table: + + + Old Color - - 0 - 0 - 1 - 1 - - - + + + False + False + 0 + + + + + False + True + 0 + + + + + True + False + center + start + True + 6 + 6 + + + True + False + B + True + B_custom + + + 0 + 2 + 1 + 1 + + + + + True + False + G + True + G_custom + + + 0 + 1 + 1 + 1 + + + + + True + False + R + True + R_custom + + + 0 + 0 + 1 + 1 + + + + + True + False + Hex + + + 0 + 3 + 1 + 1 + + + + + 6 True - False - True - True + True - - 0 - 1 - 1 - 1 - - + + 1 + 3 + 1 + 1 + + + + + True + True + adjustment2 + + + 1 + 0 + 1 + 1 + + + + + True + True + adjustment2 1 @@ -131,24 +403,196 @@ - + + True + True + adjustment2 + + + 1 + 2 + 1 + 1 + False - False - 0 + True + 1 - - True + False center start - True + True 6 6 + + + True + False + _C + True + C_custom:0% + + + 0 + 0 + 1 + 1 + + + + + True + False + _K + True + K_custom:0% + + + 0 + 3 + 1 + 1 + + + + + True + False + _Y + True + + + 0 + 2 + 1 + 1 + + + + + True + True + adjustment1 + + + 1 + 0 + 1 + 1 + + + + + True + True + adjustment1 + + + 1 + 1 + 1 + 1 + + + + + True + True + adjustment1 + + + 1 + 2 + 1 + 1 + + + + + True + True + adjustment1 + + + 1 + 3 + 1 + 1 + + + + + True + False + _M + True + + + 0 + 1 + 1 + 1 + + + + + False + True + 2 + + + + + + + + + True + False + Active + + + + + + + + True + True + 1 + + + + + True + False + start + 0 + none + + + True + False + 6 + 12 + + + True + False + start + vertical + 12 + + + True + False + vertical True @@ -161,24 +605,78 @@ + + False + False + 0 + + + + + False + True + 0 + + + + + True + False + center + start + True + 6 + 6 + + + True + True + • + adjustment2 + 1 - 1 + 2 1 1 - + + True + True + • + adjustment2 + + + 1 + 0 + 1 + 1 + + + + True False - True - True - - - Old Color - - + _B + True + B_custom + + + 0 + 2 + 1 + 1 + + + + + True + False + _G + True + G_custom 0 @@ -188,13 +686,12 @@ - - RGB - True - False - 0 - True - True + + True + False + _R + True + R_custom 0 @@ -204,275 +701,38 @@ - - CMYK + + True True - False - 0 - True - True + • + adjustment2 1 - 0 + 1 1 1 - + True False - end - start - 6 - 6 - True - - - True - True - • - adjustment2 - - - 1 - 2 - 1 - 1 - - - - - True - True - • - adjustment2 - - - 1 - 0 - 1 - 1 - - - - - True - False - _B - True - B_custom - - - 0 - 2 - 1 - 1 - - - - - True - False - _G - True - G_custom - - - 0 - 1 - 1 - 1 - - - - - True - False - _R - True - R_custom - - - 0 - 0 - 1 - 1 - - - - - True - True - • - adjustment2 - - - 1 - 1 - 1 - 1 - - - - - True - False - _Hex - - - 0 - 3 - 1 - 1 - - - - - 6 - True - True - - - 1 - 3 - 1 - 1 - - + _Hex - 1 - 2 + 0 + 3 1 1 - - False - True - end - start - 6 - 6 - True - - - True - False - _C - True - C_custom:0% - - - 0 - 0 - 1 - 1 - - - - - True - False - _M - True - - - 0 - 1 - 1 - 1 - - - - - True - False - _K - True - K_custom:0% - - - 0 - 3 - 1 - 1 - - - - - True - True - • - adjustment1 - - - 1 - 0 - 1 - 1 - - - - - True - True - • - adjustment1 - - - 1 - 3 - 1 - 1 - - - - - True - False - _Y - True - - - 0 - 2 - 1 - 1 - - - - - True - True - • - adjustment1 - - - 1 - 1 - 1 - 1 - - - - + + 6 True True - • - adjustment1 - - 1 - 2 - 1 - 1 - - - 1 3 @@ -480,432 +740,168 @@ 1 + + + False + True + 1 + + + + + False + True + center + start + True + 6 + 6 - + + True False - end - start - 6 - 6 - True - - - True - False - _C - True - C_custom:0% - - - 0 - 0 - 1 - 1 - - - - - True - False - _M - True - - - 0 - 1 - 1 - 1 - - - - - True - False - _K - True - K_custom:0% - - - 0 - 3 - 1 - 1 - - - - - True - False - _Y - True - - - 0 - 2 - 1 - 1 - - - - - True - True - adjustment1 - - - 1 - 0 - 1 - 1 - - - - - True - True - adjustment1 - - - 1 - 1 - 1 - 1 - - - - - True - True - adjustment1 - - - 1 - 2 - 1 - 1 - - - - - True - True - adjustment1 - - - 1 - 3 - 1 - 1 - - + _C + True + C_custom:0% 0 - 3 + 0 1 1 - - _Pick… + True - True - True + False + _M True - 1 - 4 + 0 + 1 1 1 - + True False - end - start - 6 - 6 - True - - - True - False - B - True - B_custom - - - 0 - 2 - 1 - 1 - - - - - True - False - G - True - G_custom - - - 0 - 1 - 1 - 1 - - - - - True - False - R - True - R_custom - - - 0 - 0 - 1 - 1 - - - - - True - False - Hex - - - 0 - 3 - 1 - 1 - - - - - 6 - True - True - - - 1 - 3 - 1 - 1 - - - - - True - True - adjustment2 - - - 1 - 0 - 1 - 1 - - - - - True - True - adjustment2 - - - 1 - 1 - 1 - 1 - - - - - True - True - adjustment2 - - - 1 - 2 - 1 - 1 - - + _K + True + K_custom:0% 0 - 2 + 3 1 1 - - - - - False - True - 1 - - - - - True - False - vertical - 6 - start - - - gtk-add + True True - True - True + • + adjustment1 - False - True - 0 + 1 + 0 + 1 + 1 - - _Modify + True True - True - True + • + adjustment1 - False - True - 1 + 1 + 3 + 1 + 1 - - gtk-delete + True - True - True - True + False + _Y + True - False - True - 2 + 0 + 2 + 1 + 1 - + True - False - 6 - 6 - - - True - True - True - True - Load Color List - Load Color List - center - end - True - image1 - - - 0 - 0 - 1 - 1 - - - - - True - True - True - True - Save Color List - Save Color List - center - end - True - image2 - - - 1 - 0 - 1 - 1 - - + True + • + adjustment1 - False - True - 4 - True + 1 + 2 + 1 + 1 - + True - False - - - Embed - True - True - False - start - 0 - True - - - 0 - 0 - 1 - 1 - - + True + • + adjustment1 - False - True - 5 - True + 1 + 1 + 1 + 1 False - False + True 2 + + + Pick + True + True + True + start + image3 + right + + + False + True + 3 + + - + True False - Properties + New @@ -913,9 +909,9 @@ - False + True True - 0 + 2 -- cgit