Fix some history messages (#6474)
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:
parent
feada4cd0a
commit
37080e1b5d
|
@ -811,7 +811,6 @@ void BlackWhite::filterChanged ()
|
|||
|
||||
if (listener && (multiImage || getEnabled())) {
|
||||
listener->panelChanged (EvBWfilter, filter->get_active_text ());
|
||||
listener->panelChanged (EvAutoch, M("GENERAL_ENABLED"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -787,8 +787,8 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited)
|
|||
ConnectionBlocker willconn_(willconn);
|
||||
ConnectionBlocker wprimconn_(wprimconn);
|
||||
|
||||
if (pp->icm.inputProfile.substr(0, 5) != "file:" && !ipDialog->get_filename().empty()) {
|
||||
ipDialog->set_filename(pp->icm.inputProfile);
|
||||
if (pp->icm.inputProfile.substr(0, 5) != "file:") {
|
||||
ipDialog->set_filename(" ");
|
||||
}
|
||||
|
||||
if (pp->icm.inputProfile == "(none)") {
|
||||
|
@ -1908,13 +1908,13 @@ void ICMPanel::ipChanged()
|
|||
Glib::ustring profname;
|
||||
|
||||
if (inone->get_active()) {
|
||||
profname = "(none)";
|
||||
profname = inone->get_label();
|
||||
} else if (iembedded->get_active()) {
|
||||
profname = "(embedded)";
|
||||
profname = iembedded->get_label();
|
||||
} else if (icamera->get_active()) {
|
||||
profname = "(camera)";
|
||||
profname = icamera->get_label();
|
||||
} else if (icameraICC->get_active()) {
|
||||
profname = "(cameraICC)";
|
||||
profname = icameraICC->get_label();
|
||||
} else {
|
||||
profname = ipDialog->get_filename();
|
||||
}
|
||||
|
|
|
@ -117,8 +117,8 @@ Spot::Spot() :
|
|||
link.setActive (false);
|
||||
|
||||
auto m = ProcEventMapper::getInstance();
|
||||
EvSpotEnabled = m->newEvent(ALLNORAW, "TP_SPOT_LABEL");
|
||||
EvSpotEnabledOPA = m->newEvent(SPOTADJUST, "TP_SPOT_LABEL");
|
||||
EvSpotEnabled = m->newEvent(ALLNORAW, "HISTORY_MSG_SPOT");
|
||||
EvSpotEnabledOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT");
|
||||
EvSpotEntry = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY");
|
||||
EvSpotEntryOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY");
|
||||
|
||||
|
|
Loading…
Reference in New Issue