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

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-01-06 08:01:11 +01:00
parent 7a714e5093 2d37fd6676
commit 3008d5d90d
48 changed files with 809 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtgui/preferences.cc
View File

@@ -600,6 +600,22 @@ Gtk::Widget* Preferences::getProcParamsPanel()
cdf->add(*dirgrid);
mvbpp->pack_start(*cdf, Gtk::PACK_SHRINK, 4);
// Crop
Gtk::Frame *cropframe = Gtk::manage(new Gtk::Frame(M("PREFERENCES_CROP")));
Gtk::VBox *cropvb = Gtk::manage(new Gtk::VBox());
Gtk::HBox *crophb = Gtk::manage(new Gtk::HBox());
cropGuides = Gtk::manage(new Gtk::ComboBoxText());
cropGuides->append(M("PREFERENCES_CROP_GUIDES_NONE"));
cropGuides->append(M("PREFERENCES_CROP_GUIDES_FRAME"));
cropGuides->append(M("PREFERENCES_CROP_GUIDES_FULL"));
crophb->pack_start(*Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": ")), Gtk::PACK_SHRINK, 4);
crophb->pack_start(*cropGuides);
cropvb->pack_start(*crophb);
cropAutoFit = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_CROP_AUTO_FIT")));
cropvb->pack_start(*cropAutoFit);
cropframe->add(*cropvb);
mvbpp->pack_start(*cropframe, Gtk::PACK_SHRINK, 4);
return mvbpp;
}
@@ -1852,6 +1868,9 @@ void Preferences::storePreferences()
moptions.sndLngEditProcDone = txtSndLngEditProcDone->get_text();
moptions.sndLngEditProcDoneSecs = spbSndLngEditProcDoneSecs->get_value();
#endif
moptions.cropGuides = Options::CropGuidesMode(cropGuides->get_active_row_number());
moptions.cropAutoFit = cropAutoFit->get_active();
}
void Preferences::fillPreferences()
@@ -2085,6 +2104,9 @@ void Preferences::fillPreferences()
}
}
cropGuides->set_active(moptions.cropGuides);
cropAutoFit->set_active(moptions.cropAutoFit);
addc.block(false);
setc.block(false);
cpfconn.block(false);