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

Clipped S/H variable name capitalization change for readability

Browse Source
This commit is contained in:
Morgan Hardwood
2017-09-01 15:05:06 +02:00
parent 1e36c564a7
commit 64116d88c1
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
rtgui/indclippedpanel.cc
View File

@@ -34,39 +34,39 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
Glib::ustring tt; Glib::ustring tt;
indclippedh = Gtk::manage (new Gtk::ToggleButton ()); indClippedH = Gtk::manage (new Gtk::ToggleButton ());
indclippedh->set_relief(Gtk::RELIEF_NONE); indClippedH->set_relief(Gtk::RELIEF_NONE);
indclippedh->add (*Gtk::manage (new RTImage ("warnhl.png"))); indClippedH->add (*Gtk::manage (new RTImage ("warnhl.png")));
tt = Glib::ustring::compose("%1\n%2 = %3", M("MAIN_TOOLTIP_INDCLIPPEDH"), M("MAIN_TOOLTIP_THRESHOLD"), options.highlightThreshold); tt = Glib::ustring::compose("%1\n%2 = %3", M("MAIN_TOOLTIP_indClippedH"), M("MAIN_TOOLTIP_THRESHOLD"), options.highlightThreshold);
if (tt.find("<") == Glib::ustring::npos && tt.find(">") == Glib::ustring::npos) { if (tt.find("<") == Glib::ustring::npos && tt.find(">") == Glib::ustring::npos) {
indclippedh->set_tooltip_text (tt); indClippedH->set_tooltip_text (tt);
} else { } else {
indclippedh->set_tooltip_markup (tt); indClippedH->set_tooltip_markup (tt);
} }
indclippeds = Gtk::manage (new Gtk::ToggleButton ()); indClippedS = Gtk::manage (new Gtk::ToggleButton ());
indclippeds->set_relief(Gtk::RELIEF_NONE); indClippedS->set_relief(Gtk::RELIEF_NONE);
indclippeds->add (*Gtk::manage (new RTImage ("warnsh.png"))); indClippedS->add (*Gtk::manage (new RTImage ("warnsh.png")));
tt = Glib::ustring::compose("%1\n%2 = %3", M("MAIN_TOOLTIP_INDCLIPPEDS"), M("MAIN_TOOLTIP_THRESHOLD"), options.shadowThreshold); tt = Glib::ustring::compose("%1\n%2 = %3", M("MAIN_TOOLTIP_indClippedS"), M("MAIN_TOOLTIP_THRESHOLD"), options.shadowThreshold);
if (tt.find("<") == Glib::ustring::npos && tt.find(">") == Glib::ustring::npos) { if (tt.find("<") == Glib::ustring::npos && tt.find(">") == Glib::ustring::npos) {
indclippeds->set_tooltip_text (tt); indClippedS->set_tooltip_text (tt);
} else { } else {
indclippeds->set_tooltip_markup (tt); indClippedS->set_tooltip_markup (tt);
} }
previewFocusMask->set_active (false); previewFocusMask->set_active (false);
indclippedh->set_active (options.showClippedHighlights); indClippedH->set_active (options.showClippedHighlights);
indclippeds->set_active (options.showClippedShadows); indClippedS->set_active (options.showClippedShadows);
pack_start (*previewFocusMask, Gtk::PACK_SHRINK, 0); pack_start (*previewFocusMask, Gtk::PACK_SHRINK, 0);
pack_start (*indclippeds, Gtk::PACK_SHRINK, 0); pack_start (*indClippedS, Gtk::PACK_SHRINK, 0);
pack_start (*indclippedh, Gtk::PACK_SHRINK, 0); pack_start (*indClippedH, Gtk::PACK_SHRINK, 0);
connFocusMask = previewFocusMask->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), previewFocusMask) ); connFocusMask = previewFocusMask->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), previewFocusMask) );
connClippedS = indclippeds->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indclippeds) ); connClippedS = indClippedS->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indClippedS) );
connClippedH = indclippedh->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indclippedh) ); connClippedH = indClippedH->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indClippedH) );
show_all (); show_all ();
} }
@@ -75,9 +75,9 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
void IndicateClippedPanel::toggleClipped (bool highlights) void IndicateClippedPanel::toggleClipped (bool highlights)
{ {
if (highlights) { if (highlights) {
indclippedh->set_active(!indclippedh->get_active()); indClippedH->set_active(!indClippedH->get_active());
} else { } else {
indclippeds->set_active(!indclippeds->get_active()); indClippedS->set_active(!indClippedS->get_active());
} }
} }
@@ -96,11 +96,11 @@ void IndicateClippedPanel::buttonToggled (Gtk::ToggleButton* tb)
if (tb != previewFocusMask) { if (tb != previewFocusMask) {
previewFocusMask->set_active(false); previewFocusMask->set_active(false);
} else { } else {
if (indclippeds->get_active()) { if (indClippedS->get_active()) {
indclippeds->set_active(false); indClippedS->set_active(false);
} }
if (indclippedh->get_active()) { if (indClippedH->get_active()) {
indclippedh->set_active(false); indClippedH->set_active(false);
} }
} }

8
rtgui/indclippedpanel.h
View File

@@ -27,8 +27,8 @@ class IndicateClippedPanel : public Gtk::HBox
protected: protected:
Gtk::Image* iFon, *iFoff; Gtk::Image* iFon, *iFoff;
Gtk::ToggleButton* previewFocusMask; Gtk::ToggleButton* previewFocusMask;
Gtk::ToggleButton* indclippedh; Gtk::ToggleButton* indClippedH;
Gtk::ToggleButton* indclippeds; Gtk::ToggleButton* indClippedS;
ImageArea* imageArea; ImageArea* imageArea;
public: public:
@@ -48,11 +48,11 @@ public:
} }
bool showClippedShadows() bool showClippedShadows()
{ {
return indclippeds->get_active(); return indClippedS->get_active();
} }
bool showClippedHighlights() bool showClippedHighlights()
{ {
return indclippedh->get_active(); return indClippedH->get_active();
} }
}; };