Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -193,3 +193,37 @@ void ToolBar::stra_pressed () {
  if (listener)
    listener->toolSelected (TMStraighten);
 }
+
+bool ToolBar::handleShortcutKey (GdkEventKey* event) {
+
+    bool ctrl = event->state & GDK_CONTROL_MASK;
+    bool shift = event->state & GDK_SHIFT_MASK;
+    
+    if (!ctrl) {
+        switch(event->keyval) {
+            case GDK_w:
+            case GDK_W:
+                wb_pressed ();
+                return true;
+            case GDK_c:
+            case GDK_C:
+                crop_pressed ();
+                return true;
+            case GDK_s:
+            case GDK_S:
+                stra_pressed ();
+                return true;
+            case GDK_n:
+            case GDK_N:
+                hand_pressed ();
+                return true;
+        }
+    }
+    else {
+        switch (event->keyval) {
+        }
+    }
+    
+    return false;
+}
+