liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged with dev, resolved conflicts, fixes to icon refs

Browse Source
This commit is contained in:
Thanatomanic
2018-08-13 05:13:38 +02:00
parent 770c16e430 382dcb2f06
commit ed854e3d31
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rtgui/histogrampanel.cc
View File

@@ -66,9 +66,6 @@ HistogramPanel::HistogramPanel ()
valueImage = new RTImage ("histogram-silver-on-small.png"); valueImage = new RTImage ("histogram-silver-on-small.png");
chroImage = new RTImage ("histogram-gold-on-small.png"); chroImage = new RTImage ("histogram-gold-on-small.png");
rawImage = new RTImage ("histogram-bayer-on-small.png"); rawImage = new RTImage ("histogram-bayer-on-small.png");
modeImage0 = new RTImage ("histogram-mode-linear-small.png");
modeImage1 = new RTImage ("histogram-mode-logx-small.png");
modeImage2 = new RTImage ("histogram-mode-logxy-small.png");
barImage = new RTImage ("histogram-bar-on-small.png"); barImage = new RTImage ("histogram-bar-on-small.png");
redImage_g = new RTImage ("histogram-red-off-small.png"); redImage_g = new RTImage ("histogram-red-off-small.png");
@@ -77,8 +74,11 @@ HistogramPanel::HistogramPanel ()
valueImage_g = new RTImage ("histogram-silver-off-small.png"); valueImage_g = new RTImage ("histogram-silver-off-small.png");
chroImage_g = new RTImage ("histogram-gold-off-small.png"); chroImage_g = new RTImage ("histogram-gold-off-small.png");
rawImage_g = new RTImage ("histogram-bayer-off-small.png"); rawImage_g = new RTImage ("histogram-bayer-off-small.png");
fullImage_g = new RTImage ("histogram-mode-linear-small.png");
barImage_g = new RTImage ("histogram-bar-off-small.png"); barImage_g = new RTImage ("histogram-bar-off-small.png");
mode0Image = new RTImage ("histogram-mode-linear-small.png");
mode1Image = new RTImage ("histogram-mode-logx-small.png");
mode2Image = new RTImage ("histogram-mode-logxy-small.png");
showRed = Gtk::manage (new Gtk::ToggleButton ()); showRed = Gtk::manage (new Gtk::ToggleButton ());
showGreen = Gtk::manage (new Gtk::ToggleButton ()); showGreen = Gtk::manage (new Gtk::ToggleButton ());
@@ -142,11 +142,11 @@ HistogramPanel::HistogramPanel ()
showChro->set_image (showChro->get_active() ? *chroImage : *chroImage_g); showChro->set_image (showChro->get_active() ? *chroImage : *chroImage_g);
showRAW->set_image (showRAW->get_active() ? *rawImage : *rawImage_g); showRAW->set_image (showRAW->get_active() ? *rawImage : *rawImage_g);
if (options.histogramDrawMode == 0) if (options.histogramDrawMode == 0)
showMode->set_image(*modeImage0); showMode->set_image(*mode0Image);
else if (options.histogramDrawMode == 1) else if (options.histogramDrawMode == 1)
showMode->set_image(*modeImage1); showMode->set_image(*mode1Image);
else else
showMode->set_image(*modeImage2); showMode->set_image(*mode2Image);
showBAR->set_image (showBAR->get_active() ? *barImage : *barImage_g); showBAR->set_image (showBAR->get_active() ? *barImage : *barImage_g);
setExpandAlignProperties(showRed , false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties(showRed , false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@@ -198,9 +198,9 @@ HistogramPanel::~HistogramPanel ()
delete valueImage; delete valueImage;
delete chroImage; delete chroImage;
delete rawImage; delete rawImage;
delete modeImage0; delete mode0Image;
delete modeImage1; delete mode1Image;
delete modeImage2; delete mode2Image;
delete barImage; delete barImage;
delete redImage_g; delete redImage_g;
@@ -277,11 +277,11 @@ void HistogramPanel::mode_released ()
{ {
options.histogramDrawMode = (options.histogramDrawMode + 1) % 3; options.histogramDrawMode = (options.histogramDrawMode + 1) % 3;
if (options.histogramDrawMode == 0) if (options.histogramDrawMode == 0)
showMode->set_image(*modeImage0); showMode->set_image(*mode0Image);
else if (options.histogramDrawMode == 1) else if (options.histogramDrawMode == 1)
showMode->set_image(*modeImage1); showMode->set_image(*mode1Image);
else else
showMode->set_image(*modeImage2); showMode->set_image(*mode2Image);
rgbv_toggled(); rgbv_toggled();
} }
@@ -346,11 +346,11 @@ void HistogramPanel::reorder (Gtk::PositionType align)
void HistogramPanel::toggle_button_mode () void HistogramPanel::toggle_button_mode ()
{ {
if (options.histogramDrawMode == 0) if (options.histogramDrawMode == 0)
showMode->set_image(*modeImage0); showMode->set_image(*mode0Image);
else if (options.histogramDrawMode == 1) else if (options.histogramDrawMode == 1)
showMode->set_image(*modeImage1); showMode->set_image(*mode1Image);
else else
showMode->set_image(*modeImage2); showMode->set_image(*mode2Image);
} }
// //

6
rtgui/histogrampanel.h
View File

@@ -183,9 +183,9 @@ protected:
Gtk::Image *barImage_g; Gtk::Image *barImage_g;
Gtk::Image *chroImage_g; Gtk::Image *chroImage_g;
Gtk::Image *modeImage0; Gtk::Image *mode0Image;
Gtk::Image *modeImage1; Gtk::Image *mode1Image;
Gtk::Image *modeImage2; Gtk::Image *mode2Image;
sigc::connection rconn; sigc::connection rconn;
void setHistInvalid (); void setHistInvalid ();