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

Merge branch 'master' into lockable-color-picker

Browse Source
This commit is contained in:
Hombre
2016-09-30 01:06:19 +02:00
parent f904bc8f84 bf27304311
commit 4506247985
57 changed files with 976 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/dirpyrdenoise.cc
View File

@@ -218,21 +218,21 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
methodmedconn = methodmed->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::methodmedChanged) );
rgbmethod = Gtk::manage (new MyComboBoxText ());
rgbmethod->append_text (M("TP_DIRPYRDENOISE_SOFT"));
rgbmethod->append_text (M("TP_DIRPYRDENOISE_33"));
rgbmethod->append_text (M("TP_DIRPYRDENOISE_55SOFT"));
rgbmethod->append_text (M("TP_DIRPYRDENOISE_3X3_SOFT"));
rgbmethod->append_text (M("TP_DIRPYRDENOISE_3X3"));
rgbmethod->append_text (M("TP_DIRPYRDENOISE_5X5_SOFT"));
rgbmethod->set_active (0);
rgbmethod->set_tooltip_text (M("TP_DIRPYRDENOISE_MET_TOOLTIP"));
rgbmethodconn = rgbmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::rgbmethodChanged) );
medmethod = Gtk::manage (new MyComboBoxText ());
medmethod->append_text (M("TP_DIRPYRDENOISE_SOFT"));
medmethod->append_text (M("TP_DIRPYRDENOISE_33"));
medmethod->append_text (M("TP_DIRPYRDENOISE_55SOFT"));
medmethod->append_text (M("TP_DIRPYRDENOISE_55"));
medmethod->append_text (M("TP_DIRPYRDENOISE_77"));
medmethod->append_text (M("TP_DIRPYRDENOISE_99"));
medmethod->append_text (M("TP_DIRPYRDENOISE_3X3_SOFT"));
medmethod->append_text (M("TP_DIRPYRDENOISE_3X3"));
medmethod->append_text (M("TP_DIRPYRDENOISE_5X5_SOFT"));
medmethod->append_text (M("TP_DIRPYRDENOISE_5X5"));
medmethod->append_text (M("TP_DIRPYRDENOISE_7X7"));
medmethod->append_text (M("TP_DIRPYRDENOISE_9X9"));
medmethod->set_active (0);
medmethod->set_tooltip_text (M("TP_DIRPYRDENOISE_MET_TOOLTIP"));
medmethodconn = medmethod->signal_changed().connect ( sigc::mem_fun(*this, &DirPyrDenoise::medmethodChanged) );

1
rtgui/editorpanel.cc
View File

@@ -782,6 +782,7 @@ void EditorPanel::close ()
if(iareapanel) {
iareapanel->imageArea->setPreviewHandler (NULL);
iareapanel->imageArea->setImProcCoordinator (NULL);
iareapanel->imageArea->unsubscribe();
}
rtengine::StagedImageProcessor::destroy (ipc);