From a0021d3348d49c94ebb649b939f1d526b0b17d17 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 17 Jul 2018 00:00:32 +0200 Subject: [PATCH] Icon tweaks and fixes, #4469 Ticks, used for edited image, are now theme-colored. Missing ticks and missing CD-ROM icons fixed. --- .../png/dark/tick-green-hollow-small.png | Bin 420 -> 412 bytes .../themed/png/dark/tick-green-hollow.png | Bin 501 -> 520 bytes .../themed/png/dark/tick-green-small.png | Bin 402 -> 403 bytes rtdata/images/themed/png/dark/tick-green.png | Bin 443 -> 447 bytes .../themed/png/dark/tick-hollow-small.png | Bin 0 -> 404 bytes .../png/light/tick-green-hollow-small.png | Bin 420 -> 412 bytes .../themed/png/light/tick-green-hollow.png | Bin 501 -> 520 bytes .../themed/png/light/tick-green-small.png | Bin 402 -> 403 bytes rtdata/images/themed/png/light/tick-green.png | Bin 443 -> 447 bytes .../themed/png/light/tick-hollow-small.png | Bin 0 -> 412 bytes .../themed/svg/tick-green-hollow-small.svg | 10 +- .../images/themed/svg/tick-green-hollow.svg | 10 +- rtdata/images/themed/svg/tick-green-small.svg | 8 +- rtdata/images/themed/svg/tick-green.svg | 8 +- .../images/themed/svg/tick-hollow-small.svg | 110 ++++++++++++++++++ rtgui/dirbrowser.cc | 2 +- rtgui/filebrowserentry.cc | 2 +- rtgui/filecatalog.cc | 8 +- 18 files changed, 134 insertions(+), 24 deletions(-) create mode 100644 rtdata/images/themed/png/dark/tick-hollow-small.png create mode 100644 rtdata/images/themed/png/light/tick-hollow-small.png create mode 100644 rtdata/images/themed/svg/tick-hollow-small.svg diff --git a/rtdata/images/themed/png/dark/tick-green-hollow-small.png b/rtdata/images/themed/png/dark/tick-green-hollow-small.png index 84a4747ed4bd873a8c760248bcdf6f8bc6874ee5..176bf5489c0998af5cb7a685052344294ba332b0 100644 GIT binary patch delta 160 zcmZ3&JcoG$D`UM-fKP}kLn8x20|StBFYsY#2C+9>Soe;Bfq|_g$S+uPi6Mj1BANI? zNuWrOr;B3<$Ms}`HYT=^wnpPA2PK#iB{)`EHB0uK>N>-7jO`SglN*zRrkmn~2E*n? z0cDQ^GY-0(U{GP0QWVO@$snobsK7YEvX3c1+h@i`i3lzh21^k!-igth4*-p4@O1Ta JS?83{1OR&CE_MI_ delta 168 zcmbQkyo7lJD`UNAfKP}kLj!|*fe(-bp+*LVDiA{_^4&!S1_rj0Aiv-?hB*_f8O4sg zQ2~mCd%8G=a9mFoXklUtX=_lPa&Q_`B8SRq%O=U3Wod0ZO-!qpJP)39(A<_{9Bl07 z$kwQ`?a2d{1!WVLFa(>rO|Z;c<;a=9>^jMTNkO6bj?jXz4uhnPA{-1h7x+crUVKpk Pw1dIZ)z4*}Q$iB}r`t8o diff --git a/rtdata/images/themed/png/dark/tick-green-hollow.png b/rtdata/images/themed/png/dark/tick-green-hollow.png index 168127adbaaa22d81eab8c3186e1596db5f31d53..7cac33dc0167617906b70fa35d31b8ac99cb07a0 100644 GIT binary patch delta 281 zcmey$+`%$If|G@rfq_9NQsMMO#V7T;0X`wF3=ItK1wIVT3=FLdKsE|$XJBYV5m_;{ zc0bSn{*oZS;LQvQEKAo{M%oJ2noenKU*>w`4^V2Br;B5V#N}iG7bcz?mR%k)A2U?^ z7+666=muzt11&t2iHZw;O|`^t;fTsBfqzi}2QTjA;A7@~20?WNN~ z4GJ6%fhN3bb)NpWH>>gK^(`{PCXk3g`$1Pgg&ebxsLQ0BuBH5C8xG diff --git a/rtdata/images/themed/png/dark/tick-green-small.png b/rtdata/images/themed/png/dark/tick-green-small.png index c09109a48fa832bdd6ba31edfacf2027d5a37790..54cf5d024a0b0089d6bf4cec5c4a5532acf8b7d5 100644 GIT binary patch delta 132 zcmbQlJehfeIAcu{149D?LmdM{BLhP{gEhaTA_D^hXGxG>FvDi?c||s*$?ZQbzOMla z+IqS;hHzX@PB_5WwZNo%15?XHjT;Pt0xexCTvCiD6IeSKRxg;S9MRw!Ah7CCpny)p klGcM4IkI$iGnHjC?n`9-Q2u7#JfJ}gp00i_>zopr09}A9zW@LL delta 131 zcmbQtJc)UOIAe7q149D>F`s_tz`(%3Q4-`A%%J#iap4_4LcVzuR64dS*Kx1>p>^MES=d5 bW!a3KK|C$LcPi%s4Px+g^>bP0l+XkKXdNn= diff --git a/rtdata/images/themed/png/dark/tick-green.png b/rtdata/images/themed/png/dark/tick-green.png index b08cda5f251ad62785010ee5ecfca92a200182f8..2458734b250a3cf1833a06345e1fd783982cf63e 100644 GIT binary patch delta 195 zcmdnZyq|dkD`UMxfKP}kLj!|*fe(;`qDCm=r_aAR3=9k$B|(0{n;GWWNEC|&NSu1Z z4HV1uba4!kxIA^jLEZ)h0T%PJ1icc6n)o*jd|w{l=X>-2sosf)!TO4cWjmT1eun;F z$d*hv!7LN($dTaQk*Kn0IoH99M;28JSua-OkS=|OffJ!?HF`|FRtT_Xkv;# dn*fh6!=wpn<#RKhYzA7z;OXk;vd$@?2>?x@JHr3~ diff --git a/rtdata/images/themed/png/dark/tick-hollow-small.png b/rtdata/images/themed/png/dark/tick-hollow-small.png new file mode 100644 index 0000000000000000000000000000000000000000..e5e492debbf5f1ba254e089d185c09d96a806c98 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*FN~z$e7@EEu>K_?$U&2FSb+^?UVaei}l@IR$1^hf+978y+=k^}tJz&7WESSPHi}8++fLX@3_*H5TgICtg zJvT{ru~K}4*o|U_i>1v!T^p3&ojj#Soe;Bfq|_g$S+uPi6Mj1BANI? zNuWrOr;B3<$Ms}`HYT=^wnpPA2PK#iB{)`EHB0uK>N>-7jO`SglN*zRrkmn~2E*n? z0cDQ^GY-0(U{GP0QWVO@$snobsK7YEvX3c1+h@i`i3lzh21^k!-igth4*-p4@O1Ta JS?83{1OR&CE_MI_ delta 168 zcmbQkyo7lJD`UNAfKP}kLj!|*fe(-bp+*LVDiA{_^4&!S1_rj0Aiv-?hB*_f8O4sg zQ2~mCd%8G=a9mFoXklUtX=_lPa&Q_`B8SRq%O=U3Wod0ZO-!qpJP)39(A<_{9Bl07 z$kwQ`?a2d{1!WVLFa(>rO|Z;c<;a=9>^jMTNkO6bj?jXz4uhnPA{-1h7x+crUVKpk Pw1dIZ)z4*}Q$iB}r`t8o diff --git a/rtdata/images/themed/png/light/tick-green-hollow.png b/rtdata/images/themed/png/light/tick-green-hollow.png index 168127adbaaa22d81eab8c3186e1596db5f31d53..7cac33dc0167617906b70fa35d31b8ac99cb07a0 100644 GIT binary patch delta 281 zcmey$+`%$If|G@rfq_9NQsMMO#V7T;0X`wF3=ItK1wIVT3=FLdKsE|$XJBYV5m_;{ zc0bSn{*oZS;LQvQEKAo{M%oJ2noenKU*>w`4^V2Br;B5V#N}iG7bcz?mR%k)A2U?^ z7+666=muzt11&t2iHZw;O|`^t;fTsBfqzi}2QTjA;A7@~20?WNN~ z4GJ6%fhN3bb)NpWH>>gK^(`{PCXk3g`$1Pgg&ebxsLQ0BuBH5C8xG diff --git a/rtdata/images/themed/png/light/tick-green-small.png b/rtdata/images/themed/png/light/tick-green-small.png index c09109a48fa832bdd6ba31edfacf2027d5a37790..54cf5d024a0b0089d6bf4cec5c4a5532acf8b7d5 100644 GIT binary patch delta 132 zcmbQlJehfeIAcu{149D?LmdM{BLhP{gEhaTA_D^hXGxG>FvDi?c||s*$?ZQbzOMla z+IqS;hHzX@PB_5WwZNo%15?XHjT;Pt0xexCTvCiD6IeSKRxg;S9MRw!Ah7CCpny)p klGcM4IkI$iGnHjC?n`9-Q2u7#JfJ}gp00i_>zopr09}A9zW@LL delta 131 zcmbQtJc)UOIAe7q149D>F`s_tz`(%3Q4-`A%%J#iap4_4LcVzuR64dS*Kx1>p>^MES=d5 bW!a3KK|C$LcPi%s4Px+g^>bP0l+XkKXdNn= diff --git a/rtdata/images/themed/png/light/tick-green.png b/rtdata/images/themed/png/light/tick-green.png index b08cda5f251ad62785010ee5ecfca92a200182f8..2458734b250a3cf1833a06345e1fd783982cf63e 100644 GIT binary patch delta 195 zcmdnZyq|dkD`UMxfKP}kLj!|*fe(;`qDCm=r_aAR3=9k$B|(0{n;GWWNEC|&NSu1Z z4HV1uba4!kxIA^jLEZ)h0T%PJ1icc6n)o*jd|w{l=X>-2sosf)!TO4cWjmT1eun;F z$d*hv!7LN($dTaQk*Kn0IoH99M;28JSua-OkS=|OffJ!?HF`|FRtT_Xkv;# dn*fh6!=wpn<#RKhYzA7z;OXk;vd$@?2>?x@JHr3~ diff --git a/rtdata/images/themed/png/light/tick-hollow-small.png b/rtdata/images/themed/png/light/tick-hollow-small.png new file mode 100644 index 0000000000000000000000000000000000000000..9a09739629f5f94ecda193cf2bbbd346427005c5 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D0|z$e621q|E^d{k9c)xaR(Q2lbC zEL%yCU$CYj!xE*%Pa>M914V*7T^vI=t|tdHF|mcTH3?5SD8rPfA<<>kD0#-|kPnX+ zmlIc87n_4-n)8GPq2?w + sodipodi:docname="tick-green-hollow-small.svg"> + style="opacity:0.7;fill:none;fill-opacity:1;stroke:#008000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/rtdata/images/themed/svg/tick-green-hollow.svg b/rtdata/images/themed/svg/tick-green-hollow.svg index 04b591787..9b1eca47d 100644 --- a/rtdata/images/themed/svg/tick-green-hollow.svg +++ b/rtdata/images/themed/svg/tick-green-hollow.svg @@ -18,7 +18,7 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="tick-hollow-large.svg"> + sodipodi:docname="tick-green-hollow.svg"> image/svg+xml - + Maciej Dworak @@ -104,6 +104,6 @@ inkscape:connector-curvature="0" id="path2996-6" d="M 5.6097942,10.407824 8.8048964,13.592176 18.390205,4.0391229 21.585308,7.2234736 8.8048964,19.960877 2.414692,13.592176 Z" - style="opacity:1;fill:none;fill-opacity:1;stroke:#008000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> + style="opacity:0.7;fill:none;fill-opacity:1;stroke:#008000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> diff --git a/rtdata/images/themed/svg/tick-green-small.svg b/rtdata/images/themed/svg/tick-green-small.svg index ff440a6c9..edf2dd4b4 100644 --- a/rtdata/images/themed/svg/tick-green-small.svg +++ b/rtdata/images/themed/svg/tick-green-small.svg @@ -18,7 +18,7 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="tick-small.svg"> + sodipodi:docname="tick-green-small.svg"> image/svg+xml - + Maciej Dworak @@ -105,6 +105,6 @@ inkscape:connector-curvature="0" id="path2996-6" d="m 3.3333326,14.833333 2.3333332,2.333334 6.9999992,-7 L 15,12.5 5.6666658,21.833333 0.9999997,17.166667 Z" - style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" /> + style="opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" /> diff --git a/rtdata/images/themed/svg/tick-green.svg b/rtdata/images/themed/svg/tick-green.svg index ccbfe4f31..fa250d9fe 100644 --- a/rtdata/images/themed/svg/tick-green.svg +++ b/rtdata/images/themed/svg/tick-green.svg @@ -18,7 +18,7 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="tick-large.svg"> + sodipodi:docname="tick-green.svg"> image/svg+xml - + Maciej Dworak @@ -104,6 +104,6 @@ inkscape:connector-curvature="0" id="path2996-6" d="M 4.6666624,10.166665 8.3333305,13.833335 19.333336,2.833329 23.000006,6.4999972 8.3333305,21.166671 0.99999442,13.833335 Z" - style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" /> + style="opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" /> diff --git a/rtdata/images/themed/svg/tick-hollow-small.svg b/rtdata/images/themed/svg/tick-hollow-small.svg new file mode 100644 index 000000000..010fba31e --- /dev/null +++ b/rtdata/images/themed/svg/tick-hollow-small.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc index d0bee943d..501296860 100644 --- a/rtgui/dirbrowser.cc +++ b/rtgui/dirbrowser.cc @@ -123,7 +123,7 @@ void DirBrowser::fillDirTree () openfolder = RTImage::createFromFile ("folder-open-small.png"); closedfolder = RTImage::createFromFile ("folder-closed-small.png"); - icdrom = RTImage::createFromFile ("drive-optical.png"); + icdrom = RTImage::createFromFile ("device-optical.png"); ifloppy = RTImage::createFromFile ("device-floppy.png"); ihdd = RTImage::createFromFile ("device-hdd.png"); iremovable = RTImage::createFromFile ("device-usb.png"); diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index 974b7a36f..f457ae165 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -56,7 +56,7 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname) scale = 1; if (!iconsLoaded) { - editedIcon = RTImage::createFromFile ("tick-green-large"); + editedIcon = RTImage::createFromFile ("tick-small.png"); recentlySavedIcon = RTImage::createFromFile ("save-small.png"); enqueuedIcon = RTImage::createFromFile ("gears.png"); hdr = RTImage::createFromFile ("filetype-hdr.png"); diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index a7ac089a3..d0866a021 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -243,10 +243,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : // TODO The "g" variant was the more transparent variant of the icon, used // when the button was not toggled. Simplify this, change to ordinary // togglebutton, use CSS for opacity change. - iEdited[0] = new RTImage ("tick-green-hollow-small.png"); - igEdited[0] = new RTImage ("tick-green-hollow-small.png"); - iEdited[1] = new RTImage ("tick-green-small.png"); - igEdited[1] = new RTImage ("tick-green-small.png"); + iEdited[0] = new RTImage ("tick-hollow-small.png"); + igEdited[0] = new RTImage ("tick-hollow-small.png"); + iEdited[1] = new RTImage ("tick-small.png"); + igEdited[1] = new RTImage ("tick-small.png"); for (int i = 0; i < 2; i++) { iEdited[i]->show ();