From 0daea6659747ce4b0eeecbf56dcd37cae4a6c0ba Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 28 Dec 2015 14:43:37 +0100 Subject: [PATCH] Adding the Absolute entry for monitor rendering intent + icons updated --- .../images/Dark/actions/intent-absolute.png | Bin 464 -> 670 bytes .../images/Dark/actions/intent-perceptual.png | Bin 666 -> 898 bytes .../images/Dark/actions/intent-relative.png | Bin 944 -> 1072 bytes .../images/Dark/actions/intent-saturation.png | Bin 809 -> 1012 bytes rtdata/images/Dark/actions/softProof.png | Bin 827 -> 842 bytes .../images/Light/actions/intent-absolute.png | Bin 445 -> 674 bytes .../Light/actions/intent-perceptual.png | Bin 638 -> 847 bytes .../images/Light/actions/intent-relative.png | Bin 882 -> 1057 bytes .../Light/actions/intent-saturation.png | Bin 779 -> 1007 bytes rtdata/images/Light/actions/softProof.png | Bin 868 -> 915 bytes rtgui/editorpanel.cc | 10 +- rtgui/popupcommon.h | 2 +- .../source_icons/scalable/intent-absolute.svg | 122 +++++++++++------- .../scalable/intent-perceptual.svg | 70 +++++----- .../source_icons/scalable/intent-relative.svg | 53 +++++--- .../scalable/intent-saturation.svg | 72 +++++------ tools/source_icons/scalable/softProof.svg | 4 +- 17 files changed, 182 insertions(+), 151 deletions(-) diff --git a/rtdata/images/Dark/actions/intent-absolute.png b/rtdata/images/Dark/actions/intent-absolute.png index bb7e1a85d0cf0b4a131e3dc02ef8e74161a5f367..7732eba534d0ac33ee87d0275054fa27426bcb94 100644 GIT binary patch delta 572 zcmV-C0>k~#1D*wtZGQqANklPv`rxu3axWCQ#04v zws_kX?b^4OHZ58O(b`222!R`6m_JBFE{mWb5*LvKDm=t=NPX{~7C9i2j*}1ituFT* ze&4<49ynJ3TCLW_y}i8%Ac~?LYwbpi4WyN+j<2c^xtZTK}porWw z#@q!i0h_?Ab8fy|E~mZRFH@RIXQXOIaeqY3Ol7zX$$x(s8g;-A~M$P+Pz9uzgDZ& zrw%|w)>O5aH$+6%^7cF$2GDFaABGSv=WT9`S*}znFMmwl#{W&7?uu1)v|Dn|<|5y# z)#|JRP}Qr(m}_}MLI`K__B>JoP_Nf-i^y=d7nI>ZhHo+>D!5^^6BLsI-rd03| z(%VX~wa+_fnQoJ{vq>Q-v{A9L(sVJh2)p-MsAXU-jCkt9_rYc6&JX}(S=M4^4@G9P z+0$@1nNv2Yqmzu&J^ zlAk_5oK+~hKtB+uh+YF0AQ_6wC_nsthM(5z9qFh=2D#+XYC5s|3d?M9VK<%A1B02+S5@_fh=f2FxCb=Li7Gt?d|ROr9~!bwOVgD=Qe@QRP{9x8K`R8dw)L+!-G<(H27DMDaQY4jOi^cEyZhV zYrWH(s@1AlUw>c!C`ppr#+X|`AR?-&T@m?fv`$qYmCNO?0|0C77o0NQdrut4G#U-3 zs?SvQv50hxF^{da9pGSVYwO3|-QA@i2yUin`Yv$U7?Yc*5dj1M&beYVvNbFYG%ro!*aQNXD*Rh?Ck9178Vwkz4znm%49PA&CShU1Au0;`K9;% zor@4N#*Cj;^(Wx&$df@31Q!w^lcZ@nfH^&x#jwkklO)NG-o0>L=VfHPwf35GZUwjw zyanWez<+y>wRXJTdw&Sr3E=E7T5I!Zn&yXHQvj}r$Vwc?c>w1efCG+!M?fSZJ?C7{ zT03sxG)@1RlhecKy&oGWA}R12@K8iLz>_3NI*W^oPfMjzTC3GA6$*t9z4xoYbyXdA zmx%lV{4jMGN3n8pa?+a?fYoZ%6pO`=o6Y8JRe${i2#hgjV#OHKgE@__*XwTvLGUTV zfK=6iG3I;VzP0w@%z&K5(a}+Oe0+Q+>P2KXm&<)yEEfC!Rb%Q;OI35mnAd?Ds=5k< zA`+?Uy)X=$8yg#)a~*xisD(dg!gvuuRRMli)$f3IyWM_JtycX!#a|FPZG0w^d7jN? fqZ(=dlK;cse2jX}&U8Ab00000NkvXXu0mjfML(4T delta 567 zcmV-70?7S>2bu+tZhsd^L_t(YiM5t7XcSQphQBwn=UyR16e~MPh~U{;9h`8StCkii zLcl`O+NZnD!p>4mD^^xw?s5kygdi3oTnf=9a@be|P6CGAw{L865M=jq8*)lK|k=N~Z`^#J;yqdd>wsj3y_=6QYq6*bw}*{P>#dK+knNCQ{`bVkZvr_hEtg7ncvd&fYJMj5bGnS1NRb4Z)1v8s9R;rt^-|sh6b=}Nv zQguL{hA?v(^%uRgqT@mjoO3hRZyd*GUcXb}UtHuz;ve`mD&BLzDw6;J002ovPDHLk FV1iq93Sj^M diff --git a/rtdata/images/Dark/actions/intent-relative.png b/rtdata/images/Dark/actions/intent-relative.png index c1fb040a9ddabae8f9ebdd03367c2bacbba0978c..117806ddb42aac5c440c5634ce1279bbebb971b7 100644 GIT binary patch delta 976 zcmV;>126or2e1f`Zhx&wL_t(YiH%iDPg_SAJ>NIiZ{Ws}qSR>6S%)Kv(?(-Q*8+n{BsUcvI1ZWo%Ov386~ebOAt+hLaLZNl-BIR=VCdsj3Ael@?thEXN&bdB-{kgfh*Of{oNpi{wa%MC5?vOV9KE$mMb!04SA8A4Q|lthIJrRWkraL?j+gPV(0v2)>c4x>#FV8|`#D z84-EtoSOnL2_QXydm{2L$u}hX#+YuX(Z7Qr_)Y+zQh%vDQPqhHYNSZMZA3&40c?@n zJU%|&Xf~TK78e)8`*6+#0IJpMV^zHy>Y^(mJ(7DQcdfPC3kwT>i3m%jQcP7Jsp>e% zj4>ufG8s!AOv^1JZr5;&pCslO{Cr8&Cz&!wagKsAkx*Y_;)6+@5 z0`Td%F@Hr80DO`oL(2^Sn*cVPbM<^a|LQ6wxU5JYK$qkmfL&|tw&!{EAPDvWpj0Z| zipS&Q&bbVLlyh!GRnH`F&i#|m=fA%eUBHRHk(?lzC7BhG+gC@O-1zryJOEg0V*q>+ z$p9Dy0Fpfb&qZXz^SpYy-QGzg5^r+3-0}M=d4Gez`y|6h*s5xqWRv7CBC-vj9*IPL z%jI&%#bVL;zJD(ki#@Q`j#aDGm~-xoeu>Ddd_Mo|+H@6*#i;N5AIru5OIkoS&cH1%TDn)p)1V`M?-+!&)0585@o_#_R)lEda2- zzMg0_8fMtR_kD&RrE`*upKfhNj7PIJrhyZ{m`9M{_cFwi?{r*qYYITt1a~%YL zIF2g-Qri|0FMlE@Ns@GGwOX%UubZ{CwMFlJKr%4Kyp|PQRZqe&{G5}jP*v{k?!J{I zNnngw0kEX1h4JcPD5Jo~VHkc%0BAHC_lz;OGx9i9&5ysI0ywhPwl6L&+SO{c zJE=%ud?q9xkWA%Q{yC5nl1CdG8xKk9-rn8|s=C~4Hh*gXUe5|HB9F@D@)r~70)YMf z{Tsbr?~aJ97-N#i|oApVFiDc5gM))#>h-!@4uh(`DI%$iko==mDt$jSUEAB+Ip^GMl7XrQBo_gs z>fJS531p+u_()Y>%BUt!a*5>osyZ`X>jH?ZwSVp5aCn-_M~YHW(uUL zJ|VdapzXbHS1OgWad)@!`TRSh(I}M>Ywe!^&Kv*~3Wd+Iq<(&WUd!e3IRHda^s;mA zgE)=@Rb2sa)B7xy2LN;cY+XwIVzF3E9Z6NqMNzag9^F?}6#xdR`lB)CTau^Vdr9*Z zkx0LQtIK#7Kq_4%L2^X$XA$|%IoBq6yuQAkB_;oX0{~;p{Uk|lq#8IU!{P9^X&;v#H$-}C;S45KL8^)L`BrlNsGmhhBYi$HzT~)P3XBhwzC#L}% zODZHmG7-E6V1HIsN8>pDHI+)u_V@QM3=a>dUDrM4y6#Z`PmydFkq(mgwK$mq@S_6& z#+diFwzh5x-WanHMbWiVsq|O!RxX!KZ*T9@VHm!aN~KN!*drn!xga9fN&ZH%-tyVs zn@+OXZ1r||_`aVp#uNa&2w*?SbyfYwT00TP@lWmT?SHzmvT^{x0RZSF* z4T~hX*BEm|M2?VDlHURNBA3hk5QgFL`T6;`NggMuBJvA>AprBLx}d5z5)s#RH=9mK z7D+aP2Y(QW$R7Yct=H>cl}e?#Fbp3Ig5XV6?Q4u{$Z?!XXJ_YftyX(pRr`!F2T8gK ziHJ-C*xvX|CiBkR+?-8{larGh<#JgX_8A000l>=uQmXo;h-w zi{vtZS(0lBkE&LIJ8Zn~`}>VCuLF2ORcDMb?|1|eCT=JRR9RX@L3T#LvjS>yjv&~7Iz~6?BWUsLC_&0Zx~~q6p>2+&KC-W_1y~GR%Bvg zBE7b@b`ro#B-5(;k>`1z?G)}EMSS0X)fn?=%X>;y4>ivC6v+>Ax!m->B~OqX$S#rx rTi!PST!`a%tXM35|6j@PDgFjNYM$N22@Vuu00000NkvXXu0mjf)!MSg delta 712 zcmV;(0yq8i2dM^-ZGQr$Nklc#CR(V7%&4te zg+Wl8B5D~SWG{McBB)L4{(!>P>KJa)MNrU#%3cIIL=Q@#VPu?hzAYLDg5T5_(b?Yb z`F`#>-+O`oPyztOVsV7zj(=`0GB+?Va4i6UnSJu!Xa6-sRewJL^-2D=ip641Rok1L z#~3U5e7+RcYU;i3B-v$VT_V!qy>EI^GkXSLG}N2B0OXQ{A`(Sp$EvBS3IHYfmgHUU z{W~+WCY&VzSe@hmfX*ZpNsv?#d1GdGLkLeZnap!l%~UFtLnM!jBoAX|F919Z0N|Xv zxw5j77<`P8&VRX5e}Dfn08CF$hjO{R7r=h!Tvk;dg%B!DwlLqAB%jZhnvDBPO-@ek ztkr5q0dxR(U9DEfQmNEBl8Jg%{n~)EV7}EkcZB3F0AJ1QMvU>Jh>Vg<%n|^+_s;-4 z2z8S_l8H~zIoA$gkff2k9b>$ss=cauh2&BQ;X<`qU4KgIjWJdllZeP35lIZbem)D} z*38Vz=boOPgCzHnd?zB0&FokR$qO;FR{(zg__nsTOA8ANK1rC%$pv_X$0|6iCTz_kRp;mlAR!= z2{I^_J`e&H5$uH6+N;>u2_a386nWfrhZLfQ2mu8V42UAZVwXI3vUhjxv2a$BHJir6gl)Pd{VqvN7i7zJnO5TO^|MmS^E^)rA(Rk8N-0I7IL(|ALX1sMPakb6&SWxQIp;~OR!gLm zDwT2}1Ovc0|0kLNSOV~JczC!h|1qX?cXw|XW4`R{>|9Ke#4*N*h{!od0LVG#(kWvA zZ)>%h8GjlYD%JB%#cAk$rBXRxE|<4F&r{Y~8^`f>9LE(R`pG#j6pO`oVHn!R?1AD^ zskGSH*?DDseO(A4q_wu+2D=83ZhyE*L_t(IjjfeUXcSox$NyDb-9r$TKtKdpSZ|7Z_Fy77Hgrq8 zh=&$D2#Ox|?#D$j;!V7XMnMpDL2u#;laH6!L{RYHl7JpWyc$T%C=QZz&+AtnG9%+S zGs%E|D0p2|{klHren3ML6BB>U&CUIZ-y~@seBVEv=eYxL5q|(CCntA%o_Cm;C&DoN zzh5u|fH7vjs_q1^D^1f801%N20FFE79vWlDr>3U1_5-FgO{FM`aaG;c@GWLpcD__9 zy#U}f16B2l=XqztFnqqLit{`#Ip=Pu>I{HsRlNydTPqX*h-lC`cgq-aY*XMkj=x1w zG*3i}&bh@Xiht%sguBFh04^D0&TI(oP4_Iy#q^mp=n20Dzgv^E?(2BBGxvB%-6k!^79oG?jKnM{trP1rdEFA_PIeK@hO- z`(6+PEF$ggAF|e7uT(0f4Z#4Qs_y_mM7(zMJg+_PKz|SfcNP{FwrmFc23Q}3@B7>| z5n&NwW~R3IJxfbV_tP{T>yY-hwf0`6Qu*VTp|`+ZTWbsFoQen& zk*aDFincuhfW`U;c5ifa^lMjexm^AYb z4iTX|&kG`YSro;CD2h@d(yqC^z~yq;GV>MZ+}C=&{;%)*2g5Kt5y$bfR_OHf^r`ks z;>QMzF$pv4%F4=<4(|v67a>bfi}Y-K45pus&AD z%paKfT-U!-KQhK#1u#fNbJc3~QIaG@&*k-@7Xt$W&qhW@YE8#?B7inNCLk&I00000 LNkvXXu0mjfO-@%3 diff --git a/rtdata/images/Light/actions/intent-absolute.png b/rtdata/images/Light/actions/intent-absolute.png index 1396e378553270124944c886d2536016f879e622..7a507e0f5cbea2301a3bccdc4b36630d804c1426 100644 GIT binary patch delta 576 zcmV-G0>Aye1EK|xZGQqENkl-|8NI{5*S4B|b<_D<=!nPo3(}W~s_UoZp$)!zFw)nlw z%-fmo=gllLPXNI4yo=V_MI5ScjA{A4-$qO_qxO-i7NTGnhJSEfcL<;X;48^5jYi`; z0GA?b8_vET1IQE+#6 z_aN%$^ZDh$U~pYT?vPvsuupO$old_km&?PcA)e}4{Q=-(u~__EDwS+5 zm%9ewJ^)ulet$ZS^Sn~2)TV;0t*zZAc_9jtTo92}k{*Bsl79efwcG8@APBmi=iMOr zfMf!|t9rfu2FLs_nUq8(lbKi5d1K6+s&7LvF%!x?f_x*#TKmq`{ zT<-BG>sTcs)mp9g%!~#*qpimc*@@fpXcz#vuKN(crGHcKZ`AAcmwF1u|3}e1xkqwk z(&U-VMSl6dzhMBtT6%({0`g;5beQU_X^gwWh6nlk^w1l;)l@3ok|h O0000-X&&nlR`SB%~kL%^cfUMAAkl+%Cfvv z)u?kNNfLK1;0}0-kyvZLV)|Q;0T_)&=c-zE4mYN%>-x&B9u}$^^_~Pu7F{zp%K(PM z;TR~kz<-&|W|L$K;QxsMaL%2m>Y#JDF|Q(WV*$MP`$>`T21{@)#mb(@w9~>l_{){)6{`2mnF|-%I-R{C_ZnfH;m3$MFkEJ7%_B ztyUjyZEdChhlBvIva<3SfcXr`B}rFERsh@pkR$oh-D~cCXK!!s>C7b4u(`RJ>-YP& zLI~dis19qIlJ15O?$+z|-aC_w5H6maoP1648vq{xIF__c^8R2j*xBFTKb}Z3Dm;J_ zl3jQ2HJi=un14E}R4QM%`)zl>MKS^)NiPAMUNk2gySuwTjTIhe6(EUnxtx-GM)HZf zADGz_GdoyZT->SEYJZeUrOWwzzDjb#%&th9%k=0>o1_S!0H7!-HnVGzmXTQwNh!%^ z0NTR|UIFNa5C&P2Mx*f{0)SSl)tn&1Ybck?MR#A0qJQWUNy{X!Nh*^p0{8#`-2LKv zl8*sAm`V6)SXx?|D-;TGk|Y<`6+-AY8jU|A09adF`$5v$yAq{o3i7}Imb44t=Li5u z9+P}85i){fU`C%zL#b4{JU>4lr)hfW{Oq;sdRt_LclTv8yYB8w0E#3dNief)$zuRN zM!>`sE`Q=|g+Da2kB2K<3?V=g0Hl)sBH57Ck<`VQ6$U1x@CXt~f0KMPG~?5u8QZm5 zEm>Gt$QKHQ&!Z@+0J!e%Su^efIP*!GroW7f6_VWv0ceuGTwhb%7 delta 540 zcmV+%0^|M92L1$)ZGQp#NklbRON=sR= zkZtYv7g*R?E^aGURw8U|BNnnSQ%FpPm0;t5gR+neL+-JeEtF(tGVGr6z4PwLefOUG zA^3f_^K?Ppn*Z+|TkhT$Cm*Xsz*xho_e zl2qs1huLiQW;&gov=&*1e!qXs%$}0G3*dz0+cZtz1F$m_IYk`DaaC2jA`%10Nxn|g z^vgyfK@fz_xyy9~=bSATi|>=k>LXQ! z@B6u#jhu7uM1&2Q`~q6mq}%OYQq_T~4oMD4Mk1msG8rdHve!zaPSo?f8zgJvsA`cU z$qx?zq9}S!GTK&5r2bn;egp8zTaroCU00i+b%k%bE&yWydmgab zjQF>OLlIGu0FVPX6p`a~Exgu@OEN?xCwW*^)yT}oMNur4W_;XqPDBy_pVykPX{`9Z zzeBPkBCEzqdou<>Fm%rC0=S8`19BbCWYnMcqvb6FJ!mTYvXhQT?k7pI)${8CfbaV+ eagIL{e-#0jvM`gDSQBdi0000?E!t3^JJJ#r{eb{U z8z4xj#=jwdAWhm7Y2Btxqaw&32&gVVnt-4vl1C~GB1I+~+14k?)80%99UbySOPuC_ zeLMSR-tD|404NrVE2{b!sSuG1$8oNP!{Jr8+dT!K={>WAlYe}_0`PSjWM+s6GMNm5 zAQ%!+6Tt7xTz6gfs9LRF&O$-}P$(20EiNuTm;i_}BEkTms@KeX+GsT1EH5wTJkKkO z$R;xfBJzZYmH=dK9ZpnhwOZefI_aOBoJ8XrJkR57Hk-57dLr^nRZBq-lmV=&DiM*Y z>LD{XMdTDfpMRO-6iM%WC&gm%dsW@Mt7TP<0UR)MT|{cen7wARc|MC=PQthgppmNL zDvskwRnM6Dm9_TIZnrxC0N?iu06q(Xph!e{5m^Ki7=}O4eN~i7r6nTDTWd?q zTn4bAsvjkAL`27``c_r1jWNUVToL&@48xx&sq8yuUVon=(E<`llgchcWS@xkn7OvK zwbkC)*@@G6w>koVAP8PC^V4x4j^klc={q9oF>|NUX#530ec#VA^K&99ib$S_7F0Di zrO0l(-Tv`jxqutVRP{M-q$;awKt!XP8L8?!B8mVE#`8p^)9G|x5&*2Nt$oAHYg5jj zCn8T(7k|gr4n<^-h-$f9u3oKHU*jGpaPGja0bBqGRka78BO>*KgM(85@O}UB<>h73 z_x;bAc_F!B6T!^?v|6p7XOauJ@izeLBC-i!lZck@%Nb4l2Y);O#BrPj;1N+Cz*4dt z5m8fBYXIu1dQ>PB-c~9V`ynz1094gi)rl*dOn-PEz&U_F0CWJnKL2+0RIxvZvgg*=#Yrcj4^}TG>CviE@u8RZIDC+RRs}U0C*)L zzkfQ8Q_o~Fd$n4v2LP+9t8;U6b05cX{7^(P*4k`}Ei0lHWTWj}6wm(aZCjO;}%%?$P kOkYIK!!SIX^}uQIA2l`3U`$oa>;M1&07*qoM6N<$f(FpQX#fBK delta 786 zcmV+t1MU2w2=WGyZGQsqNklXKa(q?6ngq!O|*{r9_*oXR~u&3Xc&%bInSe z?%p|{kKTJm03c1%tvHUmXfcwn%d$Lb`?jvd01!pd*JgG-P=DkEz*qmf2+3ba?gV_Q ze;&r;@s+BoG7-s0W+L)ID7lF2mu2~F3;>J8qNu7WYIEG&+)UCm{X$hU0NHZ6+!7H0 zc&)01ncY*>I#6T=00IDm!Qgw6t+>vOWDUTR%vCif`M`T$T@>?oF#s42hqp+!j%{YO zs+RNleE<0P_yD2 z8hkRHPJb2vaL#?Fs@K{aNyY#!HOChsvIihHv)p_Cbd4s@)FmQbL|XZhG?JyN?v-Wv z2mpt};X5QJ&bco|l8?RjKdplcy0l zH8aaZBm>|YF$C=mT+X>00NxMyUQ*RD$svHZR22Z8lH4(~JV}xxRSn@<0u3%zy>-!o zG_#qA?2^noolbsmaB$Kz*IO=^pIw0KIe-%Z&VL?TXw|DKXS3N$0LZdz^YrvI1CW{7 zwuoE_H3s|(SCS+yNs?Ac#&O))*w`48oGccL51Z>sME)T88-ODbv9{Q{uIE65D~{va zAzUOua;2&dN!}ru_j_0iGMjn&oF#?;i**u=!d3Fq8#l8;(zQvfDC&l`^mopTicKgQ#F z&pG#}#e1IDw$|RL)oR_Lu*&6fj};1qmjIk3IU*t;*$|PN0DcmYUVKid?zh&S z0`N4+F%hW)SWF}mUpwb!j4|_C>$3o+j4{w!!#Ovo7m=#~E_(ow&*z`S?vkOk7HjPh z00m=A0RTyUueJWHTCJ|k&d!!a-+wzBU*E~ZkcsMTscWsI3uN*yDah($;S0CsPD zyWM`X+wJN&*=#o30Ak-#EEX4>b1yjO4k@KRkD}Gx0Xz(#E+X#+K~OK1N`L8IuXhf>NdR@{+|v5``gZ`h7moly zsZ>e>7>R>BJ3EH~JWg@}fL2N^mdoW&mzS5V@B3Mjuamq-L_Q9~aB;}>o)7@=egB=| z%NUOoz-4Rg2laaW=l;1TNS*`G0q}MhhL!!uV|W1IoVy6%%22$SNF;(vrE)!PCZErr zA%A(A!1SricC*Wk0q1IQ_i{P zNsei)Kde@(pWrsjy`xAzpMOzA9vq4v0+7Y-%TUo;zrVJ&7W`fE81bJmP4d`4S)@(! ml2YocAP9c=r{s4Pe*h?1j$Np+MCSki00{s|MNUMnLSTYz#<9Nu delta 682 zcmV;b0#*I*2a5)fZGQrYNklQ?}BJGakOHPUzyVGsnR zVzKxO0EUN$U4N-mx+o%-Nw%r#M{DgyOztw!r175TodR$JKsU(+k~7Y^LvebNtGQh6 zeM81)GMN)$7>)oqO>)&*`z#E@vN2{%RU^HuPm%?&4N0fd=K#b##jY?6&x?qXd>I76 zD-k&hUB>GhRgAB@&4j*?(-d(%aj6mE`;{!8m}Fh|H*JQAF+lnD>2ueCOrGZUO)X1_n9-B%%bq?{|~D4WNbOQxVw! zFhR0Zt$$X>DwRrYuO?l+(CBWS0H_#a?gL1u>J-TzTU%QbjR5{YRP{B04^aXUq3`=| zlF8%|RhVPe@u-y;~?0mKy~CfZ0pX*VlK{_x;BJlFqrw zW&uEbl5{$KT|`dCXi@+U2SM;~X=&+mvjCv(i6e+~k~|ip2>?v*7jR(l8(2pVitl67jFFzT(}pC3)eb>y732yEz(Y{uP_XqV$=4u&F|#(-Q&Wf z#@M78nD6Rx?)QA|x#w^%(9y!e!tCPW;?sCcQr(4f?!7pU9e;pN0AOxz?isE1i%F9F z8iwKSqk<&>SZh}Ryg@|4UaYdVe~du0>IF|4MMJR*R!3`YW5w&M>(;l@Q`T zej<9sTKmrG>Z%;IVh5l~L^L)wW>Tq?mrA9)@$qp_Yk#eJjYM>PV`Jlk<>h5P3K-1% z5CFU$br118PxX11DwWEIv$M1QDB$}5ptY8s=Xt*G8?Ci5#%N=V5kkm5|GZM__R`W) zYABe99(30osHe5oQc9(ilE#?-^_7Tb8jZ&7TrM}R`Zs$N5>XPzaiX=>Ns@q>lQ@ov zh^TLl0Dq7;=YEq?-r3*ZuMY%=VOX}-{!y(~U&v%Kj)*u(68`7b%$*Ml02)N}W4&Jg zW^ZpV>gErt7yy25wOY?rDwV1+M#pj7E|<%-dcEH24EL@v=BLfg&31p{P;jwW{AGQ8 z{q@7cLurgr&1SQ8etv#WN_l5zXXkeSJSg{K0DnOcJkQJ=MbTC_wzajz>2$i}oV(U; zw|_9ke6hW~{q6Db@j)+Set!Pl>FMdiQmJ(DVlSR!p-{L5fR$2T_n+?jzG^m`=Yy(? znO+*3k`^|Q0H&kqg`Y8T*qK7SLy&0(z>BxX(#kz!^igxJmHavu%+ogPK`eEu_L xek>Be_r+rI%eA$&qK;VZf@>QmSum(ar~L8o)eMR<2XJuKR^F-mSwG3!Ca|S z41l))gd!3#^V`eI%kuzU7$&LeS!TYOB*`l?JMMHkCkll^9e{{PjhVl0x7#O}`OT5s z0uimpah#=T`hWX>f?KVYPt)|DVzKzFs@|{FYPX8T;!^-FjO!3UC641lnx?m>fq86@ zIiFUfsu!Je9|E9bfdSl|1|I0$BuOq!G&e3-tyVK4$^pO_L)Kch)>04zk2zG;3(mPu z2M1s#$2k#Y%#1J$If^2Vq9_Q%kgc_&?XNc)jnAEP(SIypsOnz;V66?JC<+GP;m9Mo zXPNoSm6er~vw;5?fXQ0RL+937HpcMivWUowolfV<>gwvLsbBzq4kv{|Aqc}T7y^gi z7&A+)R_n5J?#X{G`cW&)zW~U+_iBt`5z#!)iJ6I+LG(D6i2ADfJ%G!#TJ7FMaJ5>! znzp`nKo5r~Km4BS`MZ@S&?S35g9cZT&7!2=iHdhcIqHk&>SL-yWF zv)SzTdOZ=5ZDzjOZntmj?(TL*Yo~%srP9qtqw)U!{{HjE80z(Uxrp2rk*oE3{RaR# zsdn1tVRLh{PedR0`~7=|hlkeyoZH^sey3iq-+X!$y0EbD-smH7v;*aG`3(SSjJYx9 zA0dF=Bm>_2OCs_#GyisQaPY<6-d^hnoFvJ40OzN5FiEOQrZ zNs>=g^%Q^~*VfjqZ)|K#y&Y$kbMDo0x%|YVu?N*@G4+r{yZ!(G002ovPDHLkV1jAd Bh4TOa diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 621c088e3..f27e27467 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -81,6 +81,7 @@ private: intentBox = Gtk::manage(bt); intentBox->addEntry("intent-relative.png", M("PREFERENCES_INTENT_RELATIVE")); intentBox->addEntry("intent-perceptual.png", M("PREFERENCES_INTENT_PERCEPTUAL")); + intentBox->addEntry("intent-absolute.png", M("PREFERENCES_INTENT_ABSOLUTE")); intentBox->setSelected(0); intentConn = intentBox->signal_changed().connect (sigc::mem_fun (this, &MonitorProfileSelector::updateIntent)); intentBox->show(); @@ -135,9 +136,12 @@ private: std::uint8_t supportedIntents = rtengine::iccStore->getProofIntents (profile); const bool supportsPerceptual = supportedIntents & 1 << INTENT_PERCEPTUAL; const bool supportsRelativeColorimetric = supportedIntents & 1 << INTENT_RELATIVE_COLORIMETRIC; + const bool supportsAbsoluteColorimetric = supportedIntents & 1 << INTENT_ABSOLUTE_COLORIMETRIC; - if (supportsPerceptual && supportsRelativeColorimetric) { + if (supportsPerceptual && (supportsRelativeColorimetric || supportsAbsoluteColorimetric)) { intentBox->set_sensitive (true); + intentBox->setItemSensitivity(0, supportsRelativeColorimetric); + intentBox->setItemSensitivity(2, supportsAbsoluteColorimetric); } else { bool wasBlocked = intentConn.block(true); @@ -148,7 +152,7 @@ private: softProof->set_sensitive(true); } - rtengine::eRenderingIntent intent = intentBox->getSelected() > 0 ? rtengine::RI_PERCEPTUAL : rtengine::RI_RELATIVE; + rtengine::eRenderingIntent intent = intentBox->getSelected() > 0 ? (intentBox->getSelected() == 1 ? rtengine::RI_PERCEPTUAL : rtengine::RI_ABSOLUTE) : rtengine::RI_RELATIVE; if (!processor) { return; @@ -206,7 +210,7 @@ public: profileConn.block(wasBlocked); #endif wasBlocked = intentConn.block(true); - intentBox->setSelected(options.rtSettings.monitorIntent == rtengine::RI_PERCEPTUAL ? 0 : 1); + intentBox->setSelected(options.rtSettings.monitorIntent == rtengine::RI_RELATIVE ? 0 : options.rtSettings.monitorIntent == rtengine::RI_PERCEPTUAL ? 1 : 2); intentConn.block(wasBlocked); updateParameters(); diff --git a/rtgui/popupcommon.h b/rtgui/popupcommon.h index 04044fb2d..b5cb757f4 100644 --- a/rtgui/popupcommon.h +++ b/rtgui/popupcommon.h @@ -54,6 +54,7 @@ public: void setButtonHint(); void show (); void set_tooltip_text (const Glib::ustring &text); + void setItemSensitivity (int i, bool isSensitive); private: type_signal_changed message; @@ -69,7 +70,6 @@ private: bool hasMenu; void showMenu(GdkEventButton* event); - void setItemSensitivity (int i, bool isSensitive); protected: void entrySelected (int i); diff --git a/tools/source_icons/scalable/intent-absolute.svg b/tools/source_icons/scalable/intent-absolute.svg index 497ce9c66..799deffc0 100644 --- a/tools/source_icons/scalable/intent-absolute.svg +++ b/tools/source_icons/scalable/intent-absolute.svg @@ -28,8 +28,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.28397906" - inkscape:cx="443.36338" - inkscape:cy="-4.6332449" + inkscape:cx="497.94487" + inkscape:cy="-71.539587" inkscape:document-units="px" inkscape:current-layer="svg2" showguides="true" @@ -1294,6 +1294,24 @@ y1="1004.7048" x2="1694.8438" y2="1004.7048" /> + + + + + + @@ -1303,7 +1321,7 @@ image/svg+xml - + @@ -1329,50 +1347,56 @@ inkscape:groupmode="layer" id="layer1" transform="translate(464.16179,164.03236)" /> - - - - - - - - - + + + + + + + + diff --git a/tools/source_icons/scalable/intent-perceptual.svg b/tools/source_icons/scalable/intent-perceptual.svg index ab34b86b7..3c949c91e 100644 --- a/tools/source_icons/scalable/intent-perceptual.svg +++ b/tools/source_icons/scalable/intent-perceptual.svg @@ -15,7 +15,7 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.91 r13725" - sodipodi:docname="intent-relative.svg" + sodipodi:docname="intent-perceptual.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/distorsion.png" inkscape:export-xdpi="1.98" inkscape:export-ydpi="1.98" @@ -28,8 +28,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.28397906" - inkscape:cx="443.36338" - inkscape:cy="-4.6332449" + inkscape:cx="-22.166458" + inkscape:cy="-89.632823" inkscape:document-units="px" inkscape:current-layer="svg2" showguides="true" @@ -1329,38 +1329,34 @@ inkscape:groupmode="layer" id="layer1" transform="translate(464.16179,164.03236)" /> - - - - - - - + + + + + diff --git a/tools/source_icons/scalable/intent-relative.svg b/tools/source_icons/scalable/intent-relative.svg index 31a2fb342..1cd7135f2 100644 --- a/tools/source_icons/scalable/intent-relative.svg +++ b/tools/source_icons/scalable/intent-relative.svg @@ -15,7 +15,7 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.91 r13725" - sodipodi:docname="intent-perceptual.svg" + sodipodi:docname="intent-relative.svg" inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/distorsion.png" inkscape:export-xdpi="1.98" inkscape:export-ydpi="1.98" @@ -27,9 +27,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.28397906" - inkscape:cx="443.36338" - inkscape:cy="-4.6332449" + inkscape:zoom="0.20080352" + inkscape:cx="1490.3375" + inkscape:cy="469.77917" inkscape:document-units="px" inkscape:current-layer="svg2" showguides="true" @@ -1294,6 +1294,16 @@ y1="1004.7048" x2="1694.8438" y2="1004.7048" /> + + + @@ -1307,6 +1317,13 @@ + - diff --git a/tools/source_icons/scalable/intent-saturation.svg b/tools/source_icons/scalable/intent-saturation.svg index 638df39f2..1af08f4f2 100644 --- a/tools/source_icons/scalable/intent-saturation.svg +++ b/tools/source_icons/scalable/intent-saturation.svg @@ -27,9 +27,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.10040176" - inkscape:cx="2047.3204" - inkscape:cy="-1169.7659" + inkscape:zoom="0.28397906" + inkscape:cx="432.87769" + inkscape:cy="408.60409" inkscape:document-units="px" inkscape:current-layer="svg2" showguides="true" @@ -1303,7 +1303,7 @@ image/svg+xml - + @@ -1329,38 +1329,34 @@ inkscape:groupmode="layer" id="layer1" transform="translate(464.16179,164.03236)" /> - - - - - - - + + + + + diff --git a/tools/source_icons/scalable/softProof.svg b/tools/source_icons/scalable/softProof.svg index 7d142fc4c..d09f316a2 100644 --- a/tools/source_icons/scalable/softProof.svg +++ b/tools/source_icons/scalable/softProof.svg @@ -1337,7 +1337,7 @@ image/svg+xml - + @@ -1369,7 +1369,7 @@ d="m 95.191608,588.78944 0,-496.118075" style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:30;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker4687)" />