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

more formatting cleanup

Browse Source
This commit is contained in:
Morgan Hardwood 2017-08-10 15:28:06 +02:00
parent f0e58f43e7
commit f17cda47c6
2 changed files with 462 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
rtgui/options.cc
View File

@ -1557,6 +1557,7 @@ int Options::readFromFile (Glib::ustring fname)
rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey"); rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey");
} }
*/ */
if (keyFile.has_key ("Color Management", "greySc")) { if (keyFile.has_key ("Color Management", "greySc")) {
rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc"); rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc");
} }
@ -1573,8 +1574,8 @@ int Options::readFromFile (Glib::ustring fname)
rtSettings.level123_cbdl = keyFile.get_double ("Color Management", "CBDLlevel123"); rtSettings.level123_cbdl = keyFile.get_double ("Color Management", "CBDLlevel123");
} }
// if (keyFile.has_key ("Color Management", "Colortoningab")) rtSettings.colortoningab = keyFile.get_double("Color Management", "Colortoningab"); //if (keyFile.has_key ("Color Management", "Colortoningab")) rtSettings.colortoningab = keyFile.get_double("Color Management", "Colortoningab");
// if (keyFile.has_key ("Color Management", "Decaction")) rtSettings.decaction = keyFile.get_double("Color Management", "Decaction"); //if (keyFile.has_key ("Color Management", "Decaction")) rtSettings.decaction = keyFile.get_double("Color Management", "Decaction");
if (keyFile.has_key ("Color Management", "WhiteBalanceSpotSize")) { if (keyFile.has_key ("Color Management", "WhiteBalanceSpotSize")) {
whiteBalanceSpotSize = keyFile.get_integer ("Color Management", "WhiteBalanceSpotSize"); whiteBalanceSpotSize = keyFile.get_integer ("Color Management", "WhiteBalanceSpotSize");
@ -1584,7 +1585,7 @@ int Options::readFromFile (Glib::ustring fname)
rtSettings.gamutICC = keyFile.get_boolean ("Color Management", "GamutICC"); rtSettings.gamutICC = keyFile.get_boolean ("Color Management", "GamutICC");
} }
// if( keyFile.has_key ("Color Management", "BWcomplement")) rtSettings.bw_complementary = keyFile.get_boolean("Color Management", "BWcomplement"); //if ( keyFile.has_key ("Color Management", "BWcomplement")) rtSettings.bw_complementary = keyFile.get_boolean("Color Management", "BWcomplement");
if ( keyFile.has_key ("Color Management", "Ciecamfloat")) { if ( keyFile.has_key ("Color Management", "Ciecamfloat")) {
rtSettings.ciecamfloat = keyFile.get_boolean ("Color Management", "Ciecamfloat"); rtSettings.ciecamfloat = keyFile.get_boolean ("Color Management", "Ciecamfloat");
} }
@ -1649,7 +1650,7 @@ int Options::readFromFile (Glib::ustring fname)
clutsDir = keyFile.get_string ("Color Management", "ClutsDirectory"); clutsDir = keyFile.get_string ("Color Management", "ClutsDirectory");
} }
// if( keyFile.has_key ("Color Management", "Ciebadpixgauss")) rtSettings.ciebadpixgauss = keyFile.get_boolean("Color Management", "Ciebadpixgauss"); //if( keyFile.has_key ("Color Management", "Ciebadpixgauss")) rtSettings.ciebadpixgauss = keyFile.get_boolean("Color Management", "Ciebadpixgauss");
} }
@ -1720,7 +1721,7 @@ int Options::readFromFile (Glib::ustring fname)
fastexport_raw_bayer_method = keyFile.get_string ("Fast Export", "fastexport_raw_bayer_method" ); fastexport_raw_bayer_method = keyFile.get_string ("Fast Export", "fastexport_raw_bayer_method" );
} }
//if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_all_enhance" )) fastexport_bypass_raw_bayer_all_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" ); //if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_bayer_all_enhance" )) fastexport_bypass_raw_bayer_all_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" );
if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_iterations" )) { if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_iterations" )) {
fastexport_bypass_raw_bayer_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations" ); fastexport_bypass_raw_bayer_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations" );
} }
@ -2130,8 +2131,8 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_boolean ("Color Management", "RGBcurvesLumamode_Gamut", rtSettings.rgbcurveslumamode_gamut); keyFile.set_boolean ("Color Management", "RGBcurvesLumamode_Gamut", rtSettings.rgbcurveslumamode_gamut);
keyFile.set_integer ("Color Management", "Intent", rtSettings.monitorIntent); keyFile.set_integer ("Color Management", "Intent", rtSettings.monitorIntent);
keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC); keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC);
// keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice); //keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
// keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey); //keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc); keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc);
keyFile.set_string ("Color Management", "AdobeRGB", rtSettings.adobe); keyFile.set_string ("Color Management", "AdobeRGB", rtSettings.adobe);
@ -2146,7 +2147,7 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("Color Management", "Bruce", rtSettings.bruce); keyFile.set_string ("Color Management", "Bruce", rtSettings.bruce);
keyFile.set_integer ("Color Management", "WhiteBalanceSpotSize", whiteBalanceSpotSize); keyFile.set_integer ("Color Management", "WhiteBalanceSpotSize", whiteBalanceSpotSize);
keyFile.set_boolean ("Color Management", "GamutICC", rtSettings.gamutICC); keyFile.set_boolean ("Color Management", "GamutICC", rtSettings.gamutICC);
// keyFile.set_boolean ("Color Management", "BWcomplement", rtSettings.bw_complementary); //keyFile.set_boolean ("Color Management", "BWcomplement", rtSettings.bw_complementary);
keyFile.set_boolean ("Color Management", "Ciecamfloat", rtSettings.ciecamfloat); keyFile.set_boolean ("Color Management", "Ciecamfloat", rtSettings.ciecamfloat);
keyFile.set_boolean ("Color Management", "GamutLch", rtSettings.gamutLch); keyFile.set_boolean ("Color Management", "GamutLch", rtSettings.gamutLch);
keyFile.set_integer ("Color Management", "ProtectRed", rtSettings.protectred); keyFile.set_integer ("Color Management", "ProtectRed", rtSettings.protectred);
@ -2154,12 +2155,12 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_double ("Color Management", "ProtectRedH", rtSettings.protectredh); keyFile.set_double ("Color Management", "ProtectRedH", rtSettings.protectredh);
keyFile.set_integer ("Color Management", "CRI", rtSettings.CRI_color); keyFile.set_integer ("Color Management", "CRI", rtSettings.CRI_color);
keyFile.set_integer ("Color Management", "DenoiseLabgamma", rtSettings.denoiselabgamma); keyFile.set_integer ("Color Management", "DenoiseLabgamma", rtSettings.denoiselabgamma);
// keyFile.set_boolean ("Color Management", "Ciebadpixgauss", rtSettings.ciebadpixgauss); //keyFile.set_boolean ("Color Management", "Ciebadpixgauss", rtSettings.ciebadpixgauss);
keyFile.set_double ("Color Management", "CBDLArtif", rtSettings.artifact_cbdl); keyFile.set_double ("Color Management", "CBDLArtif", rtSettings.artifact_cbdl);
keyFile.set_double ("Color Management", "CBDLlevel0", rtSettings.level0_cbdl); keyFile.set_double ("Color Management", "CBDLlevel0", rtSettings.level0_cbdl);
keyFile.set_double ("Color Management", "CBDLlevel123", rtSettings.level123_cbdl); keyFile.set_double ("Color Management", "CBDLlevel123", rtSettings.level123_cbdl);
// keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab); //keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab);
// keyFile.set_double ("Color Management", "Decaction", rtSettings.decaction); //keyFile.set_double ("Color Management", "Decaction", rtSettings.decaction);
keyFile.set_string ("Color Management", "ClutsDirectory", clutsDir); keyFile.set_string ("Color Management", "ClutsDirectory", clutsDir);
@ -2172,42 +2173,42 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_double ("Sounds", "LngEditProcDoneSecs", sndLngEditProcDoneSecs); keyFile.set_double ("Sounds", "LngEditProcDoneSecs", sndLngEditProcDoneSecs);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpening", fastexport_bypass_sharpening ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpening", fastexport_bypass_sharpening);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenEdge", fastexport_bypass_sharpenEdge ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenEdge", fastexport_bypass_sharpenEdge);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenMicro", fastexport_bypass_sharpenMicro ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_sharpenMicro", fastexport_bypass_sharpenMicro);
//keyFile.set_boolean ("Fast Export", "fastexport_bypass_lumaDenoise" , fastexport_bypass_lumaDenoise ); //keyFile.set_boolean ("Fast Export", "fastexport_bypass_lumaDenoise" , fastexport_bypass_lumaDenoise);
//keyFile.set_boolean ("Fast Export", "fastexport_bypass_colorDenoise" , fastexport_bypass_colorDenoise ); //keyFile.set_boolean ("Fast Export", "fastexport_bypass_colorDenoise" , fastexport_bypass_colorDenoise);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_defringe", fastexport_bypass_defringe ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_defringe", fastexport_bypass_defringe);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise", fastexport_bypass_dirpyrDenoise ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise", fastexport_bypass_dirpyrDenoise);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_sh_hq", fastexport_bypass_sh_hq ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_sh_hq", fastexport_bypass_sh_hq);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer", fastexport_bypass_dirpyrequalizer ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer", fastexport_bypass_dirpyrequalizer);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_wavelet", fastexport_bypass_wavelet ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_wavelet", fastexport_bypass_wavelet);
keyFile.set_string ("Fast Export", "fastexport_raw_bayer_method", fastexport_raw_bayer_method ); keyFile.set_string ("Fast Export", "fastexport_raw_bayer_method", fastexport_raw_bayer_method);
//keyFile.set_boolean ("Fast Export", "fastexport_bypass_bayer_raw_all_enhance" , fastexport_bypass_raw_bayer_all_enhance ); //keyFile.set_boolean ("Fast Export", "fastexport_bypass_bayer_raw_all_enhance" , fastexport_bypass_raw_bayer_all_enhance);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations", fastexport_bypass_raw_bayer_dcb_iterations ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_iterations", fastexport_bypass_raw_bayer_dcb_iterations);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance", fastexport_bypass_raw_bayer_dcb_enhance ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_dcb_enhance", fastexport_bypass_raw_bayer_dcb_enhance);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_lmmse_iterations", fastexport_bypass_raw_bayer_lmmse_iterations); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_lmmse_iterations", fastexport_bypass_raw_bayer_lmmse_iterations);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_linenoise", fastexport_bypass_raw_bayer_linenoise ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_linenoise", fastexport_bypass_raw_bayer_linenoise);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh", fastexport_bypass_raw_bayer_greenthresh ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_bayer_greenthresh", fastexport_bypass_raw_bayer_greenthresh);
keyFile.set_string ("Fast Export", "fastexport_raw_xtrans_method", fastexport_raw_xtrans_method ); keyFile.set_string ("Fast Export", "fastexport_raw_xtrans_method", fastexport_raw_xtrans_method);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps", fastexport_bypass_raw_ccSteps ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps", fastexport_bypass_raw_ccSteps);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ca", fastexport_bypass_raw_ca ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ca", fastexport_bypass_raw_ca);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_df", fastexport_bypass_raw_df ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_df", fastexport_bypass_raw_df);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ff", fastexport_bypass_raw_ff ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ff", fastexport_bypass_raw_ff);
keyFile.set_string ("Fast Export", "fastexport_icm_input", fastexport_icm_input ); keyFile.set_string ("Fast Export", "fastexport_icm_input", fastexport_icm_input);
keyFile.set_string ("Fast Export", "fastexport_icm_working", fastexport_icm_working ); keyFile.set_string ("Fast Export", "fastexport_icm_working", fastexport_icm_working);
keyFile.set_string ("Fast Export", "fastexport_icm_output", fastexport_icm_output ); keyFile.set_string ("Fast Export", "fastexport_icm_output", fastexport_icm_output);
keyFile.set_integer ("Fast Export", "fastexport_icm_output_intent", fastexport_icm_outputIntent ); keyFile.set_integer ("Fast Export", "fastexport_icm_output_intent", fastexport_icm_outputIntent);
keyFile.set_boolean ("Fast Export", "fastexport_icm_output_bpc", fastexport_icm_outputBPC ); keyFile.set_boolean ("Fast Export", "fastexport_icm_output_bpc", fastexport_icm_outputBPC);
keyFile.set_string ("Fast Export", "fastexport_icm_gamma", fastexport_icm_gamma ); keyFile.set_string ("Fast Export", "fastexport_icm_gamma", fastexport_icm_gamma);
keyFile.set_boolean ("Fast Export", "fastexport_resize_enabled", fastexport_resize_enabled ); keyFile.set_boolean ("Fast Export", "fastexport_resize_enabled", fastexport_resize_enabled);
keyFile.set_double ("Fast Export", "fastexport_resize_scale", fastexport_resize_scale ); keyFile.set_double ("Fast Export", "fastexport_resize_scale", fastexport_resize_scale);
keyFile.set_string ("Fast Export", "fastexport_resize_appliesTo", fastexport_resize_appliesTo ); keyFile.set_string ("Fast Export", "fastexport_resize_appliesTo", fastexport_resize_appliesTo);
keyFile.set_string ("Fast Export", "fastexport_resize_method", fastexport_resize_method ); keyFile.set_string ("Fast Export", "fastexport_resize_method", fastexport_resize_method);
keyFile.set_integer ("Fast Export", "fastexport_resize_dataspec", fastexport_resize_dataspec ); keyFile.set_integer ("Fast Export", "fastexport_resize_dataspec", fastexport_resize_dataspec);
keyFile.set_integer ("Fast Export", "fastexport_resize_width", fastexport_resize_width ); keyFile.set_integer ("Fast Export", "fastexport_resize_width", fastexport_resize_width);
keyFile.set_integer ("Fast Export", "fastexport_resize_height", fastexport_resize_height ); keyFile.set_integer ("Fast Export", "fastexport_resize_height", fastexport_resize_height);
keyFile.set_integer ("Fast Export", "fastexport_use_fast_pipeline", fastexport_use_fast_pipeline ); keyFile.set_integer ("Fast Export", "fastexport_use_fast_pipeline", fastexport_use_fast_pipeline);
keyFile.set_string ("Dialogs", "LastIccDir", lastIccDir); keyFile.set_string ("Dialogs", "LastIccDir", lastIccDir);
keyFile.set_string ("Dialogs", "LastDarkframeDir", lastDarkframeDir); keyFile.set_string ("Dialogs", "LastDarkframeDir", lastDarkframeDir);

