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

FileChooser-using tools applied unintentionally (SETM), Issue 2259

Browse Source
This commit is contained in:
Ingo
2014-02-27 16:02:49 +01:00
parent 17222e2680
commit 7232aa2c6e
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/darkframe.cc
View File

@@ -62,6 +62,8 @@ void DarkFrame::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
} }
if (safe_file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS)) if (safe_file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS))
darkFrameFile->set_filename (pp->raw.dark_frame); darkFrameFile->set_filename (pp->raw.dark_frame);
else
darkFrameReset();
hbdf->set_sensitive( !pp->raw.df_autoselect ); hbdf->set_sensitive( !pp->raw.df_autoselect );
lastDFauto = pp->raw.df_autoselect; lastDFauto = pp->raw.df_autoselect;
@@ -137,8 +139,12 @@ void DarkFrame::darkFrameChanged()
void DarkFrame::darkFrameReset() void DarkFrame::darkFrameReset()
{ {
dfChanged=true; dfChanged=true;
//darkFrameFile->set_current_name("");
darkFrameFile->set_filename (""); // caution: I had to make this hack, because set_current_folder() doesn't work correctly!
// Because szeva doesn't exist since he was committed to happy hunting ground in Issue 316
// we can use him now for this hack
darkFrameFile->set_filename (options.lastDarkframeDir + "/szeva");
// end of the hack
if (!options.lastDarkframeDir.empty()) if (!options.lastDarkframeDir.empty())
darkFrameFile->set_current_folder(options.lastDarkframeDir); darkFrameFile->set_current_folder(options.lastDarkframeDir);

12
rtgui/flatfield.cc
View File

@@ -84,6 +84,8 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
} }
if (safe_file_test (pp->raw.ff_file, Glib::FILE_TEST_EXISTS)) if (safe_file_test (pp->raw.ff_file, Glib::FILE_TEST_EXISTS))
flatFieldFile->set_filename (pp->raw.ff_file); flatFieldFile->set_filename (pp->raw.ff_file);
else
flatFieldFile_Reset();
hbff->set_sensitive( !pp->raw.ff_AutoSelect ); hbff->set_sensitive( !pp->raw.ff_AutoSelect );
lastFFAutoSelect = pp->raw.ff_AutoSelect; lastFFAutoSelect = pp->raw.ff_AutoSelect;
@@ -175,9 +177,13 @@ void FlatField::flatFieldFileChanged()
void FlatField::flatFieldFile_Reset() void FlatField::flatFieldFile_Reset()
{ {
ffChanged=true; ffChanged=true;
//flatFieldFile->set_current_name("");
flatFieldFile->set_filename (""); // caution: I had to make this hack, because set_current_folder() doesn't work correctly!
// Because szeva doesn't exist since he was committed to happy hunting ground in Issue 316
// we can use him now for this hack
flatFieldFile->set_filename (options.lastFlatfieldDir + "/szeva");
// end of the hack
if (!options.lastFlatfieldDir.empty()) if (!options.lastFlatfieldDir.empty())
flatFieldFile->set_current_folder(options.lastFlatfieldDir); flatFieldFile->set_current_folder(options.lastFlatfieldDir);

3
rtgui/icmpanel.cc
View File

@@ -356,6 +356,9 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
tcurveconn.block(true); tcurveconn.block(true);
blendcmsconn.block(true); blendcmsconn.block(true);
if(pp->icm.input.substr(0,5) != "file:")
ipDialog->set_filename("");
if (pp->icm.input == "(none)" && icamera->get_state()!=Gtk::STATE_INSENSITIVE) { if (pp->icm.input == "(none)" && icamera->get_state()!=Gtk::STATE_INSENSITIVE) {
inone->set_active (true); inone->set_active (true);
ckbBlendCMSMatrix->set_sensitive (false); ckbBlendCMSMatrix->set_sensitive (false);

9
rtgui/lensprofile.cc
View File

@@ -84,9 +84,14 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
fcbLCPFile->set_filename (pp->lensProf.lcpFile); fcbLCPFile->set_filename (pp->lensProf.lcpFile);
updateDisabled(true); updateDisabled(true);
} else { } else {
Glib::ustring fname = fcbLCPFile->get_filename(); Glib::ustring fname = fcbLCPFile->get_filename();
if (!pp->lensProf.lcpFile.empty()) if (!pp->lensProf.lcpFile.empty())
fcbLCPFile->unselect_filename(fname); fcbLCPFile->unselect_filename(fname);
else {
Glib::ustring lastFolder = fcbLCPFile->get_current_folder();
fcbLCPFile->set_filename("");
fcbLCPFile->set_current_folder(lastFolder);
}
updateDisabled(false); updateDisabled(false);
} }