diff --git a/rtdata/images/Dark/actions/ajd-ca-blue1.png b/rtdata/images/Dark/actions/ajd-ca-blue1.png new file mode 100644 index 000000000..7a47267df Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-ca-blue1.png differ diff --git a/rtdata/images/Dark/actions/ajd-ca-blue2.png b/rtdata/images/Dark/actions/ajd-ca-blue2.png new file mode 100644 index 000000000..dfb458300 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-ca-blue2.png differ diff --git a/rtdata/images/Dark/actions/ajd-ca-red1.png b/rtdata/images/Dark/actions/ajd-ca-red1.png new file mode 100644 index 000000000..1e45c5035 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-ca-red1.png differ diff --git a/rtdata/images/Dark/actions/ajd-ca-red2.png b/rtdata/images/Dark/actions/ajd-ca-red2.png new file mode 100644 index 000000000..e5da9e005 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-ca-red2.png differ diff --git a/rtdata/images/Dark/actions/ajd-wb-bluered1.png b/rtdata/images/Dark/actions/ajd-wb-bluered1.png new file mode 100644 index 000000000..3c8473451 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-wb-bluered1.png differ diff --git a/rtdata/images/Dark/actions/ajd-wb-bluered2.png b/rtdata/images/Dark/actions/ajd-wb-bluered2.png new file mode 100644 index 000000000..0f06a770e Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-wb-bluered2.png differ diff --git a/rtdata/images/Dark/actions/ajd-wb-green1.png b/rtdata/images/Dark/actions/ajd-wb-green1.png new file mode 100644 index 000000000..4f33551d6 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-wb-green1.png differ diff --git a/rtdata/images/Dark/actions/ajd-wb-green2.png b/rtdata/images/Dark/actions/ajd-wb-green2.png new file mode 100644 index 000000000..a9a7e8553 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-wb-green2.png differ diff --git a/rtdata/images/Dark/actions/ajd-wb-temp1.png b/rtdata/images/Dark/actions/ajd-wb-temp1.png new file mode 100644 index 000000000..3c8473451 Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-wb-temp1.png differ diff --git a/rtdata/images/Dark/actions/ajd-wb-temp2.png b/rtdata/images/Dark/actions/ajd-wb-temp2.png new file mode 100644 index 000000000..2b0c7c0ef Binary files /dev/null and b/rtdata/images/Dark/actions/ajd-wb-temp2.png differ diff --git a/rtdata/images/Dark/actions/distortion-barrel.png b/rtdata/images/Dark/actions/distortion-barrel.png new file mode 100644 index 000000000..0a19ac097 Binary files /dev/null and b/rtdata/images/Dark/actions/distortion-barrel.png differ diff --git a/rtdata/images/Dark/actions/distortion-pincushion.png b/rtdata/images/Dark/actions/distortion-pincushion.png new file mode 100644 index 000000000..cfdcfaf63 Binary files /dev/null and b/rtdata/images/Dark/actions/distortion-pincushion.png differ diff --git a/rtdata/images/Dark/actions/perspective-h1.png b/rtdata/images/Dark/actions/perspective-h1.png new file mode 100644 index 000000000..ea470842d Binary files /dev/null and b/rtdata/images/Dark/actions/perspective-h1.png differ diff --git a/rtdata/images/Dark/actions/perspective-h2.png b/rtdata/images/Dark/actions/perspective-h2.png new file mode 100644 index 000000000..5cd371dfc Binary files /dev/null and b/rtdata/images/Dark/actions/perspective-h2.png differ diff --git a/rtdata/images/Dark/actions/perspective-v1.png b/rtdata/images/Dark/actions/perspective-v1.png new file mode 100644 index 000000000..e42755116 Binary files /dev/null and b/rtdata/images/Dark/actions/perspective-v1.png differ diff --git a/rtdata/images/Dark/actions/perspective-v2.png b/rtdata/images/Dark/actions/perspective-v2.png new file mode 100644 index 000000000..489e3bd02 Binary files /dev/null and b/rtdata/images/Dark/actions/perspective-v2.png differ diff --git a/rtdata/images/Dark/actions/rotate-left-1.png b/rtdata/images/Dark/actions/rotate-left-1.png new file mode 100644 index 000000000..937598ca3 Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-left-1.png differ diff --git a/rtdata/images/Dark/actions/rotate-left-2.png b/rtdata/images/Dark/actions/rotate-left-2.png new file mode 100644 index 000000000..20b3ff5da Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-left-2.png differ diff --git a/rtdata/images/Dark/actions/rotate-left-3.png b/rtdata/images/Dark/actions/rotate-left-3.png new file mode 100644 index 000000000..635a50da6 Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-left-3.png differ diff --git a/rtdata/images/Dark/actions/rotate-left.png b/rtdata/images/Dark/actions/rotate-left.png new file mode 100644 index 000000000..2f28a8cff Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-left.png differ diff --git a/rtdata/images/Dark/actions/rotate-right-1.png b/rtdata/images/Dark/actions/rotate-right-1.png new file mode 100644 index 000000000..5bd9960ad Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-right-1.png differ diff --git a/rtdata/images/Dark/actions/rotate-right-2.png b/rtdata/images/Dark/actions/rotate-right-2.png new file mode 100644 index 000000000..5da99f01e Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-right-2.png differ diff --git a/rtdata/images/Dark/actions/rotate-right-3.png b/rtdata/images/Dark/actions/rotate-right-3.png new file mode 100644 index 000000000..9d2dd0e4f Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-right-3.png differ diff --git a/rtdata/images/Dark/actions/rotate-right.png b/rtdata/images/Dark/actions/rotate-right.png new file mode 100644 index 000000000..b28d601c5 Binary files /dev/null and b/rtdata/images/Dark/actions/rotate-right.png differ diff --git a/rtdata/images/Light/actions/ajd-ca-blue1.png b/rtdata/images/Light/actions/ajd-ca-blue1.png new file mode 100644 index 000000000..7a47267df Binary files /dev/null and b/rtdata/images/Light/actions/ajd-ca-blue1.png differ diff --git a/rtdata/images/Light/actions/ajd-ca-blue2.png b/rtdata/images/Light/actions/ajd-ca-blue2.png new file mode 100644 index 000000000..dfb458300 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-ca-blue2.png differ diff --git a/rtdata/images/Light/actions/ajd-ca-red1.png b/rtdata/images/Light/actions/ajd-ca-red1.png new file mode 100644 index 000000000..1e45c5035 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-ca-red1.png differ diff --git a/rtdata/images/Light/actions/ajd-ca-red2.png b/rtdata/images/Light/actions/ajd-ca-red2.png new file mode 100644 index 000000000..e5da9e005 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-ca-red2.png differ diff --git a/rtdata/images/Light/actions/ajd-wb-bluered1.png b/rtdata/images/Light/actions/ajd-wb-bluered1.png new file mode 100644 index 000000000..3c8473451 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-wb-bluered1.png differ diff --git a/rtdata/images/Light/actions/ajd-wb-bluered2.png b/rtdata/images/Light/actions/ajd-wb-bluered2.png new file mode 100644 index 000000000..0f06a770e Binary files /dev/null and b/rtdata/images/Light/actions/ajd-wb-bluered2.png differ diff --git a/rtdata/images/Light/actions/ajd-wb-green1.png b/rtdata/images/Light/actions/ajd-wb-green1.png new file mode 100644 index 000000000..4f33551d6 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-wb-green1.png differ diff --git a/rtdata/images/Light/actions/ajd-wb-green2.png b/rtdata/images/Light/actions/ajd-wb-green2.png new file mode 100644 index 000000000..a9a7e8553 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-wb-green2.png differ diff --git a/rtdata/images/Light/actions/ajd-wb-temp1.png b/rtdata/images/Light/actions/ajd-wb-temp1.png new file mode 100644 index 000000000..3c8473451 Binary files /dev/null and b/rtdata/images/Light/actions/ajd-wb-temp1.png differ diff --git a/rtdata/images/Light/actions/ajd-wb-temp2.png b/rtdata/images/Light/actions/ajd-wb-temp2.png new file mode 100644 index 000000000..2b0c7c0ef Binary files /dev/null and b/rtdata/images/Light/actions/ajd-wb-temp2.png differ diff --git a/rtdata/images/Light/actions/distortion-barrel.png b/rtdata/images/Light/actions/distortion-barrel.png new file mode 100644 index 000000000..836be0ac2 Binary files /dev/null and b/rtdata/images/Light/actions/distortion-barrel.png differ diff --git a/rtdata/images/Light/actions/distortion-pincushion.png b/rtdata/images/Light/actions/distortion-pincushion.png new file mode 100644 index 000000000..f64574151 Binary files /dev/null and b/rtdata/images/Light/actions/distortion-pincushion.png differ diff --git a/rtdata/images/Light/actions/perspective-h1.png b/rtdata/images/Light/actions/perspective-h1.png new file mode 100644 index 000000000..c857a1df5 Binary files /dev/null and b/rtdata/images/Light/actions/perspective-h1.png differ diff --git a/rtdata/images/Light/actions/perspective-h2.png b/rtdata/images/Light/actions/perspective-h2.png new file mode 100644 index 000000000..0fb23ea9c Binary files /dev/null and b/rtdata/images/Light/actions/perspective-h2.png differ diff --git a/rtdata/images/Light/actions/perspective-v1.png b/rtdata/images/Light/actions/perspective-v1.png new file mode 100644 index 000000000..eb94f4b9b Binary files /dev/null and b/rtdata/images/Light/actions/perspective-v1.png differ diff --git a/rtdata/images/Light/actions/perspective-v2.png b/rtdata/images/Light/actions/perspective-v2.png new file mode 100644 index 000000000..1b983a78d Binary files /dev/null and b/rtdata/images/Light/actions/perspective-v2.png differ diff --git a/rtdata/images/Light/actions/rotate-left-1.png b/rtdata/images/Light/actions/rotate-left-1.png new file mode 100644 index 000000000..869c9ed4a Binary files /dev/null and b/rtdata/images/Light/actions/rotate-left-1.png differ diff --git a/rtdata/images/Light/actions/rotate-left-2.png b/rtdata/images/Light/actions/rotate-left-2.png new file mode 100644 index 000000000..7aa5bd1ba Binary files /dev/null and b/rtdata/images/Light/actions/rotate-left-2.png differ diff --git a/rtdata/images/Light/actions/rotate-left-3.png b/rtdata/images/Light/actions/rotate-left-3.png new file mode 100644 index 000000000..5bf87bb2b Binary files /dev/null and b/rtdata/images/Light/actions/rotate-left-3.png differ diff --git a/rtdata/images/Light/actions/rotate-left.png b/rtdata/images/Light/actions/rotate-left.png new file mode 100644 index 000000000..f3851ba12 Binary files /dev/null and b/rtdata/images/Light/actions/rotate-left.png differ diff --git a/rtdata/images/Light/actions/rotate-right-1.png b/rtdata/images/Light/actions/rotate-right-1.png new file mode 100644 index 000000000..9d4d477cb Binary files /dev/null and b/rtdata/images/Light/actions/rotate-right-1.png differ diff --git a/rtdata/images/Light/actions/rotate-right-2.png b/rtdata/images/Light/actions/rotate-right-2.png new file mode 100644 index 000000000..bb4d98c66 Binary files /dev/null and b/rtdata/images/Light/actions/rotate-right-2.png differ diff --git a/rtdata/images/Light/actions/rotate-right-3.png b/rtdata/images/Light/actions/rotate-right-3.png new file mode 100644 index 000000000..4bf41091c Binary files /dev/null and b/rtdata/images/Light/actions/rotate-right-3.png differ diff --git a/rtdata/images/Light/actions/rotate-right.png b/rtdata/images/Light/actions/rotate-right.png new file mode 100644 index 000000000..f9a728b8a Binary files /dev/null and b/rtdata/images/Light/actions/rotate-right.png differ diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index a5311530a..0b24ba645 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -29,7 +29,7 @@ static double one2one(double val) { return val; } -Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon, double2double_fun slider2value_, double2double_fun value2slider_) { +Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon1, Gtk::Image *imgIcon2, double2double_fun slider2value_, double2double_fun value2slider_) { Gtk::HBox *hbox2=NULL; @@ -82,9 +82,10 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep if (vlabel.empty()) { // No label, everything goes in hbox - if (imgIcon) hbox->pack_start (*imgIcon, Gtk::PACK_SHRINK); + if (imgIcon1) hbox->pack_start (*imgIcon1, Gtk::PACK_SHRINK, 0); hbox->pack_end (*reset, Gtk::PACK_SHRINK, 0); hbox->pack_end (*spin, Gtk::PACK_SHRINK, 0); + if (imgIcon2) hbox->pack_start (*imgIcon2, Gtk::PACK_SHRINK, 0); hbox->pack_start (*slider, true, true); } else { @@ -92,14 +93,15 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep hbox->pack_start (*label); hbox->pack_end (*reset, Gtk::PACK_SHRINK, 0); hbox->pack_end (*spin, Gtk::PACK_SHRINK, 0); - if (!imgIcon) { + if (!imgIcon1 || !imgIcon2) { pack_start (*slider, true, true); } else { // A second HBox is necessary hbox2 = Gtk::manage (new Gtk::HBox()); - hbox2->pack_start (*imgIcon, Gtk::PACK_SHRINK); + if (imgIcon1) hbox2->pack_start (*imgIcon1, Gtk::PACK_SHRINK, 0); hbox2->pack_start (*slider, true, true); + if (imgIcon2) hbox2->pack_start (*imgIcon2, Gtk::PACK_SHRINK, 0); pack_start (*hbox2, true, true); } } diff --git a/rtgui/adjuster.h b/rtgui/adjuster.h index e4005d159..9bd3fa813 100644 --- a/rtgui/adjuster.h +++ b/rtgui/adjuster.h @@ -77,7 +77,7 @@ class Adjuster : public Gtk::VBox { int delay; - Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon=NULL, double2double_fun slider2value=NULL, double2double_fun value2slider=NULL); + Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon1=NULL, Gtk::Image *imgIcon2=NULL, double2double_fun slider2value=NULL, double2double_fun value2slider=NULL); virtual ~Adjuster (); // Add an "Automatic" checkbox next to the reset button. diff --git a/rtgui/cacorrection.cc b/rtgui/cacorrection.cc index 110bd1cce..0ac29e333 100644 --- a/rtgui/cacorrection.cc +++ b/rtgui/cacorrection.cc @@ -18,6 +18,7 @@ */ #include "cacorrection.h" #include +#include "rtimage.h" using namespace rtengine; using namespace rtengine::procparams; @@ -26,10 +27,15 @@ CACorrection::CACorrection () : Gtk::VBox(), FoldableToolPanel(this) { set_border_width(4); - red = Gtk::manage (new Adjuster (M("TP_CACORRECTION_RED"), -0.005, 0.005, 0.0001, 0)); + Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png")); + Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png")); + Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png")); + Gtk::Image* icablueR = Gtk::manage (new RTImage ("ajd-ca-blue2.png")); + + red = Gtk::manage (new Adjuster (M("TP_CACORRECTION_RED"), -0.005, 0.005, 0.0001, 0, icaredL, icaredR)); red->setAdjusterListener (this); - blue = Gtk::manage (new Adjuster (M("TP_CACORRECTION_BLUE"), -0.005, 0.005, 0.0001, 0)); + blue = Gtk::manage (new Adjuster (M("TP_CACORRECTION_BLUE"), -0.005, 0.005, 0.0001, 0, icablueL, icablueR)); blue->setAdjusterListener (this); pack_start (*red); diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc index 3b909f605..1c3318b2e 100644 --- a/rtgui/distortion.cc +++ b/rtgui/distortion.cc @@ -37,7 +37,10 @@ Distortion::Distortion (): Gtk::VBox(), FoldableToolPanel(this) { autoDistor->show(); pack_start (*autoDistor); - distor = Gtk::manage (new Adjuster (M("TP_DISTORTION_AMOUNT"), -0.5, 0.5, 0.001, 0)); + Gtk::Image* idistL = Gtk::manage (new RTImage ("distortion-pincushion.png")); + Gtk::Image* idistR = Gtk::manage (new RTImage ("distortion-barrel.png")); + + distor = Gtk::manage (new Adjuster (M("TP_DISTORTION_AMOUNT"), -0.5, 0.5, 0.001, 0, idistL, idistR)); distor->setAdjusterListener (this); distor->show(); pack_start (*distor); diff --git a/rtgui/perspective.cc b/rtgui/perspective.cc index dc14b875f..2939ca248 100644 --- a/rtgui/perspective.cc +++ b/rtgui/perspective.cc @@ -17,6 +17,7 @@ * along with RawTherapee. If not, see . */ #include "perspective.h" +#include "rtimage.h" using namespace rtengine; using namespace rtengine::procparams; @@ -25,10 +26,15 @@ PerspCorrection::PerspCorrection () : Gtk::VBox(), FoldableToolPanel(this) { set_border_width(4); - horiz = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_HORIZONTAL"), -100, 100, 0.1, 0)); + Gtk::Image* ipersHL = Gtk::manage (new RTImage ("perspective-h1.png")); + Gtk::Image* ipersHR = Gtk::manage (new RTImage ("perspective-h2.png")); + Gtk::Image* ipersVL = Gtk::manage (new RTImage ("perspective-v1.png")); + Gtk::Image* ipersVR = Gtk::manage (new RTImage ("perspective-v2.png")); + + horiz = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_HORIZONTAL"), -100, 100, 0.1, 0, ipersHL, ipersHR)); horiz->setAdjusterListener (this); - vert = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_VERTICAL"), -100, 100, 0.1, 0)); + vert = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_VERTICAL"), -100, 100, 0.1, 0, ipersVL, ipersVR)); vert->setAdjusterListener (this); pack_start (*horiz); diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc index af0c9eabd..cb5f5c227 100644 --- a/rtgui/rawcacorrection.cc +++ b/rtgui/rawcacorrection.cc @@ -20,6 +20,7 @@ #include "guiutils.h" #include "../rtengine/safegtk.h" #include +#include "rtimage.h" using namespace rtengine; using namespace rtengine::procparams; @@ -28,12 +29,17 @@ RAWCACorr::RAWCACorr () : Gtk::VBox(), FoldableToolPanel(this) { set_border_width(4); + Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png")); + Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png")); + Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png")); + Gtk::Image* icablueR = Gtk::manage (new RTImage ("ajd-ca-blue2.png")); + caAutocorrect = Gtk::manage(new Gtk::CheckButton((M("TP_RAWCACORR_AUTO")))); - caRed = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CARED"),-4.0,4.0,0.1,0)); + caRed = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CARED"),-4.0,4.0,0.1,0,icaredL,icaredR)); caRed->setAdjusterListener (this); if (caRed->delay < 1000) caRed->delay = 1000; caRed->show(); - caBlue = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CABLUE"),-4.0,4.0,0.1,0)); + caBlue = Gtk::manage(new Adjuster (M("TP_RAWCACORR_CABLUE"),-4.0,4.0,0.1,0,icablueL,icablueR)); caBlue->setAdjusterListener (this); if (caBlue->delay < 1000) caBlue->delay = 1000; caBlue->show(); diff --git a/rtgui/rotate.cc b/rtgui/rotate.cc index 16487f246..dd478cdaa 100644 --- a/rtgui/rotate.cc +++ b/rtgui/rotate.cc @@ -32,7 +32,11 @@ Rotate::Rotate () : Gtk::VBox(), FoldableToolPanel(this) { rlistener = NULL; - degree = Gtk::manage (new Adjuster (M("TP_ROTATE_DEGREE"), -45, 45, 0.01, 0)); + //TODO the action of the rotation slider is counter-intuitive + Gtk::Image* irotateL = Gtk::manage (new RTImage ("rotate-right-2.png")); + Gtk::Image* irotateR = Gtk::manage (new RTImage ("rotate-left-2.png")); + + degree = Gtk::manage (new Adjuster (M("TP_ROTATE_DEGREE"), -45, 45, 0.01, 0, irotateL, irotateR)); degree->setAdjusterListener (this); pack_start (*degree); diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index d125ba5d6..029b0da0a 100755 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -235,9 +235,16 @@ WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL), pack_start (*spotbox, Gtk::PACK_SHRINK, 4); - temp = Gtk::manage (new Adjuster (M("TP_WBALANCE_TEMPERATURE"), MINTEMP, MAXTEMP, 5, CENTERTEMP, NULL, &wbSlider2Temp, &wbTemp2Slider)); - green = Gtk::manage (new Adjuster (M("TP_WBALANCE_GREEN"), MINGREEN, MAXGREEN, 0.001, 1.0)); - equal = Gtk::manage (new Adjuster (M("TP_WBALANCE_EQBLUERED"), MINEQUAL, MAXEQUAL, 0.001, 1.0)); + Gtk::Image* itempL = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); + Gtk::Image* itempR = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); + Gtk::Image* igreenL = Gtk::manage (new RTImage ("ajd-wb-green1.png")); + Gtk::Image* igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* iblueredL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png")); + Gtk::Image* iblueredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png")); + + temp = Gtk::manage (new Adjuster (M("TP_WBALANCE_TEMPERATURE"), MINTEMP, MAXTEMP, 5, CENTERTEMP, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider)); + green = Gtk::manage (new Adjuster (M("TP_WBALANCE_GREEN"), MINGREEN, MAXGREEN, 0.001, 1.0, igreenL, igreenR)); + equal = Gtk::manage (new Adjuster (M("TP_WBALANCE_EQBLUERED"), MINEQUAL, MAXEQUAL, 0.001, 1.0, iblueredL, iblueredR)); cache_customTemp (0); cache_customGreen (0); cache_customEqual (0); @@ -246,7 +253,15 @@ WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL), green->show (); equal->show (); + /* Gtk::HBox* boxgreen = Gtk::manage (new Gtk::HBox ()); + boxgreen->show (); + + boxgreen->pack_start(*igreenL); + boxgreen->pack_start(*green); + boxgreen->pack_start(*igreenR);*/ + pack_start (*temp); + //pack_start (*boxgreen); pack_start (*green); pack_start (*equal); diff --git a/tools/source_icons/scalable/distortion-barrel.file b/tools/source_icons/scalable/distortion-barrel.file new file mode 100644 index 000000000..555f27f5d --- /dev/null +++ b/tools/source_icons/scalable/distortion-barrel.file @@ -0,0 +1 @@ +distortion-barrel.png,w22,actions diff --git a/tools/source_icons/scalable/distortion-barrel.svg b/tools/source_icons/scalable/distortion-barrel.svg new file mode 100644 index 000000000..fe76c60c3 --- /dev/null +++ b/tools/source_icons/scalable/distortion-barrel.svg @@ -0,0 +1,1150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/distortion-pincushion.file b/tools/source_icons/scalable/distortion-pincushion.file new file mode 100644 index 000000000..56807fba7 --- /dev/null +++ b/tools/source_icons/scalable/distortion-pincushion.file @@ -0,0 +1 @@ +distortion-pincushion.png,w22,actions diff --git a/tools/source_icons/scalable/distortion-pincushion.svg b/tools/source_icons/scalable/distortion-pincushion.svg new file mode 100644 index 000000000..0a5efed14 --- /dev/null +++ b/tools/source_icons/scalable/distortion-pincushion.svg @@ -0,0 +1,1149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/perspective-h1.file b/tools/source_icons/scalable/perspective-h1.file new file mode 100644 index 000000000..f6f27cad6 --- /dev/null +++ b/tools/source_icons/scalable/perspective-h1.file @@ -0,0 +1 @@ +perspective-h1.png,w22,actions diff --git a/tools/source_icons/scalable/perspective-h1.svg b/tools/source_icons/scalable/perspective-h1.svg new file mode 100644 index 000000000..5a5a9e33e --- /dev/null +++ b/tools/source_icons/scalable/perspective-h1.svg @@ -0,0 +1,1133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/perspective-h2.file b/tools/source_icons/scalable/perspective-h2.file new file mode 100644 index 000000000..60cc690af --- /dev/null +++ b/tools/source_icons/scalable/perspective-h2.file @@ -0,0 +1 @@ +perspective-h2.png,w22,actions diff --git a/tools/source_icons/scalable/perspective-h2.svg b/tools/source_icons/scalable/perspective-h2.svg new file mode 100644 index 000000000..a36956151 --- /dev/null +++ b/tools/source_icons/scalable/perspective-h2.svg @@ -0,0 +1,1133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/perspective-v1.file b/tools/source_icons/scalable/perspective-v1.file new file mode 100644 index 000000000..cbc05fec6 --- /dev/null +++ b/tools/source_icons/scalable/perspective-v1.file @@ -0,0 +1 @@ +perspective-v1.png,w22,actions diff --git a/tools/source_icons/scalable/perspective-v1.svg b/tools/source_icons/scalable/perspective-v1.svg new file mode 100644 index 000000000..712447c2a --- /dev/null +++ b/tools/source_icons/scalable/perspective-v1.svg @@ -0,0 +1,1138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/perspective-v2.file b/tools/source_icons/scalable/perspective-v2.file new file mode 100644 index 000000000..c4ade9f63 --- /dev/null +++ b/tools/source_icons/scalable/perspective-v2.file @@ -0,0 +1 @@ +perspective-v2.png,w22,actions diff --git a/tools/source_icons/scalable/perspective-v2.svg b/tools/source_icons/scalable/perspective-v2.svg new file mode 100644 index 000000000..8842e9c41 --- /dev/null +++ b/tools/source_icons/scalable/perspective-v2.svg @@ -0,0 +1,1140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-left-1.file b/tools/source_icons/scalable/rotate-left-1.file new file mode 100644 index 000000000..01069fb5b --- /dev/null +++ b/tools/source_icons/scalable/rotate-left-1.file @@ -0,0 +1 @@ +rotate-left-1.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-left-1.svg b/tools/source_icons/scalable/rotate-left-1.svg new file mode 100644 index 000000000..19b6420ae --- /dev/null +++ b/tools/source_icons/scalable/rotate-left-1.svg @@ -0,0 +1,1519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-left-2.file b/tools/source_icons/scalable/rotate-left-2.file new file mode 100644 index 000000000..7ddcc8294 --- /dev/null +++ b/tools/source_icons/scalable/rotate-left-2.file @@ -0,0 +1 @@ +rotate-left-2.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-left-2.svg b/tools/source_icons/scalable/rotate-left-2.svg new file mode 100644 index 000000000..598912692 --- /dev/null +++ b/tools/source_icons/scalable/rotate-left-2.svg @@ -0,0 +1,1519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-left-3.file b/tools/source_icons/scalable/rotate-left-3.file new file mode 100644 index 000000000..ff5463291 --- /dev/null +++ b/tools/source_icons/scalable/rotate-left-3.file @@ -0,0 +1 @@ +rotate-left-3.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-left-3.svg b/tools/source_icons/scalable/rotate-left-3.svg new file mode 100644 index 000000000..e398a61e4 --- /dev/null +++ b/tools/source_icons/scalable/rotate-left-3.svg @@ -0,0 +1,1519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-left.file b/tools/source_icons/scalable/rotate-left.file new file mode 100644 index 000000000..69b2f2e74 --- /dev/null +++ b/tools/source_icons/scalable/rotate-left.file @@ -0,0 +1 @@ +rotate-left.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-left.svg b/tools/source_icons/scalable/rotate-left.svg new file mode 100644 index 000000000..b0617a931 --- /dev/null +++ b/tools/source_icons/scalable/rotate-left.svg @@ -0,0 +1,1144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-right-1.file b/tools/source_icons/scalable/rotate-right-1.file new file mode 100644 index 000000000..bddb3b975 --- /dev/null +++ b/tools/source_icons/scalable/rotate-right-1.file @@ -0,0 +1 @@ +rotate-right-1.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-right-1.svg b/tools/source_icons/scalable/rotate-right-1.svg new file mode 100644 index 000000000..e485389ee --- /dev/null +++ b/tools/source_icons/scalable/rotate-right-1.svg @@ -0,0 +1,1519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-right-2.file b/tools/source_icons/scalable/rotate-right-2.file new file mode 100644 index 000000000..e5e421457 --- /dev/null +++ b/tools/source_icons/scalable/rotate-right-2.file @@ -0,0 +1 @@ +rotate-right-2.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-right-2.svg b/tools/source_icons/scalable/rotate-right-2.svg new file mode 100644 index 000000000..476c8d814 --- /dev/null +++ b/tools/source_icons/scalable/rotate-right-2.svg @@ -0,0 +1,1438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-right-3.file b/tools/source_icons/scalable/rotate-right-3.file new file mode 100644 index 000000000..64c38a7e9 --- /dev/null +++ b/tools/source_icons/scalable/rotate-right-3.file @@ -0,0 +1 @@ +rotate-right-3.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-right-3.svg b/tools/source_icons/scalable/rotate-right-3.svg new file mode 100644 index 000000000..7bef3af43 --- /dev/null +++ b/tools/source_icons/scalable/rotate-right-3.svg @@ -0,0 +1,1438 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/source_icons/scalable/rotate-right.file b/tools/source_icons/scalable/rotate-right.file new file mode 100644 index 000000000..123a579c0 --- /dev/null +++ b/tools/source_icons/scalable/rotate-right.file @@ -0,0 +1 @@ +rotate-right.png,w22,actions diff --git a/tools/source_icons/scalable/rotate-right.svg b/tools/source_icons/scalable/rotate-right.svg new file mode 100644 index 000000000..c5702309f --- /dev/null +++ b/tools/source_icons/scalable/rotate-right.svg @@ -0,0 +1,1123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + +