From 4340ece3e3f5bc4846bb615265c3de9b089b6675 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 13 Jul 2018 18:57:35 +0200 Subject: [PATCH] Replaced contrast mask icon --- .../themed/png/dark/contrastmask-full-off.png | Bin 596 -> 0 bytes .../themed/png/dark/contrastmask-full-on.png | Bin 646 -> 0 bytes .../themed/png/dark/contrastmask-off.png | Bin 608 -> 545 bytes .../themed/png/dark/contrastmask-on.png | Bin 658 -> 623 bytes .../png/light/contrastmask-full-off.png | Bin 562 -> 0 bytes .../themed/png/light/contrastmask-full-on.png | Bin 633 -> 0 bytes .../themed/png/light/contrastmask-off.png | Bin 608 -> 557 bytes .../themed/png/light/contrastmask-on.png | Bin 658 -> 596 bytes .../themed/svg/contrastmask-full-off.svg | 155 ------------------ .../themed/svg/contrastmask-full-on.svg | 155 ------------------ rtdata/images/themed/svg/contrastmask-off.svg | 78 +++++---- rtdata/images/themed/svg/contrastmask-on.svg | 100 ++++++----- rtgui/indclippedpanel.cc | 4 +- 13 files changed, 111 insertions(+), 381 deletions(-) delete mode 100644 rtdata/images/themed/png/dark/contrastmask-full-off.png delete mode 100644 rtdata/images/themed/png/dark/contrastmask-full-on.png delete mode 100644 rtdata/images/themed/png/light/contrastmask-full-off.png delete mode 100644 rtdata/images/themed/png/light/contrastmask-full-on.png delete mode 100644 rtdata/images/themed/svg/contrastmask-full-off.svg delete mode 100644 rtdata/images/themed/svg/contrastmask-full-on.svg diff --git a/rtdata/images/themed/png/dark/contrastmask-full-off.png b/rtdata/images/themed/png/dark/contrastmask-full-off.png deleted file mode 100644 index 5be95b8b1bd93f8acd74971d120a5fe2f3f542cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}r~9^ez=>R#YuYip~jswyup4dwhI+KtUkbvuDq|dGoTfvyUG?{^ZFM0RaJ4R@R+6 zckbG?3n&Ftuz&ylc?*nB0NbA%^KCJdh^eImhxvJiqB2vTxWT{Z1T&3-wWS!M+UK;dJt{B9O!ZePgg&e IbxsLQ0If9P761SM diff --git a/rtdata/images/themed/png/dark/contrastmask-full-on.png b/rtdata/images/themed/png/dark/contrastmask-full-on.png deleted file mode 100644 index 685e6ee9e26c9fa35a146c7715ff921903e21304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}tgAK(+>>R#Zpd-v|WJ9Yxe{Y#br zNeDQVQnY8!o{bwf?p?KJ*REXADEe$ z6&Dxh<>f6|vgAx^5l{ipwC3jK%F0U11hsIW)v6^ye!&cDr-iUqcWmCQzfGKfNutxd z9OZ@T{ZVljZtp+;_|%zQZS_q@PQ*`H#{$%Fz|+MsMC1I_3pewa6?s?#HplT88+fN} zQqP_A|NpTI%P&n_y6rn_r}AxyMfWGI(3qNgE2ezj%HRhlXUu=l9+Xj%;#N>?&!}PJ ztIE7C_lZ_R_N$BLs$mbS+Ant>|J$}vv#=sAukgdis!GM}o2y$Ts^yb&O-&Y9FE{zc z8dbTwc;fBrdz^+NmOj|*6Dw9nehuv`Czr}Hze vuqJno%|F(dw)hLanh?tJ+i}oh2z%$w zoqP7|*|lp|)XFd7Km+(og8YIRHcQTA^Ie%>T|C)B$EB&GHC_@Zwb|3fF+}2Wa>4=j z2&=P`(k&b;&o((E@Fs5N*1MY5C8Wbp%;hRM$5(>sXuV?&-$7=c#zj0fP0|fA>49v^ zTnt&;9E25?7cw$0U+{p1O^;I{J&ED4qoboFTbQT9@qos}g$ovlFi$p^F!{v+?oH2` zx+P{jW_z@x!Lp63RiV!!;^q+rM}q)X$qPI94pp)m-HMFiVA)nML4vgA5mo tKzq}k1&>%hGszuJQ#rq|O4^!%;p%S1i>nJ5`G6i^@O1TaS?83{1ONvocl!VU delta 369 zcmZ3;@_=Q61SbbG0|UeLm1j>)RD4oz6W|l#stN`wDk=~Lgmf?PQB+g}vVkN}N=;1- zNV2lB3JVL%$jI>U@Nj{F+Nndkf#!*n1o;K~aJgw)J4rAw8}TcMsO&9{o-}XTC2#vL zK>2%~E{-7@=ci8U&O55W(H6+!*ta#k`hR`-UH{v<>58=hVZ3c?bGe z$kaZFl3IG4W$`7&Sq|rGH5q1}=@VVLGws}OzeNn0yBj@()%V=`JV9(?LiB}67q4w| zlxA4-x+-?xUi~be8#dPiHA>kmoXwW|f9wf7J+(VV;X)V73;vTmvlbLt2=oyQQc6n)7|}+{Et(-prr>aCZ%ZhX`*#<78=RpkEn0UHx3vIVCg! E06Wf*qW}N^ diff --git a/rtdata/images/themed/png/dark/contrastmask-on.png b/rtdata/images/themed/png/dark/contrastmask-on.png index 3eeaa6590f4ddd4f74b6410829097d5a0422e5a2..dce3ce99eda452fc07fc270f8072d11921de03aa 100644 GIT binary patch delta 367 zcmbQl`krM27i0bZGYq?T@4kAV9Z2rkvj<52KgHl)-~(hFJ-Ql50s&Bb+qP{$22k%)gFr6CkiVxG&g}0lyLzLIfq_A~B*-s#voFUCtF__`o0$@4 zO_eK|Vz*2$s#sRNU~*IJkNE4D!)9k3{&l|)Pq-X@Eo|?@@&u`vEFZ=lY-OeL$NjcCoRz$?q05%P`P&+u zS1dele5cLKnD#U+(eD87ls9)=Oe}9|n8-99l-rf3a_i6$vnd=ek`HqG^dUEOXq?AW9y)%=x>fdyazwfGk>RzDt7(8A5 KT-G@yGywpdLbo^o delta 403 zcmaFQGKqBq7i0ZyB(Q7Ou04D900rC&d=4Kz3}gVg`}XaFC^0uTkByC8wrm+h93lu* z(9+TZWcT;?_w@9Xm6a_Cy`99sz#v@`IpD%B5x%Id#(x;TbtoS!<0Gw+B2hwJ{2P1kk&j54eLH;W~0omG~$L`+lSi%iZB zw*3Zw7+sz}V(yq&%balIZu5@!kD3~$#>Vb!IDU>JD1`njxgN@xNAbHd1v diff --git a/rtdata/images/themed/png/light/contrastmask-full-off.png b/rtdata/images/themed/png/light/contrastmask-full-off.png deleted file mode 100644 index 5f2d769f960be1550ae3a9d5f6a97f3d48e31eaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}ub6yOu$>R#X@E-o%BE2{zqs;a6$ z8c0HbnwlDfp`@gwuC5MbA3uJ4-MV!>Jw2;dtpciKWo2zY;t4WMtR%=Un4yu=#L8LC zd$Vw~j!Y2i!hQ2D+|Js|P<~yvwTmz|@A{G% z(!J#@zssYBjf%gP`7pn*TeoXtAe+wWIL6ZwSGY6V*ZyWpm~k^;!5X)tj52fBQ}!|~ zX;V6raZ-3s=!AJIIsN6u4=|m1nXqfBj>8|(#tr&DdrAy1`DopFxhzHgsrSi`>t|ey zzw~?GeN%?Fg);qO3?bKf4p=y*xXx}i$X`{;oxC+Fn4@Z~Zr-GAAD!=uGrVBcve#nBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}tg8Q>G*>R#ZZs;a7_qy!{^KwVuu z(a{meIF(YQqN1XvrUoQ|TnH&9CI%FNaFvynf$Y;MMG$m0wcu1%d7p2%yQQ_Hq~w_c z2cN9lx_sWeSBFk;b8`dLyfYH}542RdB*-tAp?Z7!VjmhPZ!4!jq_74-Q;6ZxT|Ld3hXj|4< z6+f%MX(7uZ{f~WKUdg)e3)@breh_$UEfLLiw(Aj3-gS0{RLM3Y##OmXv>GZOM!mT- zXU>J}6?Y_G$Q5sPeOU5-tLd)&^9{@{++_L76dQe$ZBwx3;j$Cgeyp3>s%h1Av*(HO z#{V*Ln(Fr4#($^2tg?$&XY8AP`)!fP1A#0)rZ@2$Ci6vVS8#4qT=QtFnWBx$jn)kl g{~s>9``_Tb@QWDsQ^%AxgJPS()78&qol`;+0Hi}cN#S>P|mgOwcDQ#N&>r4tzZnvk4 zV~E7%WC0f@o)$6&#Ta5sS7o6lt<#t=DOC3}%(R;V6^X*4@OX z)3k}F&B0HldqD)V`=SMhLlllXga))VK3tF>U_9aTfxr(;%*^W-aPUu9ydfZ@_=Q61SbbG0|UeLm1j>)RD4oz6W|l#stN`wDk=~Lgmf?PQB+g}vVkN}N=;1- zNV2lB3JVL%$jI>U@Nj{F+Nndkf#!*n1o;K~aJgw)J4rAw8}TcMsO&9{o-}XTC2#vL zK>2%~E{-7@=ci8U&O55W(H6+!*ta#k`hR`-UH{v<>58=hVZ3c?bGe z$kaZFl3IG4W$`7&Sq|rGH5q1}=@VVLGws}OzeNn0yBj@()%V=`JV9(?LiB}67q4w| zlxA4-x+-?xUi~be8#dPiHA>kmoXwW|f9wf7J+(VV;X)V73;vTmvlbLt2=oyQQc6n)7|}+{Et(-prr>aCZ%ZhX`*#<78=RpkEn0UHx3vIVCg! E08JW@uK)l5 diff --git a/rtdata/images/themed/png/light/contrastmask-on.png b/rtdata/images/themed/png/light/contrastmask-on.png index 135c9f8bca1eab9b8c134a17c4ea165fe773d4ab..064ed7e9bd92bb0bfea86d6d30f2ecc6c4464877 100644 GIT binary patch delta 345 zcmbQldWB^JD`UN1fKQ04dx4LVl9H;bs)~vVg#3S+;r|&12pb|OCnpCIJj?L)D3h9+ znxdj2Q2hT92B1cuN+>$Z5bH1fTfU}^fq_A)B*-tA!MY@Iny&1+}naCBtZ>B*b( z$u6Ix9vI8rxbiv!Lp{STPZ!4!jq`ISo)l|V;Bi%M;*?=afBXM`#^EJbLT~R@kdc$D zVEE&!zT{d^$@yew*3XJxU4qssuJIE3`gUiS%(uDXOY@g1+ZI^}`tvPbwv(gn(ce_( zJJV)3FH<`qVPjA?G*0@HEw|o0t`BVFTEqaX%+m} zIuazO|0lF-HvbKSE6;4!WwVAKf6BhEtu4GZVe66$5kbB_ThzpEt7k87f6MUsZ{X+h c_}|R=1x_4~q^0M$1AWWj>FVdQ&MBb@02@w;E&u=k delta 408 zcmcb@GKqBqD`S0NfKQ04s;a7*ni`OlmzP&jQ2{c5z`el7$jAuDg#d^kgyiPt77`Lt z1_Mb+NuZ#ttSrO?MMXuR@XTk27cej|NS6fp1#ebK;F%XB!@x43E^p~-)3V2x^=yv0 z?Gj!p)>?!gNE&WUkyz4(P9jP{5k?>^39pRQMY+`B+XGGMNnxD9Ex42k6e=~c8D3k`+q|T@?H87Nqi?)hd<+?tsvvTL|>TkyRa!)1q@vJIynXm5Q j{llhsV!d5kc`b8<82?p)PoHOkLV&^3)z4*}Q$iB}W>lQu diff --git a/rtdata/images/themed/svg/contrastmask-full-off.svg b/rtdata/images/themed/svg/contrastmask-full-off.svg deleted file mode 100644 index 7e380f8c5..000000000 --- a/rtdata/images/themed/svg/contrastmask-full-off.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - Maciej Dworak - - - - - - - - RawTherapee icon. - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rtdata/images/themed/svg/contrastmask-full-on.svg b/rtdata/images/themed/svg/contrastmask-full-on.svg deleted file mode 100644 index b423235c8..000000000 --- a/rtdata/images/themed/svg/contrastmask-full-on.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - Maciej Dworak - - - - - - - - RawTherapee icon. - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rtdata/images/themed/svg/contrastmask-off.svg b/rtdata/images/themed/svg/contrastmask-off.svg index 5ae21b2b2..ed76efbbb 100644 --- a/rtdata/images/themed/svg/contrastmask-off.svg +++ b/rtdata/images/themed/svg/contrastmask-off.svg @@ -26,7 +26,7 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="34.25" + inkscape:zoom="33.75" inkscape:cx="12" inkscape:cy="12" inkscape:document-units="px" @@ -42,11 +42,11 @@ inkscape:snap-bbox="true" inkscape:bbox-nodes="true" inkscape:snap-others="false" - inkscape:object-nodes="true" + inkscape:object-nodes="false" inkscape:snap-grids="true" inkscape:snap-bbox-midpoints="false" - inkscape:snap-nodes="false" - inkscape:snap-global="true"> + inkscape:bbox-paths="false" + inkscape:snap-bbox-edge-midpoints="true"> + sodipodi:type="star" + style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" + id="path851" + sodipodi:sides="3" + sodipodi:cx="-28" + sodipodi:cy="15" + sodipodi:r1="12" + sodipodi:r2="6" + sodipodi:arg1="-1.5707963" + sodipodi:arg2="-0.52359878" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m -28,3 10.392305,18 -20.78461,0 z" + inkscape:transform-center-y="-3" /> + - - + + inkscape:transform-center-y="-1.5243173" + d="M 55,2.9998999 65.392305,20.9999 l -20.78461,0 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="-0.52359878" + sodipodi:arg1="-1.5707963" + sodipodi:r2="6" + sodipodi:r1="12" + sodipodi:cy="14.9999" + sodipodi:cx="55" + sodipodi:sides="3" + id="path1702" + style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3.91079855;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" + sodipodi:type="star" + transform="matrix(0.5147247,0,0,0.50810573,-16.312048,4.4711921)" /> diff --git a/rtdata/images/themed/svg/contrastmask-on.svg b/rtdata/images/themed/svg/contrastmask-on.svg index d57f46c8d..9e3504128 100644 --- a/rtdata/images/themed/svg/contrastmask-on.svg +++ b/rtdata/images/themed/svg/contrastmask-on.svg @@ -18,7 +18,7 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="contrastmask2-on.svg"> + sodipodi:docname="contrastmask-on.svg"> + inkscape:snap-bbox-midpoints="true" + inkscape:bbox-paths="false" + inkscape:snap-bbox-edge-midpoints="true"> - - - - - - - + + + + + diff --git a/rtgui/indclippedpanel.cc b/rtgui/indclippedpanel.cc index 233562ecf..aff5035fe 100644 --- a/rtgui/indclippedpanel.cc +++ b/rtgui/indclippedpanel.cc @@ -28,8 +28,8 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia) iFoff = new RTImage ("focusscreen-off.png"); // for previewSharpMask, needs to be replaced with different icons - iSon = new RTImage ("previewmodeF-focusScreen-on.png"); - iSoff = new RTImage ("previewmodeF-focusScreen-off.png"); + iSon = new RTImage ("contrastmask-on.png"); + iSoff = new RTImage ("contrastmask-off.png"); previewFocusMask = Gtk::manage (new Gtk::ToggleButton ()); previewFocusMask->set_relief(Gtk::RELIEF_NONE);