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
2017-08-09 08:00:39 +02:00
parent 039152cce2 6976a75537
commit 291cc2e75a
12 changed files with 202 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/preferences.cc
View File

@@ -2020,16 +2020,15 @@ void Preferences::fillPreferences ()
addc.block (true);
setc.block (true);
if (moptions.baBehav.size() == ADDSET_PARAM_NUM) {
for (size_t i = 0; i < moptions.baBehav.size(); i++)
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
if (adjs->get_value (behavColumns.addsetid) == (int)i) {
adjs->set_value (behavColumns.badd, moptions.baBehav[i] == 1);
adjs->set_value (behavColumns.bset, moptions.baBehav[i] != 1);
break;
}
}
moptions.baBehav.resize (ADDSET_PARAM_NUM);
for (size_t i = 0; i < moptions.baBehav.size(); i++)
for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); sections++)
for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); adjs++)
if (adjs->get_value (behavColumns.addsetid) == (int)i) {
adjs->set_value (behavColumns.badd, moptions.baBehav[i] == 1);
adjs->set_value (behavColumns.bset, moptions.baBehav[i] != 1);
break;
}
addc.block (false);
setc.block (false);