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-11-20 17:50:33 +01:00
parent 333ac99532 aa286a32f9
commit 721972ee72
81 changed files with 2596 additions and 1853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/preferences.cc
View File

@@ -612,7 +612,12 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
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")));
Gtk::Label *cropAutoFitLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT")));
cropAutoFitLabel->set_line_wrap(true);
setExpandAlignProperties(cropAutoFitLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
cropAutoFit = Gtk::manage(new Gtk::CheckButton());
setExpandAlignProperties(cropAutoFit, false, true, Gtk::ALIGN_START, Gtk::ALIGN_START);
cropAutoFit->add(*cropAutoFitLabel);
cropvb->pack_start(*cropAutoFit);
cropframe->add(*cropvb);
vbImageProcessing->pack_start(*cropframe, Gtk::PACK_SHRINK, 4);
@@ -774,7 +779,12 @@ Gtk::Widget* Preferences::getColorManPanel ()
for (const auto profile : profiles) {
if (profile.find("file:") != 0) {
monProfile->append(profile);
std::string fileis_RTv4 = profile.substr(0, 4);
if (fileis_RTv4 != "RTv4") {
// printf("pro=%s \n", profile.c_str());
monProfile->append(profile);
}
}
}
@@ -1400,7 +1410,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
vbc->pack_start (*cacheGrid, Gtk::PACK_SHRINK, 4);
Gtk::Label* clearSafetyLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_SAFETY")));
setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
setExpandAlignProperties(clearSafetyLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
clearSafetyLbl->set_line_wrap(true);
vbc->pack_start(*clearSafetyLbl, Gtk::PACK_SHRINK, 4);