From 659901212ad2299f8a70c33d4199ea1e052b6da6 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 29 Jul 2018 15:13:35 +0200 Subject: [PATCH] Icon tweaks and cleanup - Color-unranked icons tweaked for lighter themes, closes #4704 - Star-unranked icons smaller to increase contrast, #4469 - Deleted old icons which snuck back in with the ICC geneartor merge. --- rtdata/images/Dark/actions/gamut-plus.png | Bin 824 -> 0 bytes rtdata/images/Light/actions/gamut-plus.png | Bin 819 -> 0 bytes .../themed/png/dark/circle-darkgray-small.png | Bin 0 -> 389 bytes .../themed/png/dark/circle-gray-small.png | Bin 0 -> 396 bytes rtdata/images/themed/png/dark/star-small.png | Bin 438 -> 396 bytes .../png/light/circle-darkgray-small.png | Bin 0 -> 389 bytes .../themed/png/light/circle-gray-small.png | Bin 0 -> 396 bytes rtdata/images/themed/png/light/star-small.png | Bin 438 -> 397 bytes .../themed/svg/circle-darkgray-small.svg | 110 +++ .../images/themed/svg/circle-gray-small.svg | 110 +++ rtdata/images/themed/svg/gamut-plus.svg | 14 +- rtdata/images/themed/svg/star-small.svg | 8 +- rtgui/filebrowser.cc | 3 +- rtgui/filecatalog.cc | 7 +- rtgui/filethumbnailbuttonset.cc | 2 +- tools/source_icons/scalable/gamut-plus.file | 1 - tools/source_icons/scalable/gamut-plus.svg | 653 ------------------ 17 files changed, 238 insertions(+), 670 deletions(-) delete mode 100644 rtdata/images/Dark/actions/gamut-plus.png delete mode 100644 rtdata/images/Light/actions/gamut-plus.png create mode 100644 rtdata/images/themed/png/dark/circle-darkgray-small.png create mode 100644 rtdata/images/themed/png/dark/circle-gray-small.png create mode 100644 rtdata/images/themed/png/light/circle-darkgray-small.png create mode 100644 rtdata/images/themed/png/light/circle-gray-small.png create mode 100644 rtdata/images/themed/svg/circle-darkgray-small.svg create mode 100644 rtdata/images/themed/svg/circle-gray-small.svg delete mode 100644 tools/source_icons/scalable/gamut-plus.file delete mode 100644 tools/source_icons/scalable/gamut-plus.svg diff --git a/rtdata/images/Dark/actions/gamut-plus.png b/rtdata/images/Dark/actions/gamut-plus.png deleted file mode 100644 index 2ef6f60419c9aa6a674f37bbcca138eed48bc054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#Cko zOEU6{7<_@kiFpbhiA5>p`S~dc0i`#AD%2pxlolnYG6W@-hh(G{0gXsi02x@6SY86< z>m}#sUXA#e2GkJ*(&3z6P+63jo>9W!?5yBeQc{$eR9cdmpQjs~0d$UIPG)whLPkkR zft9{~a#3nxNoH9p(1hIlykd~+^m8(kQ}c>bi}jN#b&C`AP4o=(4~HbNGB7YPd%8G= zSoH3l;-4MtD01}t%;{O?7sFWvMOYkN!(BH8NNu?I{lu{vhVs^3-;BR{OI#{(DiA)> z72qo1!t!{2s7au9?kw};t!I_%pDkUvAicPKW_5k>^SPDGf0PR?CLD2FTJf&%FaWKR4J3m!CudTlN>gawp>EtKg6Q;yRL_}=9cF%&( z!gPJydV7V+vy(Tw85Nvsd}7Y9n?dhEzdbX&CA6vxvo}FCcAS5?;D$68=N~r_; zmMmOo$uPafRddFZ^*zC*9&EzJ>I^E8vgf()O*m$6f3kg&nCCX2Ti#dmz9AS(${f~bf-m~HVqWdO(S03>znqLJbHU>{uKbLh*2~7YY?O0L( diff --git a/rtdata/images/Light/actions/gamut-plus.png b/rtdata/images/Light/actions/gamut-plus.png deleted file mode 100644 index 0270d145d0b2efa80cfa19ef8068b84c44c1c28a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 819 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#Cko zOEU6{7<_@kiFpbhiA5>p`S~dc0i`#AD%2pxlolnYG6W@-hh(G{0gXsi02x@6SY86< z>m}#sUXA#e2GkJ*(&3z6P+63jo>9W!?5yBeQc{$eR9cdmpQjs~0d$UIPG)whLPkkR zft9{~a#3nxNoH9p(1hIlykd~+^m8(kQ}c>bi}jN#b&C`AP4o=(4~HbNGB7ay^K@|x zvFP19#lQPW}%>|}JS zpV=joyDP81o_=bQxF)l8pE0{a1_SSlQlb6PP)T)_`|!*12;cR2|Dj_ zZ`+Za?hbAS6@J$z9xm%9e{o51`Bbg=&n0{BR9=6VHkH6B9V|Qlx-zJ%v`==DYnW|z zT=GWYoaAip6r<8P+7BknOt+lJD4pCVd%V$gz0O=4_6=^I9I|WgPn)8?bXx3Wlbh0mlX>JzL*g=?8FL>&DZa!kT`)9cE(<=0>Tow08|Cu%;Vru$MWF> zlTXa`w^y>Z?k(GG8+GaIoa8N0Yl|~y?VGVntumqKWyady45#uAJWXK8Fq<9D)_ic< m``_}r?!LPon)u(fo-yUj#)nK{5AOie8H1;*pUXO@geCwBW?CQs diff --git a/rtdata/images/themed/png/dark/circle-darkgray-small.png b/rtdata/images/themed/png/dark/circle-darkgray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..e706b1eba3afb828bd04587ddbe76595b7285793 GIT binary patch literal 389 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$e7jy}&0iF)=8k;^H1| zUhWT+Wh)8t3ufrwyxK=NzQgDPP{i8P#W95AdUC=6rid0^SqGEV6DCbcVwiAn1q%z4 zLz{5NLZ%dsMu{$mHo=aCJ!cxc4~ib%dYHE*x{;5e-k9ULgnY|SpfL=du6{1-oD!M< D4%2>( literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/circle-gray-small.png b/rtdata/images/themed/png/dark/circle-gray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..18ad6330a5e5950cd550567ed560a2213e238193 GIT binary patch literal 396 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*D19z$e7jy};)H7#uu!aR2`Od-m)B z^0IAjSppTXmjw9*GxTj-;VtZY@byFmppc!Xi(?4K_2h&DOgCD1WgSdbPna|*iDAOQ z6)Y@F4sJpn3zbP0l+XkKk#dK~ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png index f9e4a7361f48670b5f06f3a8b6abccd12c74dce7..c8f21783cbd2ffc5bf35d191985dfd494593fe9e 100644 GIT binary patch delta 144 zcmdnS+{3(qm9btfz$e7jy};+pnKP$Pp9YerPMw0VfsFI#&!0Ve_O;2$00ssIu96_X zV1_E*WEECds{jub#kN$SsFA0OV+hCf};197z%S({@idiO9$#^;P750C)_r%#^-a)AKIK6UEUR{5IG3=9n1 zB|(0{E|oD1(pfrzs;pMw73Ncb!V#V>jv*Y^lMULK*c8kP+l+dqEaY())NuCXJhCB$ zOC&)gbjF#4IV%nvIH1BdWs^X9f`$*xX95+?vHVeoYIb6Mw<&;$Stuu7Ex diff --git a/rtdata/images/themed/png/light/circle-darkgray-small.png b/rtdata/images/themed/png/light/circle-darkgray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..e706b1eba3afb828bd04587ddbe76595b7285793 GIT binary patch literal 389 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$e7jy}&0iF)=8k;^H1| zUhWT+Wh)8t3ufrwyxK=NzQgDPP{i8P#W95AdUC=6rid0^SqGEV6DCbcVwiAn1q%z4 zLz{5NLZ%dsMu{$mHo=aCJ!cxc4~ib%dYHE*x{;5e-k9ULgnY|SpfL=du6{1-oD!M< D4%2>( literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/circle-gray-small.png b/rtdata/images/themed/png/light/circle-gray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..18ad6330a5e5950cd550567ed560a2213e238193 GIT binary patch literal 396 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*D19z$e7jy};)H7#uu!aR2`Od-m)B z^0IAjSppTXmjw9*GxTj-;VtZY@byFmppc!Xi(?4K_2h&DOgCD1WgSdbPna|*iDAOQ z6)Y@F4sJpn3zbP0l+XkKk#dK~ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/light/star-small.png index d4ecdd6a87f75fa1e9621c7163d87a5bc00e22f6..8ff98fa6bb095c7b692af37abaf340a78791c5fb 100644 GIT binary patch delta 145 zcmdnS+{?Uym9btfz$e7jy}(CRRaH+G}P48fDFOo`?DAr7`RG; z{DK*(INZb&w5$R$c|)G?14WHJT^vI=t|uoP;GQ9}fG3Sv<8UC0lXMpwSF_}*$-2!7 sS*lWst0GxgWe@OdQ~Junc8P%@bPCIkb&(F9K<%6ip00i_>zopr05hj13;+NC delta 186 zcmeBW-p0Ivm9btiz$e626%5=9d>{-UsRjlrDk{dt#u^$LtWox23=9n1B|(0{E|mmKL;g(Ey&978y+CkHe!u_=TVHW^LnUBKfmsB!p)#E}arz9I=C+%t|W z2+25b;D8R_luH7s2^>01D>YLR1lWzV^O6%zFc?ph + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/circle-gray-small.svg b/rtdata/images/themed/svg/circle-gray-small.svg new file mode 100644 index 000000000..6ed1fd51d --- /dev/null +++ b/rtdata/images/themed/svg/circle-gray-small.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/gamut-plus.svg b/rtdata/images/themed/svg/gamut-plus.svg index 4f4ed503b..218f3068d 100644 --- a/rtdata/images/themed/svg/gamut-plus.svg +++ b/rtdata/images/themed/svg/gamut-plus.svg @@ -17,7 +17,7 @@ inkscape:export-filename="/tmp/template.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.2 2405546, 2018-03-11" sodipodi:docname="gamut-plus.svg"> + transform="matrix(0.48946382,-0.15758811,0.15903644,0.48500634,1.5397064,9.0803117)" + inkscape:transform-center-y="-0.29218439" /> diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 81b3dc274..edd37f7dd 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -202,7 +202,8 @@ FileBrowser::FileBrowser () : * color labels ***********************/ - // Same image arrays in filecatalog.cc + // Thumbnail context menu + // Similar image arrays in filecatalog.cc std::array clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"}; std::array clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"}; diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 58184aa1c..a0d767d79 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -193,9 +193,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : bRank[i]->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false); } - // Same image arrays in filebrowser.cc - std::array clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"}; - std::array clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"}; + // Toolbar + // Similar image arrays in filebrowser.cc + std::array clabelActiveIcons = {"circle-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"}; + std::array clabelInactiveIcons = {"circle-empty-gray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"}; iUnCLabeled = new RTImage(clabelActiveIcons[0]); igUnCLabeled = new RTImage(clabelInactiveIcons[0]); diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index 99ae18a8c..d32c1c339 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -49,7 +49,7 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) unTrashIcon = RTImage::createFromPng ("trash-remove-small.png"); processIcon = RTImage::createFromPng ("gears-small.png"); - colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); //("nocolorlabel.png"); + colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); colorLabelIcon_1 = RTImage::createFromPng ("circle-red-small.png"); colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow-small.png"); colorLabelIcon_3 = RTImage::createFromPng ("circle-green-small.png"); diff --git a/tools/source_icons/scalable/gamut-plus.file b/tools/source_icons/scalable/gamut-plus.file deleted file mode 100644 index ec6f9f83f..000000000 --- a/tools/source_icons/scalable/gamut-plus.file +++ /dev/null @@ -1 +0,0 @@ -gamut-plus.png,w22,actions diff --git a/tools/source_icons/scalable/gamut-plus.svg b/tools/source_icons/scalable/gamut-plus.svg deleted file mode 100644 index 268bcde62..000000000 --- a/tools/source_icons/scalable/gamut-plus.svg +++ /dev/null @@ -1,653 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - Morgan Hardwood - - - RawTherapee www.rawtherapee.com - - - - - - - - - - - - - - - - -