merge enhance_icc and dev

2018-11-18 08:32:24 +01:00
parent bda23b9350 b090fd7d2f
commit b13f0b106c
19 changed files with 29 additions and 39 deletions
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -384,16 +384,6 @@ void FilePanel::optionsChanged ()
 bool FilePanel::handleShortcutKey (GdkEventKey* event)
 {

-    bool ctrl = event->state & GDK_CONTROL_MASK;
-
-    if (!ctrl) {
-        switch(event->keyval) {
-        }
-    } else {
-        switch (event->keyval) {
-        }
-    }
-
    if(tpc->getToolBar() && tpc->getToolBar()->handleShortcutKey(event)) {
        return true;
    }