merge with dev

This commit is contained in:
Desmis
2018-01-06 08:01:11 +01:00
48 changed files with 809 additions and 488 deletions

View File

@@ -193,7 +193,6 @@ public:
int showFilePanelState; // 0: normal, 1: maximized, 2: normal, 3: hidden
bool showInfo;
bool mainNBVertical; // main notebook vertical tabs?
int cropPPI;
bool showClippedHighlights;
bool showClippedShadows;
int highlightThreshold;
@@ -264,6 +263,12 @@ public:
bool showFilmStripToolBar;
bool showdelimspot;
// cropping options
int cropPPI;
enum CropGuidesMode { CROP_GUIDE_NONE, CROP_GUIDE_FRAME, CROP_GUIDE_FULL };
CropGuidesMode cropGuides;
bool cropAutoFit;
// Performance options
Glib::ustring clutsDir;
int rgbDenoiseThreadLimit; // maximum number of threads for the denoising tool ; 0 = use the maximum available