Merge branch 'dev' into spot-removal-tool (#2239)
This commit is contained in:
@@ -38,8 +38,7 @@
|
||||
#include "epd.h"
|
||||
#include "sharpening.h"
|
||||
#include "labcurve.h"
|
||||
#include "exifpanel.h"
|
||||
#include "iptcpanel.h"
|
||||
#include "metadatapanel.h"
|
||||
#include "crop.h"
|
||||
#include "icmpanel.h"
|
||||
#include "resize.h"
|
||||
@@ -80,6 +79,7 @@
|
||||
#include "filmsimulation.h"
|
||||
#include "prsharpening.h"
|
||||
#include "fattaltonemap.h"
|
||||
#include "localcontrast.h"
|
||||
#include "guiutils.h"
|
||||
|
||||
class ImageEditorCoordinator;
|
||||
@@ -121,6 +121,7 @@ protected:
|
||||
Crop* crop;
|
||||
ToneCurve* toneCurve;
|
||||
ShadowsHighlights* shadowshighlights;
|
||||
LocalContrast *localContrast;
|
||||
Spot* spot;
|
||||
Defringe* defringe;
|
||||
ImpulseDenoise* impulsedenoise;
|
||||
@@ -149,6 +150,7 @@ protected:
|
||||
BayerRAWExposure* bayerrawexposure;
|
||||
XTransRAWExposure* xtransrawexposure;
|
||||
FattalToneMapping *fattal;
|
||||
MetaDataPanel* metadata;
|
||||
|
||||
std::vector<PParamsChangeListener*> paramcListeners;
|
||||
|
||||
@@ -160,10 +162,7 @@ protected:
|
||||
ToolVBox* colorPanel;
|
||||
ToolVBox* transformPanel;
|
||||
ToolVBox* rawPanel;
|
||||
ToolVBox* waveletPanel;
|
||||
Gtk::Notebook* metadataPanel;
|
||||
ExifPanel* exifpanel;
|
||||
IPTCPanel* iptcpanel;
|
||||
ToolVBox* advancedPanel;
|
||||
ToolBar* toolBar;
|
||||
|
||||
TextOrIcon* toiE;
|
||||
@@ -182,7 +181,7 @@ protected:
|
||||
Gtk::ScrolledWindow* colorPanelSW;
|
||||
Gtk::ScrolledWindow* transformPanelSW;
|
||||
Gtk::ScrolledWindow* rawPanelSW;
|
||||
Gtk::ScrolledWindow* waveletPanelSW;
|
||||
Gtk::ScrolledWindow* advancedPanelSW;
|
||||
|
||||
std::vector<MyExpander*> expList;
|
||||
|
||||
|
Reference in New Issue
Block a user