52
rtgui/preferences.cc
View File

@ -226,7 +226,7 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
mi = behModel->append (); mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_DIRPYRDENOISE_LABEL")); mi->set_value (behavColumns.label, M ("TP_DIRPYRDENOISE_LABEL"));
// appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA")+", "+M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHLUM, true); //appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA")+", "+M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHLUM, true);
appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMA"), ADDSET_DIRPYRDN_LUMA, true); appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMA"), ADDSET_DIRPYRDN_LUMA, true);
appendBehavList (mi, M ("TP_DIRPYRDENOISE_LDETAIL"), ADDSET_DIRPYRDN_LUMDET, true); appendBehavList (mi, M ("TP_DIRPYRDENOISE_LDETAIL"), ADDSET_DIRPYRDN_LUMDET, true);
appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHROMA, true); appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHROMA, true);
@ -334,7 +334,7 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
mi = behModel->append (); mi = behModel->append ();
mi->set_value (behavColumns.label, M ("TP_WAVELET_LABEL")); mi->set_value (behavColumns.label, M ("TP_WAVELET_LABEL"));
appendBehavList (mi, M ("TP_WAVELET_LEVELS"), ADDSET_WA_THRES, true); appendBehavList (mi, M ("TP_WAVELET_LEVELS"), ADDSET_WA_THRES, true);
// appendBehavList (mi, M("TP_WAVELET_CONTRAST"), ADDSET_WA, true); //appendBehavList (mi, M("TP_WAVELET_CONTRAST"), ADDSET_WA, true);
appendBehavList (mi, M ("TP_WAVELET_THRESHOLD"), ADDSET_WA_THRESHOLD, true); appendBehavList (mi, M ("TP_WAVELET_THRESHOLD"), ADDSET_WA_THRESHOLD, true);
appendBehavList (mi, M ("TP_WAVELET_THRESHOLD2"), ADDSET_WA_THRESHOLD2, true); appendBehavList (mi, M ("TP_WAVELET_THRESHOLD2"), ADDSET_WA_THRESHOLD2, true);
appendBehavList (mi, M ("TP_WAVELET_CHRO"), ADDSET_WA_CHRO, true); appendBehavList (mi, M ("TP_WAVELET_CHRO"), ADDSET_WA_CHRO, true);
@ -513,10 +513,10 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
hb42->pack_start (*darkFrameDir, Gtk::PACK_EXPAND_WIDGET, 4); hb42->pack_start (*darkFrameDir, Gtk::PACK_EXPAND_WIDGET, 4);
dfLabel = Gtk::manage (new Gtk::Label ("Found:")); dfLabel = Gtk::manage (new Gtk::Label ("Found:"));
Gtk::VBox* vbdf = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* vbdf = Gtk::manage (new Gtk::VBox ());
vbdf->pack_start ( *hb42, Gtk::PACK_SHRINK, 4); vbdf->pack_start (*hb42, Gtk::PACK_SHRINK, 4);
vbdf->pack_start ( *dfLabel, Gtk::PACK_SHRINK, 4 ); vbdf->pack_start (*dfLabel, Gtk::PACK_SHRINK, 4 );
fdf->add ( *vbdf ); fdf->add (*vbdf );
mvbpp->pack_start ( *fdf, Gtk::PACK_SHRINK, 4); mvbpp->pack_start (*fdf, Gtk::PACK_SHRINK, 4);
//dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true); //dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true);
dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged), true); dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged), true);
@ -530,10 +530,10 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
hb43->pack_start (*flatFieldDir); hb43->pack_start (*flatFieldDir);
ffLabel = Gtk::manage (new Gtk::Label ("Found:")); ffLabel = Gtk::manage (new Gtk::Label ("Found:"));
Gtk::VBox* vbff = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* vbff = Gtk::manage (new Gtk::VBox ());
vbff->pack_start ( *hb43, Gtk::PACK_SHRINK, 4); vbff->pack_start (*hb43, Gtk::PACK_SHRINK, 4);
vbff->pack_start ( *ffLabel, Gtk::PACK_SHRINK, 4 ); vbff->pack_start (*ffLabel, Gtk::PACK_SHRINK, 4 );
fff->add ( *vbff ); fff->add (*vbff );
mvbpp->pack_start ( *fff, Gtk::PACK_SHRINK, 4); mvbpp->pack_start (*fff, Gtk::PACK_SHRINK, 4);
//ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true); //ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true);
ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged), true); ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged), true);
@ -544,11 +544,11 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":")); Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":"));
Gtk::Label* clutsRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") ); Gtk::Label* clutsRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") );
clutsDirBox->pack_start ( *clutsDirLabel, Gtk::PACK_SHRINK, 4 ); clutsDirBox->pack_start (*clutsDirLabel, Gtk::PACK_SHRINK, 4 );
clutsDirBox->pack_start ( *clutsDir ); clutsDirBox->pack_start (*clutsDir );
clutsDirBox->pack_start ( *clutsRestartNeeded, Gtk::PACK_SHRINK, 4 ); clutsDirBox->pack_start (*clutsRestartNeeded, Gtk::PACK_SHRINK, 4 );
clutsDirFrame->add ( *clutsDirBox ); clutsDirFrame->add (*clutsDirBox );
mvbpp->pack_start ( *clutsDirFrame, Gtk::PACK_SHRINK, 4 ); mvbpp->pack_start (*clutsDirFrame, Gtk::PACK_SHRINK, 4 );
Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_METADATA"))); Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_METADATA")));
Gtk::VBox* vbmd = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* vbmd = Gtk::manage (new Gtk::VBox ());
@ -847,7 +847,7 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
//------------------------- CIECAM ---------------------- //------------------------- CIECAM ----------------------
/* /*
Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START)); Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START));
setExpandAlignProperties (viewlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties (viewlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@ -877,7 +877,7 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
grey->append (M("PREFERENCES_GREY23")); grey->append (M("PREFERENCES_GREY23"));
grey->append (M("PREFERENCES_GREY30")); grey->append (M("PREFERENCES_GREY30"));
grey->append (M("PREFERENCES_GREY40")); grey->append (M("PREFERENCES_GREY40"));
*/ */
Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START)); Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START));
setExpandAlignProperties (greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties (greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@ -894,10 +894,12 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
Gtk::Label* lreloadneeded1 = Gtk::manage (new Gtk::Label (M ("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START)); Gtk::Label* lreloadneeded1 = Gtk::manage (new Gtk::Label (M ("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
setExpandAlignProperties (lreloadneeded1, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties (lreloadneeded1, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
colo->attach (*lreloadneeded1, 0, 0, 2, 1); colo->attach (*lreloadneeded1, 0, 0, 2, 1);
// colo->attach (*viewlab, 0, 1, 1, 1); /*
// colo->attach (*view, 1, 1, 1, 1); colo->attach (*viewlab, 0, 1, 1, 1);
// colo->attach (*greylab, 0, 2, 1, 1); colo->attach (*view, 1, 1, 1, 1);
// colo->attach (*grey, 1, 2, 1, 1); colo->attach (*greylab, 0, 2, 1, 1);
colo->attach (*grey, 1, 2, 1, 1);
*/
colo->attach (*greySclab, 0, 3, 1, 1); colo->attach (*greySclab, 0, 3, 1, 1);
colo->attach (*greySc, 1, 3, 1, 1); colo->attach (*greySc, 1, 3, 1, 1);
cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CIEART_LABEL"))); cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CIEART_LABEL")));
@ -1572,8 +1574,8 @@ void Preferences::parseThemeDir (Glib::ustring dirname)
void Preferences::storePreferences () void Preferences::storePreferences ()
{ {
// With the new mechanism, we can't be sure of the availability of the DEFPROFILE_RAW & DEFPROFILE_IMG profiles, // With the new mechanism, we can't be sure of the availability of the DEFPROFILE_RAW & DEFPROFILE_IMG profiles,
// because useBundledProfiles may be false. We're now using DEFPROFILE_INTERNAL instead, which is always available. // because useBundledProfiles may be false. We're now using DEFPROFILE_INTERNAL instead, which is always available.
moptions.defProfRaw = rprofiles->getFullPathFromActiveRow(); moptions.defProfRaw = rprofiles->getFullPathFromActiveRow();
if (moptions.defProfRaw.empty()) { if (moptions.defProfRaw.empty()) {
@ -1715,7 +1717,7 @@ void Preferences::storePreferences ()
// moptions.rtSettings.viewingdevice = view->get_active_row_number (); // moptions.rtSettings.viewingdevice = view->get_active_row_number ();
// moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number (); // moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number ();
moptions.rtSettings.viewinggreySc = greySc->get_active_row_number (); moptions.rtSettings.viewinggreySc = greySc->get_active_row_number ();
// moptions.rtSettings.autocielab = cbAutocielab->get_active (); // moptions.rtSettings.autocielab = cbAutocielab->get_active ();
moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active (); moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active ();
moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active (); moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active ();
moptions.rtSettings.leveldnv = dnv->get_active_row_number (); moptions.rtSettings.leveldnv = dnv->get_active_row_number ();
@ -1794,7 +1796,7 @@ void Preferences::storePreferences ()
moptions.clutCacheSize = clutCacheSizeSB->get_value_as_int(); moptions.clutCacheSize = clutCacheSizeSB->get_value_as_int();
moptions.maxInspectorBuffers = maxInspectorBuffersSB->get_value_as_int(); moptions.maxInspectorBuffers = maxInspectorBuffersSB->get_value_as_int();
// Sounds only on Windows and Linux // Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__) #if defined(WIN32) || defined(__linux__)
moptions.sndEnable = ckbSndEnable->get_active (); moptions.sndEnable = ckbSndEnable->get_active ();
moptions.sndBatchQueueDone = txtSndBatchQueueDone->get_text (); moptions.sndBatchQueueDone = txtSndBatchQueueDone->get_text ();