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

Merge dev into multi-external-editor

Browse Source
This commit is contained in:
Lawrence Lee
2021-06-28 22:03:14 -07:00
parent d9fe87569d 4ab54c9fda
commit 72fe8d6049
144 changed files with 8191 additions and 2187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtgui/options.h
View File

@@ -230,7 +230,6 @@ public:
bool windowMaximized;
int windowMonitor;
int meowMonitor;
bool meowFullScreen;
bool meowMaximized;
int meowWidth;
int meowHeight;
@@ -293,6 +292,16 @@ public:
Glib::ustring CPBPath; // Custom Profile Builder's path
CPBKeyType CPBKeys; // Custom Profile Builder's key type
int editorToSendTo;
enum EditorOutDir {
EDITOR_OUT_DIR_TEMP,
EDITOR_OUT_DIR_CURRENT,
EDITOR_OUT_DIR_CUSTOM
};
EditorOutDir editor_out_dir; // output directory for "open in external editor"
Glib::ustring editor_custom_out_dir;
bool editor_float32;
bool editor_bypass_output_profile;
int maxThumbnailHeight;
int maxThumbnailWidth;
std::size_t maxCacheEntries;
@@ -427,6 +436,8 @@ public:
int fastexport_resize_dataspec;
int fastexport_resize_width;
int fastexport_resize_height;
int fastexport_resize_longedge;
int fastexport_resize_shortedge;
bool fastexport_use_fast_pipeline;
std::vector<Glib::ustring> favorites;