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

Locallab cleanup n°3

Browse Source 
Cleanup of Preferences
This commit is contained in:
Pandagrapher
2018-09-25 21:18:42 +02:00
parent cafe48b87a
commit 9930222c9d
5 changed files with 1 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rtgui/preferences.cc
View File

@@ -548,21 +548,6 @@ Gtk::Widget* Preferences::getProcParamsPanel()
fdp->add(*vbdp);
mvbpp->pack_start(*fdp, Gtk::PACK_SHRINK, 4);
Gtk::Frame* fmip = Gtk::manage(new Gtk::Frame(M("PREFERENCES_MIP")));
Gtk::HBox* hbmip = Gtk::manage(new Gtk::HBox(false, 4));
Gtk::Label* lmip = Gtk::manage(new Gtk::Label(M("PREFERENCES_MIP_LABEL")));
cmip = Gtk::manage(new Gtk::ComboBoxText());
cmip->append(M("PREFERENCES_MIP_PREV"));
cmip->append(M("PREFERENCES_MIP_OPT"));
cmip->set_active(1);
cmip->set_tooltip_text(M("PREFERENCES_MIP_TOOLTIP"));
hbmip->pack_start(*lmip, Gtk::PACK_SHRINK);
hbmip->pack_start(*cmip);
fmip->add(*hbmip);
hbmip->set_border_width(4);
mvbpp->pack_start(*fmip, Gtk::PACK_SHRINK, 4);
// Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) );
// Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ());
// darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
@@ -783,20 +768,6 @@ Gtk::Widget* Preferences::getPerformancePanel()
// --->
fdenoise->add(*vbdenoise);
mainContainer->pack_start(*fdenoise, Gtk::PACK_SHRINK, 4);
/*
Gtk::Frame* flocalajust = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_LOCAL")));
Gtk::HBox* hblocalajust = Gtk::manage (new Gtk::HBox (false, 4));
Gtk::Label* llocalajust = Gtk::manage (new Gtk::Label (M ("PREFERENCES_LOCALAJUST_LABEL")));
clocalajust = Gtk::manage (new Gtk::ComboBoxText ());
clocalajust->append (M ("PREFERENCES_LOCALAJUST_STD"));
clocalajust->append (M ("PREFERENCES_LOCALAJUST_ENH"));
clocalajust->append (M ("PREFERENCES_LOCALAJUST_ENHDEN"));
clocalajust->set_active (2);
hblocalajust->pack_start (*llocalajust, Gtk::PACK_SHRINK);
hblocalajust->pack_start (*clocalajust);
flocalajust->add (*hblocalajust);
mainContainer->pack_start (*flocalajust, Gtk::PACK_SHRINK, 4);
*/
return mainContainer;
}
@@ -1078,23 +1049,6 @@ Gtk::Widget* Preferences::getGeneralPanel()
// ---------------------------------------------
Gtk::Frame* flocal = Gtk::manage(new Gtk::Frame(M("PREFERENCES_LOCAL")));
setExpandAlignProperties(flocal, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
Gtk::Grid* localGrid = Gtk::manage(new Gtk::Grid());
localGrid->set_column_spacing(4);
localGrid->set_row_spacing(4);
setExpandAlignProperties(localGrid, false, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
ckbShowdelimspot = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_LOCALSHOWDELIMSPOT")));
setExpandAlignProperties(ckbShowdelimspot, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
localGrid->attach_next_to(*ckbShowdelimspot, Gtk::POS_LEFT, 3, 1);
flocal->add(*localGrid);
mvbsd->attach_next_to(*flocal, *flang, Gtk::POS_BOTTOM, 2, 1);
//--------------------------------------------------
Gtk::Frame* ftheme = Gtk::manage(new Gtk::Frame(M("PREFERENCES_THEME")));
setExpandAlignProperties(ftheme, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
Gtk::Grid* themeGrid = Gtk::manage(new Gtk::Grid());
@@ -1164,7 +1118,7 @@ Gtk::Widget* Preferences::getGeneralPanel()
themeGrid->attach_next_to(*butNavGuideCol, *navGuideLabel, Gtk::POS_RIGHT, 1, 1);
ftheme->add(*themeGrid);
mvbsd->attach_next_to(*ftheme, *flocal, Gtk::POS_BOTTOM, 2, 1);
mvbsd->attach_next_to(*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1);
// ---------------------------------------------
@@ -1798,8 +1752,6 @@ void Preferences::storePreferences()
moptions.prevdemo = (prevdemo_t)cprevdemo->get_active_row_number();
moptions.serializeTiffRead = ctiffserialize->get_active();
moptions.mip = (mip_t)cmip->get_active_row_number();
// moptions.locaaju = (locaaju_t)clocalajust->get_active_row_number ();
if (sdcurrent->get_active()) {
moptions.startupDir = STARTUPDIR_CURRENT;
@@ -1856,7 +1808,6 @@ void Preferences::storePreferences()
moptions.histogramPosition = ckbHistogramPositionLeft->get_active() ? 1 : 2;
moptions.FileBrowserToolbarSingleRow = ckbFileBrowserToolbarSingleRow->get_active();
moptions.showFilmStripToolBar = ckbShowFilmStripToolBar->get_active();
moptions.showdelimspot = ckbShowdelimspot->get_active();
moptions.hideTPVScrollbar = ckbHideTPVScrollbar->get_active();
moptions.overwriteOutputFile = chOverwriteOutputFile->get_active();
moptions.UseIconNoText = ckbUseIconNoText->get_active();
@@ -1960,8 +1911,6 @@ void Preferences::fillPreferences()
dnwavlev->set_active(moptions.rtSettings.nrwavlevel);
cprevdemo->set_active(moptions.prevdemo);
cbdaubech->set_active(moptions.rtSettings.daubech);
cmip->set_active(moptions.mip);
// clocalajust->set_active (moptions.locaaju);
// cbAutocielab->set_active (moptions.rtSettings.autocielab);
languages->set_active_text(moptions.language);
@@ -2079,7 +2028,6 @@ void Preferences::fillPreferences()
// ckbHistogramWorking->set_active(moptions.histogramWorking==1);
ckbFileBrowserToolbarSingleRow->set_active(moptions.FileBrowserToolbarSingleRow);
ckbShowFilmStripToolBar->set_active(moptions.showFilmStripToolBar);
ckbShowdelimspot->set_active(moptions.showdelimspot);
ckbHideTPVScrollbar->set_active(moptions.hideTPVScrollbar);
ckbUseIconNoText->set_active(moptions.UseIconNoText);