merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-10-19 19:26:14 +02:00
198 changed files with 2052 additions and 1128 deletions

View File

@@ -709,9 +709,13 @@ void ProfilePanel::selection_changed ()
dontupdate = false;
}
void ProfilePanel::procParamsChanged (rtengine::procparams::ProcParams* p, rtengine::ProcEvent ev, Glib::ustring descr, ParamsEdited* paramsEdited)
void ProfilePanel::procParamsChanged(
const rtengine::procparams::ProcParams* p,
const rtengine::ProcEvent& ev,
const Glib::ustring& descr,
const ParamsEdited* paramsEdited
)
{
// to prevent recursion, filter out the events caused by the profilepanel
if (ev == EvProfileChanged || ev == EvPhotoLoaded) {
return;
@@ -734,6 +738,10 @@ void ProfilePanel::procParamsChanged (rtengine::procparams::ProcParams* p, rteng
*custom->pparams = *p;
}
void ProfilePanel::clearParamChanges()
{
}
/** @brief Initialize the Profile panel with a default profile, overridden by the last saved profile if provided
*
* The file tree has already been created on object's construction. We add here the Custom, LastSaved and/or Internal item.