Committing patch from issue 1240: "Partial profile handling"
This commit is contained in:
@@ -512,27 +512,15 @@ void ExifPanel::updateChangeList (Gtk::TreeModel::Children root, std::string pre
|
||||
|
||||
if (prefix!="")
|
||||
prefix = prefix + ".";
|
||||
|
||||
|
||||
Gtk::TreeModel::iterator iter;
|
||||
for (iter = root.begin(); iter!=root.end(); iter++) {
|
||||
if (iter->get_value (exifColumns.edited) == true) {
|
||||
ExifPair ec;
|
||||
ec.field = prefix + iter->get_value (exifColumns.field_nopango);
|
||||
ec.value = iter->get_value (exifColumns.value_nopango);
|
||||
changeList.push_back (ec);
|
||||
}
|
||||
else if (iter->get_value (exifColumns.action) == WRITE && iter->get_value (exifColumns.icon) == delicon) {
|
||||
ExifPair ec;
|
||||
ec.field = prefix + iter->get_value (exifColumns.field_nopango);
|
||||
ec.value = "#delete";
|
||||
changeList.push_back (ec);
|
||||
}
|
||||
else if (iter->get_value (exifColumns.action) == DONTWRITE && iter->get_value (exifColumns.icon) == keepicon) {
|
||||
ExifPair ec;
|
||||
ec.field = prefix + iter->get_value (exifColumns.field_nopango);
|
||||
ec.value = "#keep";
|
||||
changeList.push_back (ec);
|
||||
}
|
||||
if (iter->get_value (exifColumns.edited) == true)
|
||||
changeList[ prefix+iter->get_value (exifColumns.field_nopango) ] = iter->get_value (exifColumns.value_nopango);
|
||||
else if (iter->get_value (exifColumns.action) == WRITE && iter->get_value (exifColumns.icon) == delicon)
|
||||
changeList[ prefix+iter->get_value (exifColumns.field_nopango) ] = "#delete";
|
||||
else if (iter->get_value (exifColumns.action) == DONTWRITE && iter->get_value (exifColumns.icon) == keepicon)
|
||||
changeList[ prefix+iter->get_value (exifColumns.field_nopango) ] = "#keep";
|
||||
if (iter->get_value (exifColumns.icon) == keepicon)
|
||||
updateChangeList (iter->children(), prefix + iter->get_value (exifColumns.field_nopango));
|
||||
}
|
||||
@@ -546,8 +534,8 @@ void ExifPanel::updateChangeList () {
|
||||
|
||||
void ExifPanel::applyChangeList () {
|
||||
|
||||
for (int i=0; i<changeList.size(); i++)
|
||||
editTag (exifTreeModel->children(), changeList[i].field, changeList[i].value);
|
||||
for (rtengine::procparams::ExifPairs::iterator i=changeList.begin(); i!=changeList.end(); i++)
|
||||
editTag (exifTreeModel->children(), i->first, i->second);
|
||||
}
|
||||
|
||||
void ExifPanel::row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column) {
|
||||
|
Reference in New Issue
Block a user