From 64116d88c1743f4de47da2e841c0f136c701d5d6 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 1 Sep 2017 15:05:06 +0200 Subject: [PATCH] Clipped S/H variable name capitalization change for readability --- rtgui/indclippedpanel.cc | 48 ++++++++++++++++++++-------------------- rtgui/indclippedpanel.h | 8 +++---- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/rtgui/indclippedpanel.cc b/rtgui/indclippedpanel.cc index bc5cecab6..03241f369 100644 --- a/rtgui/indclippedpanel.cc +++ b/rtgui/indclippedpanel.cc @@ -34,39 +34,39 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia) Glib::ustring tt; - indclippedh = Gtk::manage (new Gtk::ToggleButton ()); - indclippedh->set_relief(Gtk::RELIEF_NONE); - 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); + indClippedH = Gtk::manage (new Gtk::ToggleButton ()); + indClippedH->set_relief(Gtk::RELIEF_NONE); + 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); if (tt.find("<") == Glib::ustring::npos && tt.find(">") == Glib::ustring::npos) { - indclippedh->set_tooltip_text (tt); + indClippedH->set_tooltip_text (tt); } else { - indclippedh->set_tooltip_markup (tt); + indClippedH->set_tooltip_markup (tt); } - indclippeds = Gtk::manage (new Gtk::ToggleButton ()); - indclippeds->set_relief(Gtk::RELIEF_NONE); - 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); + indClippedS = Gtk::manage (new Gtk::ToggleButton ()); + indClippedS->set_relief(Gtk::RELIEF_NONE); + 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); if (tt.find("<") == Glib::ustring::npos && tt.find(">") == Glib::ustring::npos) { - indclippeds->set_tooltip_text (tt); + indClippedS->set_tooltip_text (tt); } else { - indclippeds->set_tooltip_markup (tt); + indClippedS->set_tooltip_markup (tt); } previewFocusMask->set_active (false); - indclippedh->set_active (options.showClippedHighlights); - indclippeds->set_active (options.showClippedShadows); + indClippedH->set_active (options.showClippedHighlights); + indClippedS->set_active (options.showClippedShadows); pack_start (*previewFocusMask, Gtk::PACK_SHRINK, 0); - pack_start (*indclippeds, Gtk::PACK_SHRINK, 0); - pack_start (*indclippedh, Gtk::PACK_SHRINK, 0); + pack_start (*indClippedS, 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) ); - 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) ); + 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) ); show_all (); } @@ -75,9 +75,9 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia) void IndicateClippedPanel::toggleClipped (bool highlights) { if (highlights) { - indclippedh->set_active(!indclippedh->get_active()); + indClippedH->set_active(!indClippedH->get_active()); } 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) { previewFocusMask->set_active(false); } else { - if (indclippeds->get_active()) { - indclippeds->set_active(false); + if (indClippedS->get_active()) { + indClippedS->set_active(false); } - if (indclippedh->get_active()) { - indclippedh->set_active(false); + if (indClippedH->get_active()) { + indClippedH->set_active(false); } } diff --git a/rtgui/indclippedpanel.h b/rtgui/indclippedpanel.h index 54973e6ba..1da4b61de 100644 --- a/rtgui/indclippedpanel.h +++ b/rtgui/indclippedpanel.h @@ -27,8 +27,8 @@ class IndicateClippedPanel : public Gtk::HBox protected: Gtk::Image* iFon, *iFoff; Gtk::ToggleButton* previewFocusMask; - Gtk::ToggleButton* indclippedh; - Gtk::ToggleButton* indclippeds; + Gtk::ToggleButton* indClippedH; + Gtk::ToggleButton* indClippedS; ImageArea* imageArea; public: @@ -48,11 +48,11 @@ public: } bool showClippedShadows() { - return indclippeds->get_active(); + return indClippedS->get_active(); } bool showClippedHighlights() { - return indclippedh->get_active(); + return indClippedH->get_active(); } };