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

Merge branch 'dev' into 32b-tiff-output-cli

Browse Source
This commit is contained in:
Hombre
2018-08-30 21:32:26 +02:00
parent fe2f45dff2 3c543d2efe
commit 5d1922ce56
265 changed files with 10700 additions and 5025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rtgui/options.h
View File

@@ -258,7 +258,8 @@ public:
int histogramPosition; // 0=disabled, 1=left pane, 2=right pane
//int histogramWorking; // 0=disabled, 1=left pane, 2=right pane
bool histogramBar;
bool histogramFullMode;
int histogramHeight;
int histogramDrawMode;
bool FileBrowserToolbarSingleRow;
bool hideTPVScrollbar;
bool UseIconNoText;
@@ -289,6 +290,23 @@ public:
bool menuGroupProfileOperations;
bool menuGroupExtProg;
// ICC Profile Creator
Glib::ustring ICCPC_primariesPreset;
double ICCPC_redPrimaryX;
double ICCPC_redPrimaryY;
double ICCPC_greenPrimaryX;
double ICCPC_greenPrimaryY;
double ICCPC_bluePrimaryX;
double ICCPC_bluePrimaryY;
Glib::ustring ICCPC_gammaPreset;
double ICCPC_gamma;
double ICCPC_slope;
Glib::ustring ICCPC_profileVersion;
Glib::ustring ICCPC_illuminant;
Glib::ustring ICCPC_description;
Glib::ustring ICCPC_copyright;
bool ICCPC_appendParamsToDesc;
// fast export options
bool fastexport_bypass_sharpening;
bool fastexport_bypass_sharpenEdge;
@@ -311,12 +329,12 @@ public:
bool fastexport_bypass_raw_ca;
bool fastexport_bypass_raw_df;
bool fastexport_bypass_raw_ff;
Glib::ustring fastexport_icm_input;
Glib::ustring fastexport_icm_working;
Glib::ustring fastexport_icm_output;
Glib::ustring fastexport_icm_input_profile;
Glib::ustring fastexport_icm_working_profile;
Glib::ustring fastexport_icm_output_profile;
rtengine::RenderingIntent fastexport_icm_outputIntent;
bool fastexport_icm_outputBPC;
Glib::ustring fastexport_icm_gamma;
Glib::ustring fastexport_icm_custom_output_profile;
bool fastexport_resize_enabled;
double fastexport_resize_scale;
Glib::ustring fastexport_resize_appliesTo;
@@ -343,6 +361,7 @@ public:
Glib::ustring lastProfilingReferenceDir;
Glib::ustring lastBWCurvesDir;
Glib::ustring lastLensProfileDir;
Glib::ustring lastICCProfCreatorDir;
bool gimpPluginShowInfoDialog;
size_t maxRecentFolders; // max. number of recent folders stored in options file
@@ -375,6 +394,7 @@ public:
void setBundledDefProfRawMissing (bool value);
void setDefProfImgMissing (bool value);
void setBundledDefProfImgMissing (bool value);
static Glib::ustring getICCProfileCopyright();
};
extern Options options;