From 75d1ed02f64123548f6bfdad87cd5c561d0db93f Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 16 Jul 2018 20:20:13 +0200 Subject: [PATCH] Improved trash icons, #4469 --- .../images/themed/png/dark/trash-delete.png | Bin 0 -> 1021 bytes .../themed/png/dark/trash-empty-show.png | Bin 0 -> 700 bytes .../png/dark/{trash.png => trash-empty.png} | Bin .../themed/png/dark/trash-full-show.png | Bin 0 -> 730 bytes rtdata/images/themed/png/dark/trash-full.png | Bin 0 -> 482 bytes .../themed/png/dark/trash-hide-deleted.png | Bin 622 -> 622 bytes .../images/themed/png/light/trash-delete.png | Bin 0 -> 1057 bytes .../themed/png/light/trash-empty-show.png | Bin 0 -> 701 bytes .../png/light/{trash.png => trash-empty.png} | Bin .../themed/png/light/trash-full-show.png | Bin 0 -> 729 bytes rtdata/images/themed/png/light/trash-full.png | Bin 0 -> 504 bytes .../themed/png/light/trash-hide-deleted.png | Bin 636 -> 633 bytes rtdata/images/themed/svg/trash-delete.svg | 368 ++++++++++++++++++ .../{trash-show.svg => trash-empty-show.svg} | 0 .../themed/svg/{trash.svg => trash-empty.svg} | 4 +- rtdata/images/themed/svg/trash-full-show.svg | 291 ++++++++++++++ rtdata/images/themed/svg/trash-full.svg | 290 ++++++++++++++ .../images/themed/svg/trash-hide-deleted.svg | 34 +- rtgui/filecatalog.cc | 16 +- rtgui/filecatalog.h | 2 +- 20 files changed, 982 insertions(+), 23 deletions(-) create mode 100644 rtdata/images/themed/png/dark/trash-delete.png create mode 100644 rtdata/images/themed/png/dark/trash-empty-show.png rename rtdata/images/themed/png/dark/{trash.png => trash-empty.png} (100%) create mode 100644 rtdata/images/themed/png/dark/trash-full-show.png create mode 100644 rtdata/images/themed/png/dark/trash-full.png create mode 100644 rtdata/images/themed/png/light/trash-delete.png create mode 100644 rtdata/images/themed/png/light/trash-empty-show.png rename rtdata/images/themed/png/light/{trash.png => trash-empty.png} (100%) create mode 100644 rtdata/images/themed/png/light/trash-full-show.png create mode 100644 rtdata/images/themed/png/light/trash-full.png create mode 100644 rtdata/images/themed/svg/trash-delete.svg rename rtdata/images/themed/svg/{trash-show.svg => trash-empty-show.svg} (100%) rename rtdata/images/themed/svg/{trash.svg => trash-empty.svg} (99%) create mode 100644 rtdata/images/themed/svg/trash-full-show.svg create mode 100644 rtdata/images/themed/svg/trash-full.svg diff --git a/rtdata/images/themed/png/dark/trash-delete.png b/rtdata/images/themed/png/dark/trash-delete.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7c084aa4cb123230bb985489b55abde83b6393 GIT binary patch literal 1021 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>Pnv;&Q8vIQ#P!UXGw05o1CnRK0K#xD z@Hu_@G?4w}%a`}>-$Mj}%3i*FdH?=>py0=kAFo}z22^wE)T#65&qGWADtq?q+4t|? zfyz#tH~|y{8VS@6R0CwJSg``A-qO z&!0b^KYtG7Ubt}K?c2B6+1Wr{RaI5<=FR)`=@U@!?%lgUdx5q;efreG!UAYiU|`_w z+qZ#ISFc{Za^(t8YTv$nzkdDNx^?S>2@{f%k|s}{ym#;3{QP{N%WvJfwRrL3+}zyo z@bHZrH+FP%L_|caUAwlpxESc*Y15`9Cnp2#1zG_l@7=psZvw zetpI;^V%ckg&+4xZMYuKu}1OG>7x%moV&r-Q+Pyt>hcY1Z@t)YXa9u9tJgk{`n05I za_o%04;%0}$ZnCznq}tArD<#&a~v2Q|Lc!k$=RDdeILJ_=lhgMwG!6Q zSeGOInp=gsg#4y_Sm7>~WGt+=b+xF|qmOQ_IVJwLIJ5P(`CPd3`dzQ~d6mDHJLTmh z&VJzI;xlP~S!1K7xN+v0*LxPG20U5RbhzSW=oD2?_34w2y!N>fywN$q&u*D`*ZG%M zKKyf>nxuHM{FDa9uo*U{h6mm&xJ%w?90=$z4j5`lOby zi2MFSF!Dw)~10+jnWIpm^}>#qzVb zy;rJD?)98|xGE=VzR9GMt1dYv3dt`{<2qD+_QzQtkrZ9;!~Z`rUwf;T`rxOx7BChW NJYD@<);T3K0RRj@4EX>6 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/trash-empty-show.png b/rtdata/images/themed/png/dark/trash-empty-show.png new file mode 100644 index 0000000000000000000000000000000000000000..983979634a1345cf1e28983cc98df25e565a1620 GIT binary patch literal 700 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}s#7vK}(>R#Y;=FFK>M~<97fBwv= zQ)hwb>{*})5S%`J8c3czdGa6=(*Z`tgA5E{;WG!-)F4s^IXMsV@a*K~hKQf&=r|D( zagc)ps2(T+)N+7<;Sek90Zz^X?Cd~ef!u?JhCmXCj_BwB$+R`cuP`t$XqE)|1v9XV z#!K<#Y%UL(YI5?{kJ@#XR?Ur5*wtKBP1e5hao?7wwqW5pztH7jW!wJE0&05f>Ealo zalZA^&7x)nk%q*cc2_Q!BdU2f-;~|^&$>EExa0E6`iC6%A8>e`*l&2Q^4z!2p1Y>G z6sw!5Pn#xfmN(1d-=xn0A7YPk`EFbN(R)S3%kR8=2c17Xb(%lnbfwKsrUfTcIMkIY z{qp}Nl-%6JaPP##{`tpN#4Ud3!E#6{w{ep8DyybN=3;3cS~l(s%}UxO5v>XbYAQ26 z%B{`V^6f+8Q?`=UjfY+{g)HoK*e135U4p38rqmBpD3|YVZ48J@0I|& yGNtXpb6m`pnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}sVIlw2x^~{+wXV0DmlBZ9fhOkc@ zKki=O17sgyU;vUp090^*g9E7G{Q2`wo;*2m;sj9eAP2`mUS6>LnS-pXhcz`%c6J_% zhyaT0*U$ioA3Ah;-MXXk@rPAZ4$H{_1&;0AdyttKs2FJAAwj{DWo00f85s6+aqZ*c z0!p3Ov*(C~Mc&fN!$9X5mIV0)Z?2seSMICF@a*3d3Aaa?f~>qNwq85G{=?dY(mNb2 zRv|tedm>evj>k;SKIZCUJlAo~|B9`*ftsIqx;TbtoNv7pUfiM}(w10q^v6PhqxZbi zqJRDWUwUwp-W!$4-wz4SpM6;JcY@2V!&92$tK6HLb5q;7Jd*h0+Ss;) zf6y*%7W7O$PRa?? z70b`uJ07tUwjPo6n{m1@r!2uq_vEWpNmAawdV@Ewo0}^=Wtu?K&3MB{qBYCjPT#Pi g^Zu6k4;RYwd>7rm_+IIKpnn-WUHx3vIVCg!02iD?4FCWD literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/trash-full.png b/rtdata/images/themed/png/dark/trash-full.png new file mode 100644 index 0000000000000000000000000000000000000000..699d2b8ac47b8392318ce73809e77f39037aad5f GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpCS1AIbU&wzn@fe(;Ad-g1Z3nWjU zK8?%;ikv@xURrnAOQ1&nk|4j}XPX&Hx#P0xR*0{gKjoZ9Q>wioP^!e!#W6(Ua&mwZ z6OV$^(r>$j=PW*Rpr9#PXvX65@4CzaCXJT6coGhxF9=FInuBS558ZjE8x*XpQId)j59++b( gaLzNM;Q#|e%Vp~{yKQx0K>HayUHx3vIVCg!0K^=)R{#J2 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/trash-hide-deleted.png b/rtdata/images/themed/png/dark/trash-hide-deleted.png index 94c1b6722b7ed49e64b1a1ab4ad69c447fe563c1..ffbb9f39191cbfd210273784a447bf070fa15b35 100644 GIT binary patch delta 371 zcmaFI@{VN#D`S0lfKQ04dx6iHGiOdjMgmD7ID7Uih&p{5M1sNb=H`PO9H&p8K6dOF zMC1@B=Rt06pa_tA$j0X5$B!U}u<-fw=MQUW08Kc+$kT+b_LKf+tI`uR1!18)^g=eQM03cj#RTC;F#Uef!6A0qO9aI@_bIWKZ5n~^Q% zT=7B!_A1By3V_JJ$rzO=`S~3jq+t2l@DbCLCg8JIKa%SVQ9!Z^;4%1_qguAirP+v+S!OeE&8} zl*>$yuVYox74cfr{z6Tq@L>J6fDI?@fd(*~@pN$v(Kz2a>E))w3LI{M%|gD9rfseL z|6QkS_r)`J=FOk;&{=}9Zj*HKrajk|KRg+7b<&ig_uQK%+$)>qd-#vgp%?-Gjb-B3 z!nwck&KD1u-BPc#d(%;kHL=#^Vw`D{3zd`{wEdk9oG_|#>X^1b$oA;t4-!|;W?yr< zuAHaGwEhx`7Y8U7#Qsrm3{AwSS#44$rj JF6*2UngE#jxg!7o diff --git a/rtdata/images/themed/png/light/trash-delete.png b/rtdata/images/themed/png/light/trash-delete.png new file mode 100644 index 0000000000000000000000000000000000000000..7d0c422f7760540bcd34b1f08516ca05a6c3f91c GIT binary patch literal 1057 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>Pnv;&(KNs(#MQmPM@2+JV04xW#uPNo){S!?b@}gu(0sZp+j4?Z0YLinml>(h7B9$&YcUC0*dV4zyIXP zlM5Cs04mtKcP|$gS5i_ECnqP+Iv}^dzyJLC^NSZRj){r6diCn@-q@bX{+uPgK)%C@T7m109%a<>|c=2LLNQk4Oqp7K>xw-kyojaYJoN{w> zosNH)3=Gxuk|4iehR@&D`aC}{bMv*XH;b4X&tK#eUw?norK6Ab@!gtw`DxN8r44uA zKa@<^pTAUg>7hLzCSSO_JMz}^-JdqZ7Jd5g=-tcuiI1sN<`Omq#yj zDCt-$^XA#tA7^E6o~yfXzCUr+=?1BOV4MYex;TbtoGXE9D!3)LnCwNRV^0T6ZC-5-09?%73I5M?3Vk#t={Z!MXTLM%X#M%{DKq~rF5F# rt*rm;Rb3w>(lYtaqZrAH`)impf2ye)Z`{`aj8O(pS3j3^P6nBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s#9pDq|=E{-7@ z=Swej_BAVrI0SOJF6`*w-Vwcf-~a!Iy0*x!ndzORpx(&h^3i_bdmSf^)QfT-GI`q@ zPG@xPyrZ&dW&0L4`>QFfLT|0sEa=-k#lCsd{13kiqMF3y?6EfTGveY4mvImaP?fi(9fC+=swR~R2} z`c%+b&Cw|(#V`CsdIOstUk2k}wic-aTVli&JUL8f%{MRTov=J!;B%4Zn%QS;^DFtx z-^>rI$(tbic4b}6`GRj3IzLQh@zs|7qw1InBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}sVA;2fZRaI40MMXtJLqkqO#w&a~E>-tv8=K#ko38()t|wT}vC4cP{g?lJdu$4;^jog_ zhUJfUU*9ERt#kEZvuOu=Z6v4F6Mx>A^G@%4IU<7=m>MqF%TaZ(F}T6xpss7byM>m; z{$q0)!#`O#^EUGtik)P#wCT|=@@ke`7a(y!L`0ZH=pEY@TznBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_7T^=&stN`wDk?x4NGd2OKt$XN zeAK}J$OY06K`kvUH85B&BzY8Qf>242U+}ZKbt~d{3N|y8i_cG+a*oX*fOENX3sAPs z)5S4F|FSOH8|G8_sVjbm_}fpi3A$UHx3vIVCg!0Bn?} As{jB1 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/trash-hide-deleted.png b/rtdata/images/themed/png/light/trash-hide-deleted.png index 2d26d230a38b2399e0bb8e95200b01ad81d93732..319a0dd4a692023679e7eaf6ef497f7af32579ee 100644 GIT binary patch delta 382 zcmeyv@{?r)D`S0ZfKQ04dx1}lkdTUsimIxrnwpxjvNDjNp`igJA;17E1!M!&WQmFG zWn|pN$Ou%ngOL#;xQ&Tv0v8uhWD_$pPz?|)WMcywwV#2(VUu$W0|SFxNswPKgO=d@ za=to=&Cg=xrk-0Zf1`en|4Y`)ixxJ2@Am|_i1QRL11de^>EaloalZA^O`&E59@c>7 zw$-VEg>RqzuTQ(|d$H`+?*lz^3Z0lDznRZ1^DB>c2p4+oe@|t0_;a=Jy^n+=%-&n7 z2IPK{57~J7caBE+L(v+&`#b0H_-xUX`BnV#U_(&OFOi~Hw{^TCDKE>+0v5>4iVDn_ zc5S{vV$SonHp>e|ci1I1oT%Yx;T2){?Ap-KZ?C~&lExm`b^f7J=_~UO%sMN0mmDiw zAhJfUT5Xcuv8_8A-lnPq$$x(*e&S7b#lDV@1?R5sHZ_~O_UZioXKW(BdDmCWYY_u_ OjKR~@&t;ucLK6U1iICF( delta 385 zcmey#@`q&uD`S0BfKQ04dx4L+l9HO5+I|KGb#-+W6%|!5(A3maR#pabfeeTUP}W63 zVHz*5l9JL^CZ+=n3_x+9#_dc@dl?vjjNM=np!h;IHX!+Y<)^s}3=Fa*L4Lsuvb!g?KS`>KPq6MPF z^jECd{PExV%8QXAzG>(9nQR;Rr5NfKb!e-KySI7j$%lP4}(2T;gEw>aM;k zl%-h7X8Vn22Y$2F*m&kB{oJ(gC7-3lesSdruS15>0xQZM@ta7#*w|sTqtYv8$Ncmy zd-o`XEP9-IqIgPV+x88s9oj6OR8O0zUHEWQ-IJR6JH)IEz8F2PIofOx^XgMz(FQTO z<&JLB?Yc2KZ?7y#=z1z^_`&aonc&o#w1d$WKf*r;B_9jBZztJMcRyNxU)`+wWsJOK U-&VbJ2l|h})78&qol`;+0D0k*9RL6T diff --git a/rtdata/images/themed/svg/trash-delete.svg b/rtdata/images/themed/svg/trash-delete.svg new file mode 100644 index 000000000..7593e6001 --- /dev/null +++ b/rtdata/images/themed/svg/trash-delete.svg @@ -0,0 +1,368 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/trash-show.svg b/rtdata/images/themed/svg/trash-empty-show.svg similarity index 100% rename from rtdata/images/themed/svg/trash-show.svg rename to rtdata/images/themed/svg/trash-empty-show.svg diff --git a/rtdata/images/themed/svg/trash.svg b/rtdata/images/themed/svg/trash-empty.svg similarity index 99% rename from rtdata/images/themed/svg/trash.svg rename to rtdata/images/themed/svg/trash-empty.svg index b86856309..47ceae609 100644 --- a/rtdata/images/themed/svg/trash.svg +++ b/rtdata/images/themed/svg/trash-empty.svg @@ -18,7 +18,7 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="trash.svg"> + sodipodi:docname="trash-empty.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/trash-full.svg b/rtdata/images/themed/svg/trash-full.svg new file mode 100644 index 000000000..eae5920e3 --- /dev/null +++ b/rtdata/images/themed/svg/trash-full.svg @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/trash-hide-deleted.svg b/rtdata/images/themed/svg/trash-hide-deleted.svg index 64d4d5915..e70aa21e1 100644 --- a/rtdata/images/themed/svg/trash-hide-deleted.svg +++ b/rtdata/images/themed/svg/trash-hide-deleted.svg @@ -27,11 +27,11 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="34.25" - inkscape:cx="7.7372263" + inkscape:cx="12" inkscape:cy="12" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" @@ -253,16 +253,6 @@ id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1"> - - + + + + diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 8b552a51f..a7ac089a3 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -74,7 +74,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : trashButtonBox = Gtk::manage( new Gtk::VBox ); Gtk::Button* emptyT = Gtk::manage( new Gtk::Button ()); emptyT->set_tooltip_markup (M("FILEBROWSER_EMPTYTRASHHINT")); - emptyT->set_image (*Gtk::manage(new RTImage ("trash.png"))); + emptyT->set_image (*Gtk::manage(new RTImage ("trash-delete.png"))); emptyT->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::emptyTrash)); trashButtonBox->pack_start (*emptyT, Gtk::PACK_SHRINK, 4); emptyT->show (); @@ -294,11 +294,11 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK); // Trash - iTrashEmpty = new RTImage("trash.png") ; - iTrashFull = new RTImage("trash-show.png") ; + iTrashShowEmpty = new RTImage("trash-empty-show.png") ; + iTrashShowFull = new RTImage("trash-full-show.png") ; bTrash = Gtk::manage( new Gtk::ToggleButton () ); - bTrash->set_image (*iTrashEmpty); + bTrash->set_image (*iTrashShowEmpty); bTrash->set_relief (Gtk::RELIEF_NONE); bTrash->set_tooltip_markup (M("FILEBROWSER_SHOWTRASHHINT")); bCateg[17] = bTrash->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bTrash, true)); @@ -471,8 +471,8 @@ FileCatalog::~FileCatalog() delete igUnRanked; delete iUnCLabeled; delete igUnCLabeled; - delete iTrashEmpty; - delete iTrashFull; + delete iTrashShowEmpty; + delete iTrashShowFull; delete iNotTrash; delete iOriginal; delete iRefreshWhite; @@ -1975,9 +1975,9 @@ void FileCatalog::setFilterPanel (FilterPanel* fpanel) void FileCatalog::trashChanged () { if (trashIsEmpty()) { - bTrash->set_image(*iTrashEmpty); + bTrash->set_image(*iTrashShowEmpty); } else { - bTrash->set_image(*iTrashFull); + bTrash->set_image(*iTrashShowFull); } } diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index 29e4a370a..66f14b6b2 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -104,7 +104,7 @@ private: Gtk::Image* iCLabeled[5], *igCLabeled[5], *iUnCLabeled, *igUnCLabeled; Gtk::Image* iEdited[2], *igEdited[2]; Gtk::Image* iRecentlySaved[2], *igRecentlySaved[2]; - Gtk::Image *iTrashEmpty, *iTrashFull; + Gtk::Image *iTrashShowEmpty, *iTrashShowFull; Gtk::Image *iNotTrash, *iOriginal; Gtk::Image *iRefreshWhite, *iRefreshRed; Gtk::Image *iLeftPanel_1_Show, *iLeftPanel_1_Hide, *iRightPanel_1_Show, *iRightPanel_1_Hide;