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

Wavelet Levels - My kingdom for more wavelets - issue2594

Browse Source
This commit is contained in:
jdc
2015-01-29 07:07:00 +01:00
parent bc856c2377
commit 13e26d3979
39 changed files with 4008 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/filecatalog.cc
View File

@@ -21,7 +21,7 @@
#include <iostream>
#include <iomanip>
#include "../rtengine/rt_math.h"
#include "filecatalog.h"
#include "filepanel.h"
#include "options.h"
@@ -924,6 +924,7 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
if (options.fastexport_bypass_dirpyrDenoise ) params.dirpyrDenoise.enabled = false;
if (options.fastexport_bypass_sh_hq ) params.sh.hq = false;
if (options.fastexport_bypass_dirpyrequalizer ) params.dirpyrequalizer.enabled = false;
if (options.fastexport_bypass_wavelet ) params.wavelet.enabled = false;
//if (options.fastexport_bypass_raw_bayer_all_enhance ) params.raw.bayersensor.all_enhance = false;
if (options.fastexport_bypass_raw_bayer_dcb_iterations ) params.raw.bayersensor.dcb_iterations = 0;
if (options.fastexport_bypass_raw_bayer_dcb_enhance ) params.raw.bayersensor.dcb_enhance = false;
@@ -1014,9 +1015,9 @@ void FileCatalog::renameRequested (std::vector<FileBrowserEntry*> tbe) {
else {
success = true;
if (!safe_g_rename (ofname, nfname)) {
cacheMgr->renameEntry (ofname, tbe[i]->thumbnail->getMD5(), nfname);
cacheMgr->renameEntry (ofname, tbe[i]->thumbnail->getMD5(), nfname);
safe_g_remove(ofname + paramFileExtension);
reparseDirectory ();
reparseDirectory ();
}
}
}
@@ -1783,11 +1784,11 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) {
bool ctrl = event->state & GDK_CONTROL_MASK;
bool shift = event->state & GDK_SHIFT_MASK;
bool alt = event->state & GDK_MOD1_MASK;
bool alt = event->state & GDK_MOD1_MASK;
#ifdef __WIN32__
bool altgr = event->state & GDK_MOD2_MASK;
#else
bool altgr = event->state & GDK_MOD5_MASK;
bool altgr = event->state & GDK_MOD2_MASK;
#else
bool altgr = event->state & GDK_MOD5_MASK;
#endif
modifierKey = event->state;
@@ -1816,8 +1817,8 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) {
return true;
}
}
#ifdef __WIN32__
#ifdef __WIN32__
if (!alt && !shift && !altgr) { // shift is reserved for ranking
switch(event->hardware_keycode) {
case 0x30:
@@ -1886,8 +1887,8 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) {
categoryButtonToggled(bRecentlySaved[1],false);
return true;
}
}
#else
}
#else
if (!alt && !shift && !altgr) { // shift is reserved for ranking
switch(event->hardware_keycode) {
case 0x13:
@@ -1956,7 +1957,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event) {
categoryButtonToggled(bRecentlySaved[1],false);
return true;
}
}
}
#endif
if (!ctrl && !alt) {
switch(event->keyval) {