Changed back the order of the buttons
This commit is contained in:
Thanatomanic
parent
ab5ce7f130
commit
c8bddca09b
@ -72,8 +72,8 @@ HistogramPanel::HistogramPanel ()
|
||||
valueImage = new RTImage ("histValue.png");
|
||||
chroImage = new RTImage ("histChro.png");
|
||||
rawImage = new RTImage ("histRaw.png");
|
||||
barImage = new RTImage ("histBar.png");
|
||||
modeImage = new RTImage ("histFull.png"); // needs replacement!
|
||||
barImage = new RTImage ("histBar.png");
|
||||
|
||||
redImage_g = new RTImage ("histRedg.png");
|
||||
greenImage_g = new RTImage ("histGreeng.png");
|
||||
@ -81,9 +81,9 @@ HistogramPanel::HistogramPanel ()
|
||||
valueImage_g = new RTImage ("histValueg.png");
|
||||
chroImage_g = new RTImage ("histChrog.png");
|
||||
rawImage_g = new RTImage ("histRawg.png");
|
||||
barImage_g = new RTImage ("histBarg.png");
|
||||
modeImage_g = new RTImage ("histFullg.png"); // needs replacement!
|
||||
modeImage_g2 = new RTImage ("histBarg.png"); // needs replacement!
|
||||
barImage_g = new RTImage ("histBarg.png");
|
||||
|
||||
showRed = Gtk::manage (new Gtk::ToggleButton ());
|
||||
showGreen = Gtk::manage (new Gtk::ToggleButton ());
|
||||
@ -91,8 +91,8 @@ HistogramPanel::HistogramPanel ()
|
||||
showValue = Gtk::manage (new Gtk::ToggleButton ());
|
||||
showChro = Gtk::manage (new Gtk::ToggleButton ());
|
||||
showRAW = Gtk::manage (new Gtk::ToggleButton ());
|
||||
showBAR = Gtk::manage (new Gtk::ToggleButton ());
|
||||
showMode = Gtk::manage (new Gtk::Button ());
|
||||
showBAR = Gtk::manage (new Gtk::ToggleButton ());
|
||||
|
||||
showRed->set_name("histButton");
|
||||
showRed->set_can_focus(false);
|
||||
@ -106,10 +106,10 @@ HistogramPanel::HistogramPanel ()
|
||||
showChro->set_can_focus(false);
|
||||
showRAW->set_name("histButton");
|
||||
showRAW->set_can_focus(false);
|
||||
showBAR->set_name("histButton");
|
||||
showBAR->set_can_focus(false);
|
||||
showMode->set_name("histButton");
|
||||
showMode->set_can_focus(false);
|
||||
showBAR->set_name("histButton");
|
||||
showBAR->set_can_focus(false);
|
||||
|
||||
showRed->set_relief (Gtk::RELIEF_NONE);
|
||||
showGreen->set_relief (Gtk::RELIEF_NONE);
|
||||
@ -117,8 +117,8 @@ HistogramPanel::HistogramPanel ()
|
||||
showValue->set_relief (Gtk::RELIEF_NONE);
|
||||
showChro->set_relief (Gtk::RELIEF_NONE);
|
||||
showRAW->set_relief (Gtk::RELIEF_NONE);
|
||||
showBAR->set_relief (Gtk::RELIEF_NONE);
|
||||
showMode->set_relief (Gtk::RELIEF_NONE);
|
||||
showBAR->set_relief (Gtk::RELIEF_NONE);
|
||||
|
||||
showRed->set_tooltip_text (M("HISTOGRAM_TOOLTIP_R"));
|
||||
showGreen->set_tooltip_text (M("HISTOGRAM_TOOLTIP_G"));
|
||||
@ -126,8 +126,8 @@ HistogramPanel::HistogramPanel ()
|
||||
showValue->set_tooltip_text (M("HISTOGRAM_TOOLTIP_L"));
|
||||
showChro->set_tooltip_text (M("HISTOGRAM_TOOLTIP_CHRO"));
|
||||
showRAW->set_tooltip_text (M("HISTOGRAM_TOOLTIP_RAW"));
|
||||
showBAR->set_tooltip_text (M("HISTOGRAM_TOOLTIP_BAR"));
|
||||
showMode->set_tooltip_text (M("HISTOGRAM_TOOLTIP_FULL")); // needs replacement!
|
||||
showBAR->set_tooltip_text (M("HISTOGRAM_TOOLTIP_BAR"));
|
||||
|
||||
buttonGrid = Gtk::manage (new Gtk::Grid ());
|
||||
buttonGrid->set_orientation(Gtk::ORIENTATION_VERTICAL);
|
||||
@ -136,8 +136,8 @@ HistogramPanel::HistogramPanel ()
|
||||
showBlue->set_active (true);
|
||||
showValue->set_active (false);//unactive by default
|
||||
showChro->set_active (false);//unactive by default
|
||||
|
||||
showRAW->set_active (false);
|
||||
// no showMode->set_active(), as it's not a ToggleButton
|
||||
showBAR->set_active (options.histogramBar);
|
||||
|
||||
showRed->set_image (showRed->get_active() ? *redImage : *redImage_g);
|
||||
@ -146,14 +146,13 @@ HistogramPanel::HistogramPanel ()
|
||||
showValue->set_image (showValue->get_active() ? *valueImage : *valueImage_g);
|
||||
showChro->set_image (showChro->get_active() ? *chroImage : *chroImage_g);
|
||||
showRAW->set_image (showRAW->get_active() ? *rawImage : *rawImage_g);
|
||||
showBAR->set_image (showBAR->get_active() ? *barImage : *barImage_g);
|
||||
|
||||
if (options.histogramDrawMode == 0)
|
||||
showMode->set_image(*modeImage);
|
||||
else if (options.histogramDrawMode == 1)
|
||||
showMode->set_image(*modeImage_g);
|
||||
else
|
||||
showMode->set_image(*modeImage_g2);
|
||||
showBAR->set_image (showBAR->get_active() ? *barImage : *barImage_g);
|
||||
|
||||
showRed->set_hexpand(false);
|
||||
showRed->set_vexpand(false);
|
||||
@ -179,14 +178,14 @@ HistogramPanel::HistogramPanel ()
|
||||
showRAW->set_vexpand(false);
|
||||
showRAW->set_halign(Gtk::ALIGN_CENTER);
|
||||
showRAW->set_valign(Gtk::ALIGN_START);
|
||||
showBAR->set_hexpand(false);
|
||||
showBAR->set_vexpand(false);
|
||||
showBAR->set_halign(Gtk::ALIGN_CENTER);
|
||||
showBAR->set_valign(Gtk::ALIGN_START);
|
||||
showMode->set_hexpand(false);
|
||||
showMode->set_vexpand(false);
|
||||
showMode->set_halign(Gtk::ALIGN_CENTER);
|
||||
showMode->set_valign(Gtk::ALIGN_START);
|
||||
showBAR->set_hexpand(false);
|
||||
showBAR->set_vexpand(false);
|
||||
showBAR->set_halign(Gtk::ALIGN_CENTER);
|
||||
showBAR->set_valign(Gtk::ALIGN_START);
|
||||
|
||||
showRed->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::red_toggled), showRed );
|
||||
showGreen->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::green_toggled), showGreen );
|
||||
@ -194,8 +193,8 @@ HistogramPanel::HistogramPanel ()
|
||||
showValue->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::value_toggled), showValue );
|
||||
showChro->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::chro_toggled), showChro );
|
||||
showRAW->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::raw_toggled), showRAW );
|
||||
showBAR->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::bar_toggled), showBAR );
|
||||
showMode->signal_released().connect( sigc::mem_fun(*this, &HistogramPanel::mode_released), showMode );
|
||||
showBAR->signal_toggled().connect( sigc::mem_fun(*this, &HistogramPanel::bar_toggled), showBAR );
|
||||
|
||||
buttonGrid->add (*showRed);
|
||||
buttonGrid->add (*showGreen);
|
||||
@ -203,8 +202,8 @@ HistogramPanel::HistogramPanel ()
|
||||
buttonGrid->add (*showValue);
|
||||
buttonGrid->add (*showChro);
|
||||
buttonGrid->add (*showRAW);
|
||||
buttonGrid->add (*showBAR);
|
||||
buttonGrid->add (*showMode);
|
||||
buttonGrid->add (*showBAR);
|
||||
|
||||
// Put the button vbox next to the window's border to be less disturbing
|
||||
if (options.histogramPosition == 1) {
|
||||
@ -228,8 +227,8 @@ HistogramPanel::~HistogramPanel ()
|
||||
delete valueImage;
|
||||
delete chroImage;
|
||||
delete rawImage;
|
||||
delete barImage;
|
||||
delete modeImage;
|
||||
delete barImage;
|
||||
|
||||
delete redImage_g;
|
||||
delete greenImage_g;
|
||||
@ -237,9 +236,9 @@ HistogramPanel::~HistogramPanel ()
|
||||
delete valueImage_g;
|
||||
delete chroImage_g;
|
||||
delete rawImage_g;
|
||||
delete barImage_g;
|
||||
delete modeImage_g;
|
||||
delete modeImage_g2;
|
||||
delete barImage_g;
|
||||
|
||||
}
|
||||
|
||||
@ -320,11 +319,7 @@ void HistogramPanel::raw_toggled ()
|
||||
|
||||
rgbv_toggled();
|
||||
}
|
||||
void HistogramPanel::bar_toggled ()
|
||||
{
|
||||
showBAR->set_image(showBAR->get_active() ? *barImage : *barImage_g);
|
||||
rgbv_toggled();
|
||||
}
|
||||
|
||||
void HistogramPanel::mode_released ()
|
||||
{
|
||||
options.histogramDrawMode = (options.histogramDrawMode + 1) % 3;
|
||||
@ -336,6 +331,13 @@ void HistogramPanel::mode_released ()
|
||||
showMode->set_image(*modeImage_g2);
|
||||
rgbv_toggled();
|
||||
}
|
||||
|
||||
void HistogramPanel::bar_toggled ()
|
||||
{
|
||||
showBAR->set_image(showBAR->get_active() ? *barImage : *barImage_g);
|
||||
rgbv_toggled();
|
||||
}
|
||||
|
||||
void HistogramPanel::rgbv_toggled ()
|
||||
{
|
||||
// Update Display
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user