From fe1ac7f605c528b30be8aed5bab6351c6040b47d Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 26 Jan 2018 00:29:04 +0100 Subject: [PATCH] Added black and white adjuster icons Used for the Anchor slider in the HDR Tone Mapping tool. --- rtdata/images/Dark/actions/adj-black.png | Bin 0 -> 494 bytes rtdata/images/Dark/actions/adj-white.png | Bin 0 -> 455 bytes rtdata/images/Light/actions/adj-black.png | Bin 0 -> 494 bytes rtdata/images/Light/actions/adj-white.png | Bin 0 -> 455 bytes rtgui/fattaltonemap.cc | 6 +- tools/source_icons/README | 2 +- tools/source_icons/scalable/adj-black.svg | 102 +++++++++++++++++++++ tools/source_icons/scalable/adj-white.svg | 103 ++++++++++++++++++++++ 8 files changed, 209 insertions(+), 4 deletions(-) create mode 100644 rtdata/images/Dark/actions/adj-black.png create mode 100644 rtdata/images/Dark/actions/adj-white.png create mode 100644 rtdata/images/Light/actions/adj-black.png create mode 100644 rtdata/images/Light/actions/adj-white.png create mode 100644 tools/source_icons/scalable/adj-black.svg create mode 100644 tools/source_icons/scalable/adj-white.svg diff --git a/rtdata/images/Dark/actions/adj-black.png b/rtdata/images/Dark/actions/adj-black.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5459fa5e441432dd55afe9bdc89f41871de1df GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5n0T@ zz;^_M8K-LVNdpBXOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe2x2Pq24 zEXhe_@J!CnD^^I$FH$JUNL5gBttdz>Dp67>Nla46%u@(TEDy;@EduIJ<>b=r0csTk zX>}|u$;dBa@CBNfn5W>8Sd>zppP!NtP{Nw}l9B=|ef{L3)Wnj^vee}K++3hrK+e?9$xKeoD^4xePpZ@{ zPSiKiGtfUAlEex$eS@cqV~E7m)^mzMhXX`fAO62{U3}Kcgsce06*>!UJ6yRQR^pr? zvf{)##?BR6 QfNp2-boFyt=akR{08VDQ%m4rY literal 0 HcmV?d00001 diff --git a/rtdata/images/Dark/actions/adj-white.png b/rtdata/images/Dark/actions/adj-white.png new file mode 100644 index 0000000000000000000000000000000000000000..03028934e26bad730818c1c5e3e76f0aa4c6c231 GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5n0T@ zz;^_M8K-LVNdpBXOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe2x2Pq24 zEXhe_@J!CnD^^I$FH$JUNL5gBttdz>Dp67>Nla46%u@(TEDy;@EduIJ<>b=r0csTk zX>}|u$;dBa@CBNfn5W>8Sd>zppP!NtP{Nw}l9B=|ef{L3)Wnj^vee}K++3hrK+e?9$xKeoD^4xePpZ@{ zPSiKiGtfUAlEex$z0=dhF+^f&?}d%LhYSSV9+odZF`328A@VTmqEw4jOFqe@FuF(_ z{pR1OD&_I%)aCNW5m^mBRS4m>SEaOJofye_!5m$c;O3+xtm=SEN>cz2WA+Bt`KI aL;j0b7V8#oFH;3Niow&>&t;ucLK6TM(xL|d literal 0 HcmV?d00001 diff --git a/rtdata/images/Light/actions/adj-black.png b/rtdata/images/Light/actions/adj-black.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5459fa5e441432dd55afe9bdc89f41871de1df GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5n0T@ zz;^_M8K-LVNdpBXOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe2x2Pq24 zEXhe_@J!CnD^^I$FH$JUNL5gBttdz>Dp67>Nla46%u@(TEDy;@EduIJ<>b=r0csTk zX>}|u$;dBa@CBNfn5W>8Sd>zppP!NtP{Nw}l9B=|ef{L3)Wnj^vee}K++3hrK+e?9$xKeoD^4xePpZ@{ zPSiKiGtfUAlEex$eS@cqV~E7m)^mzMhXX`fAO62{U3}Kcgsce06*>!UJ6yRQR^pr? zvf{)##?BR6 QfNp2-boFyt=akR{08VDQ%m4rY literal 0 HcmV?d00001 diff --git a/rtdata/images/Light/actions/adj-white.png b/rtdata/images/Light/actions/adj-white.png new file mode 100644 index 0000000000000000000000000000000000000000..03028934e26bad730818c1c5e3e76f0aa4c6c231 GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5n0T@ zz;^_M8K-LVNdpBXOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe2x2Pq24 zEXhe_@J!CnD^^I$FH$JUNL5gBttdz>Dp67>Nla46%u@(TEDy;@EduIJ<>b=r0csTk zX>}|u$;dBa@CBNfn5W>8Sd>zppP!NtP{Nw}l9B=|ef{L3)Wnj^vee}K++3hrK+e?9$xKeoD^4xePpZ@{ zPSiKiGtfUAlEex$z0=dhF+^f&?}d%LhYSSV9+odZF`328A@VTmqEw4jOFqe@FuF(_ z{pR1OD&_I%)aCNW5m^mBRS4m>SEaOJofye_!5m$c;O3+xtm=SEN>cz2WA+Bt`KI aL;j0b7V8#oFH;3Niow&>&t;ucLK6TM(xL|d literal 0 HcmV?d00001 diff --git a/rtgui/fattaltonemap.cc b/rtgui/fattaltonemap.cc index 230069fa3..af2b9eddf 100644 --- a/rtgui/fattaltonemap.cc +++ b/rtgui/fattaltonemap.cc @@ -29,11 +29,11 @@ FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_ { auto m = ProcEventMapper::getInstance(); EvTMFattalAnchor = m->newEvent(HDR, "HISTORY_MSG_TM_FATTAL_ANCHOR"); - + amount = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_AMOUNT"), 1., 100., 1., 30.)); threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 100., 1., 0.0)); - Gtk::Image *al = Gtk::manage(new RTImage("cglabel0.png")); - Gtk::Image *ar = Gtk::manage(new RTImage("clabel0.png")); + Gtk::Image *al = Gtk::manage(new RTImage("adj-black.png")); + Gtk::Image *ar = Gtk::manage(new RTImage("adj-white.png")); anchor = Gtk::manage(new Adjuster(M("TP_TM_FATTAL_ANCHOR"), 1, 100, 1, 50, al, ar)); amount->setAdjusterListener(this); diff --git a/tools/source_icons/README b/tools/source_icons/README index 826b58b2b..dbdd03e24 100644 --- a/tools/source_icons/README +++ b/tools/source_icons/README @@ -29,4 +29,4 @@ How to easily work with new icons 2- Creates a .file for each .svg (change "w22" and "actions" as needed, explained above): for f in *.svg; do printf "%s\n" "${f%%.*}.png,w22,actions" > "${f%%.*}.file"; done 3- Makes the PNG icons (you need to run the script from it's containing dir): - cd ~/rawtherapee/tools/source_icons/script && ./make_all_icon_theme.bash /path/to/new/svg/icons/ /tmp/png + cd ~/programs/code-rawtherapee/tools/source_icons/script && ./make_all_icon_theme.bash /path/to/new/svg/icons/ /tmp/png diff --git a/tools/source_icons/scalable/adj-black.svg b/tools/source_icons/scalable/adj-black.svg new file mode 100644 index 000000000..0fa707113 --- /dev/null +++ b/tools/source_icons/scalable/adj-black.svg @@ -0,0 +1,102 @@ + + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/adj-white.svg b/tools/source_icons/scalable/adj-white.svg new file mode 100644 index 000000000..83a0d66aa --- /dev/null +++ b/tools/source_icons/scalable/adj-white.svg @@ -0,0 +1,103 @@ + + + + + Icons for the "Expert" tab in RawTherapee + + + + + + + + image/svg+xml + + Icons for the "Expert" tab in RawTherapee + + + Morgan Hardwood + + + + + + + + + + + + + + + + + +