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

Fix some history messages (#6474)

Browse Source 
Use correct key for spot removal history message.

Remove B&W channel mixer auto enabled message when changing the filter
color.

Replace hard-coded input color profile strings.
This commit is contained in:
Lawrence37 2022-05-13 20:39:31 -07:00 committed by GitHub
parent feada4cd0a
commit 37080e1b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtgui/blackwhite.cc
View File

@ -811,7 +811,6 @@ void BlackWhite::filterChanged ()
if (listener && (multiImage || getEnabled())) { if (listener && (multiImage || getEnabled())) {
listener->panelChanged (EvBWfilter, filter->get_active_text ()); listener->panelChanged (EvBWfilter, filter->get_active_text ());
listener->panelChanged (EvAutoch, M("GENERAL_ENABLED"));
} }
} }

12
rtgui/icmpanel.cc
View File

@ -787,8 +787,8 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited)
ConnectionBlocker willconn_(willconn); ConnectionBlocker willconn_(willconn);
ConnectionBlocker wprimconn_(wprimconn); ConnectionBlocker wprimconn_(wprimconn);
if (pp->icm.inputProfile.substr(0, 5) != "file:" && !ipDialog->get_filename().empty()) { if (pp->icm.inputProfile.substr(0, 5) != "file:") {
ipDialog->set_filename(pp->icm.inputProfile); ipDialog->set_filename(" ");
} }
if (pp->icm.inputProfile == "(none)") { if (pp->icm.inputProfile == "(none)") {
@ -1908,13 +1908,13 @@ void ICMPanel::ipChanged()
Glib::ustring profname; Glib::ustring profname;
if (inone->get_active()) { if (inone->get_active()) {
profname = "(none)"; profname = inone->get_label();
} else if (iembedded->get_active()) { } else if (iembedded->get_active()) {
profname = "(embedded)"; profname = iembedded->get_label();
} else if (icamera->get_active()) { } else if (icamera->get_active()) {
profname = "(camera)"; profname = icamera->get_label();
} else if (icameraICC->get_active()) { } else if (icameraICC->get_active()) {
profname = "(cameraICC)"; profname = icameraICC->get_label();
} else { } else {
profname = ipDialog->get_filename(); profname = ipDialog->get_filename();
} }

4
rtgui/spot.cc
View File

@ -117,8 +117,8 @@ Spot::Spot() :
link.setActive (false); link.setActive (false);
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
EvSpotEnabled = m->newEvent(ALLNORAW, "TP_SPOT_LABEL"); EvSpotEnabled = m->newEvent(ALLNORAW, "HISTORY_MSG_SPOT");
EvSpotEnabledOPA = m->newEvent(SPOTADJUST, "TP_SPOT_LABEL"); EvSpotEnabledOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT");
EvSpotEntry = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY"); EvSpotEntry = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY");
EvSpotEntryOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY"); EvSpotEntryOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY");