show an "(Unchanged)" entry for profiled lens correction in batch mode
This commit is contained in:
@@ -2152,7 +2152,6 @@ ZOOMPANEL_ZOOMFITCROPSCREEN;Fit crop to screen\nShortcut: <b>Alt</b>-<b>f</b>
|
||||
ZOOMPANEL_ZOOMFITSCREEN;Fit whole image to screen\nShortcut: <b>f</b>
|
||||
ZOOMPANEL_ZOOMIN;Zoom In\nShortcut: <b>+</b>
|
||||
ZOOMPANEL_ZOOMOUT;Zoom Out\nShortcut: <b>-</b>
|
||||
LENSPROFILE_CORRECTION_OFF;None
|
||||
LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters
|
||||
LENSPROFILE_CORRECTION_MANUAL;Manual correction parameters
|
||||
LENSPROFILE_CORRECTION_LCPFILE;LCP File
|
||||
|
@@ -49,10 +49,13 @@ LensProfilePanel::LensProfilePanel () :
|
||||
lf = new LFDbHelper();
|
||||
}
|
||||
|
||||
corrOff = Gtk::manage(new Gtk::RadioButton(M("LENSPROFILE_CORRECTION_OFF")));
|
||||
pack_start(*corrOff);
|
||||
corrUnchanged = Gtk::manage(new Gtk::RadioButton(M("GENERAL_UNCHANGED")));
|
||||
pack_start(*corrUnchanged);
|
||||
|
||||
corrGroup = corrOff->get_group();
|
||||
corrGroup = corrUnchanged->get_group();
|
||||
|
||||
corrOff = Gtk::manage(new Gtk::RadioButton(corrGroup, M("GENERAL_NONE")));
|
||||
pack_start(*corrOff);
|
||||
|
||||
corrLensfunAuto = Gtk::manage(new Gtk::RadioButton(corrGroup, M("LENSPROFILE_CORRECTION_AUTOMATCH")));
|
||||
pack_start(*corrLensfunAuto);
|
||||
@@ -132,6 +135,8 @@ LensProfilePanel::LensProfilePanel () :
|
||||
corrLensfunManual->signal_toggled().connect(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged));
|
||||
corrLcpFile->signal_toggled().connect(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged));
|
||||
|
||||
corrUnchanged->hide();
|
||||
|
||||
allowFocusDep = true;
|
||||
}
|
||||
|
||||
@@ -140,6 +145,10 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
|
||||
disableListener ();
|
||||
conUseDist.block(true);
|
||||
|
||||
if (!batchMode) {
|
||||
corrUnchanged->hide();
|
||||
}
|
||||
|
||||
corrLensfunAuto->set_sensitive(true);
|
||||
|
||||
if (pp->lensProf.useLensfun) {
|
||||
@@ -331,6 +340,12 @@ void LensProfilePanel::updateDisabled(bool enable)
|
||||
void LensProfilePanel::setBatchMode(bool yes)
|
||||
{
|
||||
FoldableToolPanel::setBatchMode(yes);
|
||||
if (yes) {
|
||||
corrUnchanged->show();
|
||||
corrUnchanged->set_active(true);
|
||||
} else {
|
||||
corrUnchanged->hide();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -490,6 +505,14 @@ void LensProfilePanel::onCorrModeChanged()
|
||||
updateDisabled(true);
|
||||
|
||||
mode = M("LENSPROFILE_CORRECTION_LCPFILE");
|
||||
} else if (corrUnchanged->get_active()) {
|
||||
useLensfunChanged = false;
|
||||
lensfunAutoChanged = false;
|
||||
lcpFileChanged = false;
|
||||
lensfunCameraChanged = false;
|
||||
lensfunLensChanged = false;
|
||||
|
||||
mode = M("GENERAL_UNCHANGED");
|
||||
}
|
||||
|
||||
if (listener) {
|
||||
|
Reference in New Issue
Block a user