From e6ba618bb9091c4964ffa7226e8162d59e6ff5b4 Mon Sep 17 00:00:00 2001 From: klausstaedtler Date: Thu, 2 Jun 2016 18:24:29 +0200 Subject: [PATCH] icons: add new icon gimp-color-palette patch gimppalette.c gimpicons.c gimpicons.h --- app/core/gimppalette.c | 2 +- icons/Color/16/gimp-color-palette.png | Bin 0 -> 942 bytes icons/Color/24/gimp-color-palette.png | Bin 0 -> 1559 bytes icons/Color/24/gimp-color-palette.svg | 224 ++++++++++++++++++ icons/Color/scalable/gimp-color-palette.svg | 223 +++++++++++++++++ .../Prototype/Color/16/gimp-color-palette.png | Bin 980 -> 0 bytes .../Symbolic/16/gimp-color-palette.png | Bin 792 -> 0 bytes icons/Symbolic/16/gimp-color-palette.png | Bin 0 -> 677 bytes icons/Symbolic/24/gimp-color-palette.png | Bin 0 -> 1001 bytes icons/Symbolic/24/gimp-color-palette.svg | 114 +++++++++ .../Symbolic/scalable/gimp-color-palette.svg | 113 +++++++++ icons/icon-list.mk | 16 +- libgimpwidgets/gimpicons.c | 1 + libgimpwidgets/gimpicons.h | 2 +- 14 files changed, 687 insertions(+), 8 deletions(-) create mode 100644 icons/Color/16/gimp-color-palette.png create mode 100644 icons/Color/24/gimp-color-palette.png create mode 100644 icons/Color/24/gimp-color-palette.svg create mode 100644 icons/Color/scalable/gimp-color-palette.svg delete mode 100644 icons/Prototype/Color/16/gimp-color-palette.png delete mode 100644 icons/Prototype/Symbolic/16/gimp-color-palette.png create mode 100644 icons/Symbolic/16/gimp-color-palette.png create mode 100644 icons/Symbolic/24/gimp-color-palette.png create mode 100644 icons/Symbolic/24/gimp-color-palette.svg create mode 100644 icons/Symbolic/scalable/gimp-color-palette.svg diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c index bfe7271ca6..57dea793f4 100644 --- a/app/core/gimppalette.c +++ b/app/core/gimppalette.c @@ -94,7 +94,7 @@ gimp_palette_class_init (GimpPaletteClass *klass) gimp_object_class->get_memsize = gimp_palette_get_memsize; - viewable_class->default_icon_name = "gtk-select-color"; + viewable_class->default_icon_name = GIMP_STOCK_COLOR_PALETTE; viewable_class->get_preview_size = gimp_palette_get_preview_size; viewable_class->get_popup_size = gimp_palette_get_popup_size; viewable_class->get_new_preview = gimp_palette_get_new_preview; diff --git a/icons/Color/16/gimp-color-palette.png b/icons/Color/16/gimp-color-palette.png new file mode 100644 index 0000000000000000000000000000000000000000..2010495fac4b2fd1e38e9010e04bb67c3a6dde44 GIT binary patch literal 942 zcmV;f15x~mP)s z#+VonCU`I;#u&515>32#G=_+J@i3#w%!ZpXos$XMaP3xtxI$T}SXxSX+nowjosK-n*F4IEdCw;kpN76u&1vn zJp8%k4~FvT*mgE~XT`KUwGMBfMhv0K6-30H-?$t7b@}$W7mtoDFYEvmKtsnS zv>yK)~VdvINPjl#q>8h~+rebw`6KzAIdFEh>Zuk75_V z9p1g+km-_6XW*eWquMe>2_lM*F79V8ruc_THIr#-e)AE{H7eOhcoL!W`a5zEY<}`P2 z{K&K6zbI~{v3#v7l=Hb6G%#o#rrQ-lm(Udex3hkv+T(Vtd>!YX$yqc|_d*x`p-#?i z%wV<`5a9dUGxT^m&?P%l(SbA2vae+4NKahjknJXHyIK3}H$)l#Ytgjo$tI(-6#$eW zh^{O}K$PN`w->$OpcJoW$kW4CCcnCtn0u!pLUuLwbKv0M3E${pxjs3E1_GlIG@6LF zlO9idnd#3ZXU=|jbZjYB@r5fdQ)LYfe;YV3@Psa{8@jX!J7uCU9079oQi-+b)S1XD zKbxF8qD-y}q|rmv{F61thc@jH@+9 Q?*IS*07*qoM6N<$f~WbgBme*a literal 0 HcmV?d00001 diff --git a/icons/Color/24/gimp-color-palette.png b/icons/Color/24/gimp-color-palette.png new file mode 100644 index 0000000000000000000000000000000000000000..03c7f87b536ffc2a2bd7648b1eb5847216acc6ad GIT binary patch literal 1559 zcmV+y2I%>TP)*_plXwq@I8OIzBtP;L=H3bbggf`kMkK|+)lcv6gs z5EE)N0at8HDjJhU%aadEOneZ1F;XMYhPFbLTS8%_rPrmjwB2^M-CK7qpAWlTXuI_! zGn4Oje&_q2bB3_MxDTv@T)W9=IxN{&cx8*rDjMw;(O@#F$w(v_9S_HY0|7l2{+>e8 z?^Rzvj4$-@w9(UpE1!AxSzTofuJwD1C9Bh@sS)T(6uJ@t*Hw^cgdkZV%6U)|Q8m=} z_ei+^>UljBJGJABiJAWe{8e9gykN_r)0X@qTWst$)OZ+?@!@eT9*K!2tJzYp!X-$i zr%n=#4le{_0Ux{lTObm+@lMsrk>-T}0RS$3oL}HtyYole@{-)>*i9tDk7L2^TbGid zv4gAj|8z#Sc^(AsT`VF|aET_f2x0&T>g*Jh=tFXrRXI#~<*&WD=26afm!>W*xU6^nG>fWhJcxGffFYx=6{ zqrj=TC6>a-#l!><0Yn7BD4Sb-b}xV;0Nq41+wOCe3Pz)ah+*La#-PMTKtj~)*>>c3 z`{}}i^KQ`MTei3S)w=UaqF>V07@%ng_S_oKRrQ{1D|{3W_Bss~`{umWn@UL#GpSQF z!r3-AZUh_vIG!&G5d_yX zXvr7^*$ff{5NKZAHMY3XlURrHiq!ysZvTB$nC{}lfnwg@{Q0?Ub^V700Qj^O{LuEt zKZFLm5{Zcc2QfQY@;Ar^OOC*`C`g!-f&gMjYl$!aEWpOCl^{xibC)ec`#%qHurfqk zmGky`x|+nfXli{>fuROqsNt^fn$*{|ysmV2-ANK8iF0*9^pt+jYopAP5*>!~nXT?n zZ|fnpcn7e~hoq8>cWCM?ND${mPsBisK#cI>su&*l?*lwlNj-i)YF4HC&0sc*Ot$S8 zvjG4=lx#a?ORf|T4W=bXM@vtlez!J=rj~A8ZyN>xY$=|>(V8HL2)Y`D(NVZ^Nq}s1 z?q&u<$~jU1$~aGbB@sBjYXZOoIOhQ8007Pjx-t#fvD}dr(BgACt;L&GDDjb$ENMW> zFJ&&0@<#x8Iv*Sy90U%|RWMN!vjQY$+?P|bIZuiAX1T$WWNXmy^JqK#@gV@fT2m3; zaBT-824W((rf69KBpLUK7Q2|3Rxs4qj&NrH0N|)9LFw@tFhlCt`Oz!5FAu=!O^yA5 z0sJyXIFMfrCR(7xrlMJ^NV2=VT%X0zHyw~WA7h8ZjU5g*DJw)Udjk(-$>cjh8^xd+4;h-E#RQh*sS8=g!k z(crgB?V?o5mR==dc+Odl@UWVh4hIx$vU?%h$}n-~!r%*h;zCw{8Vk-a(Sl_!dC?P| z%*^+MC*j(;It>91EU&>Dr3|4i9ic8AYn3t_EZK+Y;l5B}yyqzSpl3~TVsfZiS5dL@ z*vo7HEoi?w2oT_?E`|5~7Xi+}IUo|lTb|l<59kn$1&9Zy!=pEUt*<^g+M14Iv0e9h z%*b_LD|zL;^-6q@bY(jIo1jdBGZJzR#*7fnMVNYUeSF;iM}75&LyZ|Vmy)@~=X9Fw z?sKknd$wCWtMW($^yCaUR{*YqL>WvlgKG@Yk%6gkfAgLA_~4P6`f&febS(v#vo@cj zOf=;jlk5eRvfXVLWUHA-5VhIJOmb#yIzBbrrbH&27CN4@{{T%HA$%ucN+JLN002ov JPDHLkV1f&q#c==t literal 0 HcmV?d00001 diff --git a/icons/Color/24/gimp-color-palette.svg b/icons/Color/24/gimp-color-palette.svg new file mode 100644 index 0000000000..9587497d73 --- /dev/null +++ b/icons/Color/24/gimp-color-palette.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-color-palette.svg b/icons/Color/scalable/gimp-color-palette.svg new file mode 100644 index 0000000000..86b4f9abf6 --- /dev/null +++ b/icons/Color/scalable/gimp-color-palette.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Prototype/Color/16/gimp-color-palette.png b/icons/Prototype/Color/16/gimp-color-palette.png deleted file mode 100644 index a334863b5ed7bb40c384933588bbe54aaab9aa96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 980 zcmV;_11tQAP)+vAVY6#Z*pa1AW36yZXi@>Wo>0mnJ#t! z000(rMObt}b#!QNasW$gVRdsLQ*>cvWOQt0a=M$a^8f$w_+A^MM!M7oPv`eIEVzih>ZZ>H=wF-qlli zrmrP6M^hKhWUo&q1Z6Dj_m(!^e_VO?-AB>Cd_#%~QNmCVN+63Xtf{D?+4a2PP6j{> zu1-?cn9$|g3m3oM>mBc^dBxkxy46`0EujojN0vMcZ?8Hxc(cq2&_4up@I^7_&DMstKBq2vNHhIDtjHP z)7yXmKg~8mQ;5Y_^LR<+#@{1spfmam(m#>6i z7U16WBfcqmjyXf?83~lyt^R8-$AG>m2qX@(^AvJz*;rV1Lm$$?mSaVDZElhP$qYb3 z2(AJY@n7q(Bp9f}QEUuMqp7_fqAWtmDIkR;kAG(D%C1`o2PV6s>)s`8V;PpR74SHW z$Ze?sk_m7MHR3Vi^ZovEweH&7)b{!_HTrPhQN8`pZ55xjpVjL00D&w7eWKsv3M_oT ze)!Ulp_F%5KuQBnbFN0EDVJp#v3SsR+!^wwd;S7bn+i)9SX4d$00004nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#K#D># zOL9^f+%t0v6oM;rlk#&ilNCIZ^Yau!GE#F>3!bjs1ypGYQt4P)l96A;;GL6LTC5OU zl9-wT)LEpX;FMUDlvtFg;9FV*l+jV}O3W@z0xC$&%u6lmHede>Xn-Ne0GHI_{`&b@H=R8XrhU}JXGliFNvzDFjV{qb-b~t{ft$1h5 zB$bmvyYH@JJkEbMN6dRxrrGT0e2i-9>Z=dfY`FBYWSz$@?aVdHzinTlS{^@TO8NKW z42ArW2XqXg*IyTJWS=?x`rW^!GRJrP?pTuD&LH`8GiSMdewz8WZ{NzCIHohi$HmEQ zS+g;0wQH+WV(g`-{}1ez&1GKfZgt}MXID@0Usu*J@h0%>(0$pz`+dtA?XE@9f8C5X ze?O2}UVnQ3?Hg-CwCsON`oC$9Z!rJ8LDJLJ^Q=bKGF8?Gi)XI9FI3Oq@r%W$UEo?n z{-k4Pb7F)JJbU-Xw@8Wbj7z63d+F=x z-?(~`-@E1enOCQMTNI+T*IHty{DRdgp67P_)^OlRTpOa5n`&FnXvF-m{mS9;L%>wS N;OXk;vd$@?2>?tyPagmP diff --git a/icons/Symbolic/16/gimp-color-palette.png b/icons/Symbolic/16/gimp-color-palette.png new file mode 100644 index 0000000000000000000000000000000000000000..336976105e95e40209d35ab447b4383de210973e GIT binary patch literal 677 zcmV;W0$TlvP)2x}y?!F7y4&-L`1NZch1UNJ>Fz_Nx)AztmNuzxLnAw3!r7{mpT5*AOcfalKM-Aw%Kfc+tmLBVQ9{sZNZ{p00000 LNkvXXu0mjfXz?Rv literal 0 HcmV?d00001 diff --git a/icons/Symbolic/24/gimp-color-palette.png b/icons/Symbolic/24/gimp-color-palette.png new file mode 100644 index 0000000000000000000000000000000000000000..3d310044b8829f4cb848e0cf54f47c78970a36ff GIT binary patch literal 1001 zcmVb~F)P)wUi=+t8=;Y0i?)sYQMx@X}chaKn zL=c_`Qo0coK}0MnE?gy;r_knQ?&B446J3b9D#k?+N)yF2X^>9uaWgNSJZE0=ZH8~o zJ?DJiop0_Xx}sjMn;-~|OFAoQ%osByX%K(`a0kF9$v=}M`FwbI_`6D_vfZtb4Q7*O zvpGxhJ(3Rr80kd>@UNs*0Q3F*{qIaoP2K8g5XbQwB;S&BD1)y9xD8+kKsir9k|+5) zfb(G(Ug^dS066DH0leN3mvkGz6#&83*47gM0svP5{BJu*8UT+2_+n{k>0)jN&bjlF zKFpAQnVz0LN>Z6h*=n_Zmh@C!Cn@i5@BK$n6urHx1MmGKU2Pv|x7%acckOn2OwxfO z@s#%f$yc3oFYoFgj^mR6z6Q{rsb&ShPm+Ek`6Pe|N#nf?GTiG)l1$Fb%=}XVfVH)? zM!8)6k>oJ|eQ7o00LB5lB&mlS)=9P{HAtTD-oF6gF>CDy0M6`8(emvjk+$~yMT)dy;=zi3Dg)zqF8k9<^hsHX|IRNKK&P)0$ z3rf11yG7pnlO+4PUf%^^y9BO0PHg6OkRI2aSOf4C$yt)0O1hE3az`|i zuNHmeoim5z57lb*becAtbC)HZ1$IXCa%OEU^Ve@#YdhcuZ(3_#tJmwk=p)Afj*_$_C*nA60k}$X zTGB*8*PY^Sdhag| zoB(jRm$0N8B!4A&u3D}BvCDL?s+!H_qa-f?c$VZa$-$Jj?Y-Y5dCgk;aS#M6dHnwX XTrPH$WuyII00000NkvXXu0mjf>sY~& literal 0 HcmV?d00001 diff --git a/icons/Symbolic/24/gimp-color-palette.svg b/icons/Symbolic/24/gimp-color-palette.svg new file mode 100644 index 0000000000..c6090e764a --- /dev/null +++ b/icons/Symbolic/24/gimp-color-palette.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-color-palette.svg b/icons/Symbolic/scalable/gimp-color-palette.svg new file mode 100644 index 0000000000..7c73653ad3 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-color-palette.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/icon-list.mk b/icons/icon-list.mk index af7a751db8..b644e80079 100644 --- a/icons/icon-list.mk +++ b/icons/icon-list.mk @@ -20,6 +20,7 @@ scalable_images = \ scalable/gimp-color-picker-white.svg \ scalable/gimp-color-pick-from-screen.svg \ scalable/gimp-color-cmyk.svg \ + scalable/gimp-color-palette.svg \ scalable/gimp-color-triangle.svg \ scalable/gimp-color-water.svg \ scalable/gimp-controller-keyboard.svg \ @@ -256,19 +257,20 @@ vector24_images = \ 24/gimp-channels.svg \ 24/gimp-char-picker.svg \ 24/gimp-colormap.svg \ + 24/gimp-color-palette.svg \ 24/gimp-controller.svg \ 24/gimp-controller-keyboard.svg \ 24/gimp-controller-linux-input.svg \ 24/gimp-controller-midi.svg \ 24/gimp-controller-wheel.svg \ 24/gimp-cursor.svg \ - 24/gimp-device-status.svg \ - 24/gimp-display-filter.svg \ + 24/gimp-device-status.svg \ + 24/gimp-display-filter.svg \ 24/gimp-display-filter-colorblind.svg \ - 24/gimp-display-filter-contrast.svg \ - 24/gimp-display-filter-gamma.svg \ + 24/gimp-display-filter-contrast.svg \ + 24/gimp-display-filter-gamma.svg \ 24/gimp-display-filter-lcms.svg \ - 24/gimp-display-filter-proof.svg \ + 24/gimp-display-filter-proof.svg \ 24/gimp-dynamics.svg \ 24/gimp-error.svg \ 24/gimp-floating-selection.svg \ @@ -329,7 +331,7 @@ vector24_images = \ 24/gimp-question.svg \ 24/gimp-resize.svg \ 24/gimp-sample-point.svg \ - 24/gimp-scale.svg \ + 24/gimp-scale.svg \ 24/gimp-selection.svg \ 24/gimp-symmetry.svg \ 24/gimp-template.svg \ @@ -421,6 +423,7 @@ icons16_images = \ 16/gimp-channels.png \ 16/gimp-color-pick-from-screen.png \ 16/gimp-color-cmyk.png \ + 16/gimp-color-palette.png \ 16/gimp-color-triangle.png \ 16/gimp-color-water.png \ 16/gimp-colormap.png \ @@ -670,6 +673,7 @@ icons24_images = \ 24/gimp-channel.png \ 24/gimp-channels.png \ 24/gimp-colormap.png \ + 24/gimp-color-palette.png \ 24/gimp-controller-keyboard.png \ 24/gimp-controller-linux-input.png \ 24/gimp-controller-midi.png \ diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c index 774928e90e..13a5c9e434 100644 --- a/libgimpwidgets/gimpicons.c +++ b/libgimpwidgets/gimpicons.c @@ -120,6 +120,7 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_CMYK, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_WATER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_COLOR_PALETTE NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_COLOR_PICK_FROM_SCREEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN }, diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index 5c6388af63..4b6f9297a4 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -95,6 +95,7 @@ G_BEGIN_DECLS #define GIMP_STOCK_COLOR_TRIANGLE "gimp-color-triangle" #define GIMP_STOCK_COLOR_CMYK "gimp-color-cmyk" #define GIMP_STOCK_COLOR_WATER "gimp-color-water" +#define GIMP_STOCK_COLOR_PALETTE "gimp-color-palette" #define GIMP_STOCK_COLOR_PICK_FROM_SCREEN "gimp-color-pick-from-screen" #define GIMP_STOCK_CHAR_PICKER "gimp-char-picker" @@ -294,7 +295,6 @@ G_BEGIN_DECLS #define GIMP_STOCK_FONT GTK_STOCK_SELECT_FONT #define GIMP_STOCK_GRADIENT GIMP_STOCK_TOOL_BLEND #define GIMP_STOCK_MYPAINT_BRUSH GIMP_STOCK_TOOL_MYPAINT_BRUSH -#define GIMP_STOCK_PALETTE GTK_STOCK_SELECT_COLOR #define GIMP_STOCK_PATTERN GIMP_STOCK_TOOL_BUCKET_FILL #define GIMP_STOCK_CONTROLLER_MOUSE GIMP_STOCK_CURSOR #define GIMP_STOCK_CONVERT_PRECISION GIMP_STOCK_CONVERT_RGB