merge with dev

This commit is contained in:
Desmis
2018-02-01 15:28:56 +01:00
8 changed files with 56 additions and 34 deletions

View File

@@ -42,12 +42,12 @@ ToolPanelCoordinator::ToolPanelCoordinator(bool batch) : ipc(nullptr), hasChange
coarse = Gtk::manage(new CoarsePanel());
toneCurve = Gtk::manage(new ToneCurve());
shadowshighlights = Gtk::manage(new ShadowsHighlights());
localContrast = Gtk::manage(new LocalContrast());
impulsedenoise = Gtk::manage(new ImpulseDenoise());
defringe = Gtk::manage(new Defringe());
dirpyrdenoise = Gtk::manage(new DirPyrDenoise());
epd = Gtk::manage(new EdgePreservingDecompositionUI());
sharpening = Gtk::manage(new Sharpening());
localContrast = Gtk::manage(new LocalContrast());
sharpenEdge = Gtk::manage(new SharpenEdge());
sharpenMicro = Gtk::manage(new SharpenMicro());
lcurve = Gtk::manage(new LCurve());
@@ -105,9 +105,9 @@ ToolPanelCoordinator::ToolPanelCoordinator(bool batch) : ipc(nullptr), hasChange
addPanel(colorPanel, vibrance);
addPanel(colorPanel, chmixer);
addPanel(colorPanel, blackwhite);
addPanel(exposurePanel, localContrast);
addPanel(exposurePanel, shadowshighlights);
addPanel(detailsPanel, sharpening);
addPanel (detailsPanel, localContrast);
addPanel(detailsPanel, sharpenEdge);
addPanel(detailsPanel, sharpenMicro);
addPanel(colorPanel, hsvequalizer);