From a91adeb5fb2f7c32b6427bd5e0ce79132c413525 Mon Sep 17 00:00:00 2001 From: klausstaedtler Date: Wed, 1 Jun 2016 19:41:47 +0200 Subject: [PATCH] icons: symbolic-scalable add 'pixel-perfect' 24px vectorial twins (as replacement for 22px) gimp-prefs-folders-dynamics gimp-prefs-folders-environ gimp-prefs-folders-fonts gimp-prefs-folders-gradients gimp-prefs-folders-icon-themes gimp-prefs-folders-interp gimp-prefs-folders-modules symbolic-scalable & color-scalable add new icons gimp-color-cmyk gimp-color-water patch color-selector-cmyk.c color-selector-water.c gimpicons.c This is the first patch to solve Bug 759904 many more have to follow Thanks to Jehan for the assistance --- icons/Color/16/gimp-color-cmyk.png | Bin 0 -> 684 bytes icons/Color/16/gimp-color-water.png | Bin 0 -> 963 bytes icons/Color/scalable/gimp-color-cmyk.svg | 177 +++++++++ icons/Color/scalable/gimp-color-water.svg | 209 +++++++++++ icons/Prototype/Color/16/gimp-cmyk.png | Bin 778 -> 0 bytes icons/Prototype/Color/16/gimp-water-color.png | Bin 972 -> 0 bytes icons/Prototype/Symbolic/16/gimp-cmyk.png | Bin 721 -> 0 bytes .../Symbolic/16/gimp-water-color.png | Bin 1008 -> 0 bytes icons/Symbolic/16/gimp-color-cmyk.png | Bin 0 -> 582 bytes icons/Symbolic/16/gimp-color-water.png | Bin 0 -> 860 bytes icons/Symbolic/24/gimp-histogram.svg | 27 +- .../24/gimp-prefs-folders-palettes.svg | 180 ++++++++++ .../24/gimp-prefs-folders-patterns.svg | 337 ++++++++++++++++++ .../24/gimp-prefs-folders-plug-ins.svg | 150 ++++++++ .../24/gimp-prefs-folders-scripts.svg | 150 ++++++++ .../Symbolic/24/gimp-prefs-folders-themes.svg | 146 ++++++++ .../48/gimp-prefs-folders-palettes.png | Bin 1115 -> 1107 bytes .../48/gimp-prefs-folders-patterns.png | Bin 628 -> 689 bytes .../48/gimp-prefs-folders-plug-ins.png | Bin 664 -> 694 bytes .../48/gimp-prefs-folders-scripts.png | Bin 926 -> 900 bytes .../Symbolic/48/gimp-prefs-folders-themes.png | Bin 1573 -> 1644 bytes icons/Symbolic/scalable/gimp-color-cmyk.svg | 164 +++++++++ icons/Symbolic/scalable/gimp-color-water.svg | 150 ++++++++ icons/Symbolic/scalable/gimp-histogram.svg | 41 +-- icons/icon-list.mk | 4 + libgimpwidgets/gimpicons.h | 2 + modules/color-selector-cmyk.c | 2 +- modules/color-selector-water.c | 2 +- 28 files changed, 1693 insertions(+), 48 deletions(-) create mode 100644 icons/Color/16/gimp-color-cmyk.png create mode 100644 icons/Color/16/gimp-color-water.png create mode 100644 icons/Color/scalable/gimp-color-cmyk.svg create mode 100644 icons/Color/scalable/gimp-color-water.svg delete mode 100644 icons/Prototype/Color/16/gimp-cmyk.png delete mode 100644 icons/Prototype/Color/16/gimp-water-color.png delete mode 100644 icons/Prototype/Symbolic/16/gimp-cmyk.png delete mode 100644 icons/Prototype/Symbolic/16/gimp-water-color.png create mode 100644 icons/Symbolic/16/gimp-color-cmyk.png create mode 100644 icons/Symbolic/16/gimp-color-water.png create mode 100644 icons/Symbolic/24/gimp-prefs-folders-palettes.svg create mode 100644 icons/Symbolic/24/gimp-prefs-folders-patterns.svg create mode 100644 icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg create mode 100644 icons/Symbolic/24/gimp-prefs-folders-scripts.svg create mode 100644 icons/Symbolic/24/gimp-prefs-folders-themes.svg create mode 100644 icons/Symbolic/scalable/gimp-color-cmyk.svg create mode 100644 icons/Symbolic/scalable/gimp-color-water.svg diff --git a/icons/Color/16/gimp-color-cmyk.png b/icons/Color/16/gimp-color-cmyk.png new file mode 100644 index 0000000000000000000000000000000000000000..6733fa35c901a182290691cf16220295a9c389d3 GIT binary patch literal 684 zcmV;d0#p5oP)L_t(Ijir*kOIu+W#ed0r>y@Obl-v@G6(yq%CF&3)e}G?09CT9<9UL5r;83Ip z{uNFMP9}&*rX(P#6bu!b+Mr0Fp^J`}uX!1Nr+HximA{XbDtXbwR*L@{F&k5 zE_!-SDHNKSp8mnm(1}UUGJAN;adSWY<+}|=M#>BfoRH7!w6*=l<+=fIw-fd7S@vF6!4>L2oSzKhtOk)^^q*5u_+}squ z-`^;<8i*h(E4()hK31!>-ZUr_3KEOOL@D);!R=23`ucEpc5-U7JRoE;8Dg;*kw^qh z(=42w|HS(GI`Md%a5#)o%1WAXi$yAl1YgWv1W`(f$K$ET_Ikad>$>$09)dquwDJ$9 S-F*%K0000PU0S^_{vOilwBac8 zLs6;r)t#M0_=q6h=K@bSOZL{&#bRk+GMO|bfUpan1;;P6tbgZSq-8-Q zLj0*7%$G)~yf{MRjt&qWJXkzb`@Sa-ns_7-2)qX%Mn*>3#PVV$daxH^n%sM!o4PNK zE8SlsR(G{3SIXt-Zoh3z;VK`K^Pd+S$G2N^UF+4_lV2lD6D`)j`0H=0+_zUn)pB^H zs~v#BR0iGa@kb*AYf zR0e>)L>u9t&g``%e_r)Cwtddi=vx*`3+&avFm5(?aC1WkvF@GB%q{ZWWS0LR;J#=L z`?npMRmJLNR|#zjwN7JoQ=zfBsfK4CYrY!+mh08De?LHJ%B@u8?-z{at67S>V$6i& z|4UE|O*9pq0x`3}7D8OpG|l(v^;q5E%gY+KPG9Ef*B-tr!F2Yzd1_@;w`GBr#T^x0 zF)G3PQNy-%NKNv`uUX1Jeh)x6sMDX^PJePc;h>J=SY+mo>b5K(T^;>Khb^W2SSAvQ zUt~ajxpikf8&_uO`=P>HpNx^q-2lLG9cKO<=YzQflWPaD#-cnhpIpGzPjq&6PHO@@r}yHOydZQBE50~NK|~G_jF#A7Kk8~SI8Z8;j@%~G>ZDSsEmF!pDXPyay!A>c lgs^i;8DF`sd+bh~{{k4NYAuDts4oBj002ovPDHLkV1kN9w;=!k literal 0 HcmV?d00001 diff --git a/icons/Color/scalable/gimp-color-cmyk.svg b/icons/Color/scalable/gimp-color-cmyk.svg new file mode 100644 index 0000000000..343e3f54c5 --- /dev/null +++ b/icons/Color/scalable/gimp-color-cmyk.svg @@ -0,0 +1,177 @@ + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + C + M + K + Y + + + + diff --git a/icons/Color/scalable/gimp-color-water.svg b/icons/Color/scalable/gimp-color-water.svg new file mode 100644 index 0000000000..669ede63eb --- /dev/null +++ b/icons/Color/scalable/gimp-color-water.svg @@ -0,0 +1,209 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Prototype/Color/16/gimp-cmyk.png b/icons/Prototype/Color/16/gimp-cmyk.png deleted file mode 100644 index 16eb5d87d91ce3492a7d133bd6d263ef197a26c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 778 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1TKL5e~$ zOL9^f+%t0v6rA&O@{3Ya6g-pj^AtidQgc&%XX=#!6^elrI+m7Xq}XAh+O#CdAY{c>*Mo{T%(ex1HGNzh7&LjgbJgXT5RHll ztgA!oPwg=AWvzh$m$!h(|RjutUV z1s{51{Fd+iYcA(6dZ2y1(V-KG+`5}iJW@QMvH15krqQ9W zYn^v}{eFkNa#B)42ck+l6!z{-*}m<@`l~BgoA+2-J=)EYB++){abe-k7@_{-sv=x> za|3iftzO&9fBEvB$cTjFUda+|IeB@fe*M}tW7$oeZPFbIr%&%O=drt%_4S_7iRYgu zd8oK(mY#la-=F2zuMefAh3_`lDx_?V6zXKz7{TLvIcLt~|1L%|Q<9ULGfcXIPWeR@ zag%O}@lA1?TbPkPrePpboFyt=akR{06}$4 ABme*a diff --git a/icons/Prototype/Color/16/gimp-water-color.png b/icons/Prototype/Color/16/gimp-water-color.png deleted file mode 100644 index 40b198c1d07f336185b0c862ea74e84738f00682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 972 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 m!lpO_m=KXC<#Ks;Gye}~8fNRrhgkvu0000 - - diff --git a/icons/Symbolic/24/gimp-prefs-folders-palettes.svg b/icons/Symbolic/24/gimp-prefs-folders-palettes.svg new file mode 100644 index 0000000000..0cb8bb8395 --- /dev/null +++ b/icons/Symbolic/24/gimp-prefs-folders-palettes.svg @@ -0,0 +1,180 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/24/gimp-prefs-folders-patterns.svg b/icons/Symbolic/24/gimp-prefs-folders-patterns.svg new file mode 100644 index 0000000000..27f3cc7a8e --- /dev/null +++ b/icons/Symbolic/24/gimp-prefs-folders-patterns.svg @@ -0,0 +1,337 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg b/icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg new file mode 100644 index 0000000000..e7692c0043 --- /dev/null +++ b/icons/Symbolic/24/gimp-prefs-folders-plug-ins.svg @@ -0,0 +1,150 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/24/gimp-prefs-folders-scripts.svg b/icons/Symbolic/24/gimp-prefs-folders-scripts.svg new file mode 100644 index 0000000000..5b69f489d2 --- /dev/null +++ b/icons/Symbolic/24/gimp-prefs-folders-scripts.svg @@ -0,0 +1,150 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/24/gimp-prefs-folders-themes.svg b/icons/Symbolic/24/gimp-prefs-folders-themes.svg new file mode 100644 index 0000000000..b7bc943754 --- /dev/null +++ b/icons/Symbolic/24/gimp-prefs-folders-themes.svg @@ -0,0 +1,146 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/48/gimp-prefs-folders-palettes.png b/icons/Symbolic/48/gimp-prefs-folders-palettes.png index 7f5d89f38e2b41d825f3197dcff0256c677e11c7..08775270647e552eb36ea3e3e75b2c9e988421ae 100644 GIT binary patch delta 1026 zcmV+d1pWKl2-66VI}06$0013_0gvVJWsycGe_(V)Sad{Xb7OL8aCB*JZU9MbVP|D? zAa8PMXK8L>Y;1WTV{&C-bY)~9VRImKXk{QGL2`5;Ole|rWg;MHV{dLCb7gccAVqj| zWo~3;WFTQ~WFTQ=Z*X*FWFTg5av(=ZO;9FWB!U0{17t}=K~!jg?U})g8)X>AfA2R< ze|A$_utGs8{RbAsJ(d+*CV}?g9t2?z)$^Wu(n~z(K@sdh3VK=vy|g{l`rH151G+4$(PJbGEGzV2O-0}-#p*@%zQKRz(}LfcpvxxsF072 zs(w_f)jrL6{8SjGYaXB?A|KAEpUfDhe``Kr78eWVZme6)z^KIZQ;4E-fMBW6xZ#J73ecx}3$X99g;^to$ zk(cP5*i*oZs`^^1)vCDkG8<6Ue_H_YnSWu#kaJNKCGq!GTD|zpmj>%1QtEcQD=xjv z28=O3$D5bOG<7B3JV>k8w`_*!s}1QD^%zxvPNy>y{V)u1>1CcEilPH+suH5jZ%e^GQChGDX7 zhxGDX;w@|KYPDMZ#q+#ZMdVxH@A!8|L{@#@zi+KwRn@JudcN=fv%I`~S5LFbJzF%u1hb^dtgabcdfM>>+9=nU~_OlJlQT#&Z4)rw$=uI%%Yd~O?*LB_pP;G z(tETW0EA)qisyM(<1>|}fBC8P@)`grtLio2TC&3!gX&OdJp#6Y+d&W<0F+9lm+7tN zE&hMArq!F7fi%oIGYwH>oc=H4xCX@WV1s<=6)4ug_PFK~GGwNa6lNgFI4Q|8_Av@G z(3hFgFflVZ=gE8EESV-V6=t9><4hz?W^z%Ofxe8BhKZTUMUhKrY|C1^I%!ab%rp|G zft{V5)5-SU-rjRLw3CeEG?6hgjl}thNmXwGbz_XE>UH31&N+@nWLBAJh(-8DHkPO2 wF**$=2Ih?cI`eK~3OYtaK4CFUbbycl1?keMe#{dFcK`qY07*qoM6N<$g5yZ@wEzGB delta 1034 zcmV+l1oivV2-^sdI}0g>001e50V3?*jFCnte;;&3SaeirbZlh+M{aLzWgt^|ZDMb1 zX=5NsV{dLCRA^;wWsamNs{jB4tw}^dRA_sq4y7T7EhxK~>Ljacm6c7(B5m_#kN}t3$J`oHg z6Au6dl1s;=Co&8q6Yt_UIAXyVR^j8qiGg8*^?F@~Eg}GaiO9R9Qt2D7U=}*?7|Bol zf>|&C0FV0xvSPp&CkBR%oL_+C2hC>lf3tGA+743xI;Q~40l0A(dnBBp)_@0g0K8Bv7JuoR z-vqF!wf%^9Zy`#yz^pp@Do`69x1A~t874%~DLRjbv}$;rvf0A2$ie1a8@c6!?LVdl4nfQ6vuIP8jZ%CN~O~E;*8t@5xMP-CnhGA z0lWv`2>_=_zJEC9;&%V>L7bLl&E|5s8Phb!0OWJI+>B*evwobB4H$;;n>!}?dViec z8$Ca_V{o4F;Ow1yh%@PB)N6w~e{ct_Rx2{UX`27x?49f9j9j4G?VfeVB66!gPV#83 zP$-=3j|Xu&jZ$8qkiudn~^$Lae}Un~~sj{9=q7lu}pwf5abQadB~<cU2Ym_)7h(*T~0QzT6T6YX~UN>Gy4I)?`j@=;GY00RtEtJP5ebg0#8V{wQN@y^=X z+C>rZ6sNV$i^z8(qT&`9^oi*sk~aXH7m>h!G5|l5Tro}ahuz&>dunQG+HsucNL~Oi zlY}@6-^d0c>u=^x3=ACxfYz`@BtXj`c@^0-(E@P!A9RP9lJ}|lhyVZp07*qoM6N<$ Eg340j%K!iX diff --git a/icons/Symbolic/48/gimp-prefs-folders-patterns.png b/icons/Symbolic/48/gimp-prefs-folders-patterns.png index 800b4f55222e98b8f7cf1e3264ddaefa55e05e64..218455e416c70e9abbee17a0eaf7eb93745545fc 100644 GIT binary patch delta 605 zcmV-j0;2u&1hEB>I}06$0013_0gvVJWsycGe_(V)Sad{Xb7OL8aCB*JZU9MbVP|D? zAa8PMXK8L>Y;1WTV{&C-bY)~9VRImKXk{QGL2`5;Ole|rWg;MHV{dLCb7gccAVqj| zWo~3;WFTQ~WFTQ=Z*X*FWFTg5av(=ZO;9FWB!U0{0m4Z{K~!jg?U*r6!$1&4|Exd| zf73t()RdgUHfKncQ&5Eh3J?-05H%HtNR`5yON2W_N<(J^L_@N{ud==C z@&BH`Udg1jz5;L!po4Ox%zPWi@k7b`E1^(LJOFfv=%yw;&L~t9Z>Xb2DU`1V*TvR= zZ%Av+zD2CyjhQdwIDW|+l+b}gB6_q9e@ZX_07td~DF&=;4ftlqHb6xE*=+XI?RGz! z6y%Dv0}{joOAJU54{Y)pSY!=%?004!NbbNs5%nb-0DwK|2IMbd@dgTig$z*?(SHbW z#e5ap*8zjp`W!&=b2^El=)%XG(guiVmzj@$PN%-+v^PQkCPZ`!0Q33$(_GB9f18LQcyU+Z~4C6adEK@kw3`TInT(u-%hYaVi>{ z+6@$GcQz`vI2Daemi9)dOuIAW#;HV|`Zls6?KUinlS>_-%@KlS18TZX?HgIsb({^X z+usTCYrtw?I2;D%cr+RvG$Y3yM{9(FAb3uaq_31BW*#&t%7tZrr+WZ;%xe|-KWy$A rkite7NPUZ_K&pu79x_d&0Pem4ER_(tmIcAb00000NkvXXu0mjfolFA# delta 544 zcmV+*0^j|y1@r`vI}0g>001e50V3?*jFCnte;;&3SaeirbZlh+M{aLzWgt^|ZDMb1 zX=5NsV{dLCRA^;wWsamNs{jB2#z{m$RA_}S7RuKLx5dtYZ%Av+zD4}O7c*bS zar{=aC?SDkB6_hcN-zKbC$62t=~1|*0F zN-AWsrH5V0%wx$naX>^P$p!!*kZwT!e>ouDK&7XUNfbr&A3|I(pNirW5O2V_LOELN zO91by%UKjfS6%Hf*J>LeqJ3sQU0u$7?dflY0L+N!900N`TjnpCaWnHrzK5AFwAT5z zXI8~&PL^d$rPOC*17R5cpdj+ixWh1<13;1_XGJw|owG8x-q-62ttpG!*f#sCe@+$W zv~Qp+?i{l!wmMarvq^s|R3~nO!aCKM)80W=CGMQEI=RdN`dlGc4xp~*w0@9vJ*R&a z+P2?_tO-melLG*lPN#?6$#KVOU@#cmBuR1<1i@{Wf?SdCA6Y5lZ{nQ+-zWg7ZxIbh i6%jo_rim25<1g~h4#CY;1WTV{&C-bY)~9VRImKXk{QGL2`5;Ole|rWg;MHV{dLCb7gccAVqj| zWo~3;WFTQ~WFTQ=Z*X*FWFTg5av(=ZO;9FWB!U0{0mn&1K~!jg?U}(!!$1&*{|SPc ze~ReMS5WWX(=GS}_T)PVUaSYDC(;VM71mpJd8%8y?(!68V-kR z%)AfaRakR*=AV!hB08*8D!s9#N3Hce5uHftX4V1E^Li7O2hzGW&j5hJK>nmYf5hc- znP&a2QmPK1J}EZqxnq3?3Ilml7|0vxF7!e~%JaN;NfE8}0THzTl;Y+}J8&x%4*);+ zq1fU9xq)Y4e#myx#Ce&4#4k%y1G~cfkf)@HQUgbwPG?J41I*k2@R=l6x(n?v^P4f| zcOlMQC`2jc16UtlEAB$Ju($?%Oy76I&+T?Q(IJxskwfgd?w!`U<~R;9b2Cd(aj@Y( wvZ*ZY4A{a#7zpwfAs}#wr~x}o1OP6-0o)#VS}{e9tN;K207*qoM6N<$f;~Y4CIA2c delta 580 zcmV-K0=xaT1(*epI}0g>001e50V3?*jFCnte;;&3SaeirbZlh+M{aLzWgt^|ZDMb1 zX=5NsV{dLCRA^;wWsamNs{jB2>PbXFRA_iqdmvM8kvfv12+ITB;caTtatCG}Qxurm+fiO5k!ehSmU&islhYLueW)Pt*{ z4bU{Alrl}5_y^yNF%QEqeEqjc7gpegh`h*}bRhu1&8!Jm0%Xz#Xqug@2@yG%PNy&X z{r;~y4HYGG1za!>YXZ1n9@e}<7unFwe=ae`9J}1ao`@W|900(pJHT0*ru%Um@5XVw zo2KbLaAs35R}WN$hzz1Anq3%rr?nm!V}6vaS?dY}K`_fRRs`33pbgMC|D}n0y`EHY zf1VB0`4wmbG>!8CYTb#~F&>Za0KY}#XSds(PbQP^d33e`K8i>f1i=@ZB1)+zf57SL zda+pG`+hF1?JM-k*8Dm5%L;7+e6ZB7xLsDbDNQ^tE3^%8*HRCFh`cSUwGHqpczYIdf$a@291gnxqtWPE zeRhhI8Nm1bM_TLap65NT(@;@dF8D{bmhJ5USJ;XGNz*1QNID|&95+KGz_UL?XNMSD SO>R8^0000Y;1WTV{&C-bY)~9VRImKXk{QGL2`5;Ole|rWg;MHV{dLCb7gccAVqj| zWo~3;WFTQ~WFTQ=Z*X*FWFTg5av(=ZO;9FWB!U0{0+mTbK~!jg?U_HQ(@+$~zmoFMz`}9_%zVdn-TO=4p9%x% z!~=juL^l=bSr`N9#7k7nu@uIt9;}MBe}Pp)LI_^9h(EB)%-3Akefhh=Jak}#h#tfZ z=D`2}9Ecmpi-B0y23Cz3H$X(q@p$~OUax=8QqZErb|4Spfdm725D)y%Yaq%$xMPRR zyp`t;>?5M43Imq`d{Z#bGVD!lz;T>cM0ApwKdMl)C`uw!tyVu-mURli3l;M%e}b|# zP%f7P$8oM8<4C18;QM~t_x%ldopq#A8(`*h%>2IJ@1K^nEF+~VLWd2*7Db6z(=f1)#aZaYe{?$C5kfR%L1m;eJIpb2pkv;@K2E1#r%))IuT(0Z zWx@CTqd^d~iRgIR$#r&s0X&&ZCgpkYLWoPuysbh!psxdC0Gp2Eyp@H~Xk>+9_y|BF z{zjF7ognSt5CU wGY4R8VD%UPw4Bp3A~1;P93Jv%A^>prCmhZMWrjhpD*ylh07*qoM6N<$g5a=ra{vGU delta 844 zcmV-S1GD^u2c8FzI}0g>001e50V3?*jFCnte;;&3SaeirbZlh+M{aLzWgt^|ZDMb1 zX=5NsV{dLCRA^;wWsamNs{jB3@JU2LRA_}(#gR;gJPFD zc@-`x9UKIg+eBRKAX@Mb=+IhPL=lRLTOCSut02fhk@oW5QaW`g3hquKCn!jXcOLmU zf5<^hFKv47;_005<+m&Cbr=_GvBmrd#;_Bh6)@cqM0x;4FLe)P?(UG z0HN##NSaKTKty+Iwc3+%x!mZcp`8+1e}OcZ2et^12J^rcQ^?Oh`m%GGc`D6KoF}4* zGzS2Hyix#Wz5w8}CNmwO6u`FaN;aE431C)}pBfA1H% z)f>8cU?h{ttUHc#F(|~{8#-TPhl%Ko5aQ*^%F2Gf5N9>wcoSc0G#c+6$2k`i;;2Sk zONk>yB!v*q78VwAenEFN;#>AkrBd0~)6?@1z;yt$d1&Y8 z3h*kI%UvrLi$8*bl(NXoa{!KNy4PQ*2KWMC)UvF%L1A@uHSfCaeP+Ice;6OvDgitq zI#nu_z6J#$#97yM=ZNT-!u2De5}*+@FQwe;dEO*|+eBn4Ig5x&fV%%c2r@OG^11z!-Dejk&rI zVgSHAGk4v13zh%K>iF|aHqUK$Vw|Y-K-kpkDrw(Z{67M?Nt;l>HHhc|(iy@9F#Q|J WlL}vn@v*P~0000Y;1WTV{&C-bY)~9VRImKXk{QGL2`5;Ole|rWg;MHV{dLCb7gccAVqj| zWo~3;WFTQ~WFTQ=Z*X*FWFTg5av(=ZO;9FWB!U0{1${|GK~!jg?OI)I6jc=d&Yjs^ ze_W%hBuWCJ50Dt5K0x{+G{DTX*|nuDJXlLKkoptE2h(U2kc2cq1Z*NAf-fq;5Q#QG zq)IH?J9k4!3`s>2Nq`6mMv12UBwZ}+cDDEUz;4|%JKeTSS!?)`P3GS3+;h&CJNMqR zGeb(Lx0!hzfcr2p^aI##+xCYO9Dhd;e|MNXa%0yAl+U;!aA(Qq5rmHkL6j?SP`D?c z+#uI=ZqR&p;_K^RLXje}{-} zl(3s_7{(fAo)$as%Z6KnS z92aHgLsH5Gwrw8*@CE>V*943a=V#2AvAm|HCJg|lX&xq`s|EanM0CV;-KT8Z{)(Af z0B|u!Wf5Rm*2VVr_FGD+HrI6jh@h0UT9I&2=1SAAr_kz5-tZ%-qe) z*L>*90HBmInRzcWuLSUlf9tw0*|vSGtE;QtFpTe*`Qe=Xqs;sXfCLeJthHW8MA1nV zVB7YarEIj;&k@neTr&jV%VaY7VpUaDr<8Iz5go zfU%&vyE|lA)*nKMWdN=eP*EYoW@e^b^6N)S9w?K5bUM9QDYe?Ntjm!|q!z$mIqCv{ zCL&@fHzMPLB<%yr$2ZQI`iXvh=Q)z#+!Y#ME_QtAXVA1O;U zT7VFM7G^${yXTvjxh79~p7%jK9zUy;+RDt2=lgBjUL}P1e{E=Js66F#9z^tWUteD% z5iv7UDwTQ~z=}K{3WfFqI19iAP;_UTGyzJf$F$b(<&t~fah&1ZMr(bBhz^9q;dg6m zYyXx~E+C@QN~v+j@fFa~(GjhytGfjN-QC^MbUHmQ$6D*XL}USg5Mma9<$12Es_Hs` zwaiRPsU1Rye?b7J$DKV!*+!$$=&s|(kI$4+&Pu1#yGuDLsPXgdnFY;RBkgmyOdEi; z<4JfVd<76ulWCe4i0C|k#!`-mX#R+h3IG5}MNUMnLSTZR;oQ{# delta 1496 zcmV;}1t001e50V3?*jFCnte;;&3SaeirbZlh+M{aLzWgt^|ZDMb1 zX=5NsV{dLCRA^;wWsamNs{jB6cS%G+RA_>Tt5mR3 ze+5e`m1u;-#{A6Yo<6u6wqYi_i4(UAey}k2erL`(ANTLf%#u>-EoR;fU>2r_AppBA z%lcrN_umo39VU;=y)6OdGi3I|8MUJTQrX zQb-<{WD4cte|p#r0oYy2i+C1*mQoe~0J933LWO{te`n^sM06vM-5kR(HZt>~AmRol zfQWY6w%uNcty1a=fQ}&I1~~#Q07xnK3n3PG*=VgV*|yyTARScPzyxF=gm{9Pf1mc@ zLIB{pt_X#K30;&$Ohn|-ciwf~XSCMM0EP?o75E4g6f_hfW*%=7(XRmN;_>)(0OuUX zxeVZ20MWd@f=uriNuXmDz$}~e=Mo)p)Uh~QYysE`jyu&wM&;klUe@{@AnKH?@OqM)QBmn~h1Iv|C8%)!@9F0b60bI>c7XYjyB9>BaW#+B+ zpuN34($LT_+S%Ee_o2cITI+p8WCDN?Vjh4sS+1(8st>>>W+tW79wEdifYZ~7<1}*q4+1;LnE5rO)T(UTvaIi7vDo}rEH>Y^ z?c=$&D^{#n4&bFA;s$vVN16GM<2YYsJ1QzF+=_|{ccLLP`#vI06*Kagm6_MuwtX~c zzqv>zlZy?*I1$3_*VIA(*Wq(1Wz2Qmu4ptmG>M(>Lf1z>jEsy70Dxf_O#p^MLWnl4 y_1g$g1QE>!@M$CxLGJsXAP|W}vX?_dwC7*Pv17CuaU4_t0000 + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + C + M + K + + diff --git a/icons/Symbolic/scalable/gimp-color-water.svg b/icons/Symbolic/scalable/gimp-color-water.svg new file mode 100644 index 0000000000..7165537ab6 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-color-water.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-histogram.svg b/icons/Symbolic/scalable/gimp-histogram.svg index b098f64063..c0fb2ef833 100644 --- a/icons/Symbolic/scalable/gimp-histogram.svg +++ b/icons/Symbolic/scalable/gimp-histogram.svg @@ -9,9 +9,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - viewBox="0 0 16.000001 16.000017" + viewBox="0 0 16.000001 16" id="svg7384" - height="16.000017" + height="16" width="16.000002" version="1.1" inkscape:version="0.92pre1 unknown" @@ -28,14 +28,18 @@ inkscape:window-width="501" inkscape:window-height="405" id="namedview1511" - showgrid="false" + showgrid="true" inkscape:zoom="14.749984" - inkscape:cx="12.137133" - inkscape:cy="9.6610276" + inkscape:cx="-14.335283" + inkscape:cy="9.2203492" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="0" - inkscape:current-layer="svg7384" /> + inkscape:current-layer="svg7384"> + + @@ -66,16 +70,7 @@ style="stop-color:#bebebe;stop-opacity:1;" /> - - + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccccc" /> diff --git a/icons/icon-list.mk b/icons/icon-list.mk index a16691d186..d6843ad203 100644 --- a/icons/icon-list.mk +++ b/icons/icon-list.mk @@ -19,7 +19,9 @@ scalable_images = \ scalable/gimp-color-picker-gray.svg \ scalable/gimp-color-picker-white.svg \ scalable/gimp-color-pick-from-screen.svg \ + scalable/gimp-color-cmyk.svg \ scalable/gimp-color-triangle.svg \ + scalable/gimp-color-palette.svg \ scalable/gimp-controller-keyboard.svg \ scalable/gimp-controller-linux-input.svg \ scalable/gimp-controller-midi.svg \ @@ -410,7 +412,9 @@ icons16_images = \ 16/gimp-channel.png \ 16/gimp-channels.png \ 16/gimp-color-pick-from-screen.png \ + 16/gimp-color-cmyk.png \ 16/gimp-color-triangle.png \ + 16/gimp-color-water.png \ 16/gimp-colormap.png \ 16/gimp-controller-keyboard.png \ 16/gimp-controller-linux-input.png \ diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index 09c7efc363..5c6388af63 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -93,6 +93,8 @@ G_BEGIN_DECLS #define GIMP_STOCK_COLOR_PICKER_GRAY "gimp-color-picker-gray" #define GIMP_STOCK_COLOR_PICKER_WHITE "gimp-color-picker-white" #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_PICK_FROM_SCREEN "gimp-color-pick-from-screen" #define GIMP_STOCK_CHAR_PICKER "gimp-char-picker" diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c index b9e1107918..c2e8fda3ff 100644 --- a/modules/color-selector-cmyk.c +++ b/modules/color-selector-cmyk.c @@ -115,7 +115,7 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass) selector_class->name = _("CMYK"); selector_class->help_id = "gimp-colorselector-cmyk"; - selector_class->icon_name = "document-print"; /* FIXME */ + selector_class->icon_name = GIMP_STOCK_COLOR_CMYK; selector_class->set_color = colorsel_cmyk_set_color; selector_class->set_config = colorsel_cmyk_set_config; } diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c index f714374aa6..25ffde69f3 100644 --- a/modules/color-selector-water.c +++ b/modules/color-selector-water.c @@ -131,7 +131,7 @@ colorsel_water_class_init (ColorselWaterClass *klass) selector_class->name = _("Watercolor"); selector_class->help_id = "gimp-colorselector-watercolor"; - selector_class->icon_name = GIMP_STOCK_TOOL_PAINTBRUSH; + selector_class->icon_name = GIMP_STOCK_COLOR_WATER; selector_class->set_config = colorsel_water_set_config; }