gimp r26188 - in trunk: . app/widgets etc

[neo svn gnome org]

Author: neo
Date: Mon Jul 14 11:43:38 2008
New Revision: 26188
URL: http://svn.gnome.org/viewvc/gimp?rev=26188&view=rev

Log:
2008-07-14  Sven Neumann  <sven gimp org>

	* app/widgets/gimpcontrollerkeyboard.c: changed cursor key event
	prefix from "key-" to "cursor-".

	* etc/controllerrc: changed accordingly. Also removed default
	bindings for cursor keys without modifiers as many tools use the
	cursor keys already.



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpcontrollerkeyboard.c
   trunk/etc/controllerrc

Modified: trunk/app/widgets/gimpcontrollerkeyboard.c
==============================================================================
--- trunk/app/widgets/gimpcontrollerkeyboard.c	(original)
+++ trunk/app/widgets/gimpcontrollerkeyboard.c	Mon Jul 14 11:43:38 2008
@@ -66,103 +66,103 @@
 static KeyboardEvent keyboard_events[] =
 {
   { GDK_Up, GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-up-shift-control-alt",
+    "cursor-up-shift-control-alt",
     N_("Cursor Up") },
   { GDK_Up, GDK_MOD1_MASK | GDK_CONTROL_MASK,
-    "key-up-control-alt",
+    "cursor-up-control-alt",
     N_("Cursor Up") },
   { GDK_Up, GDK_MOD1_MASK | GDK_SHIFT_MASK,
-    "key-up-shift-alt",
+    "cursor-up-shift-alt",
     N_("Cursor Up") },
   { GDK_Up, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-up-shift-control",
+    "cursor-up-shift-control",
     N_("Cursor Up") },
   { GDK_Up, GDK_MOD1_MASK,
-    "key-up-alt",
+    "cursor-up-alt",
     N_("Cursor Up") },
   { GDK_Up, GDK_CONTROL_MASK,
-    "key-up-control",
+    "cursor-up-control",
     N_("Cursor Up") },
   { GDK_Up, GDK_SHIFT_MASK,
-    "key-up-shift",
+    "cursor-up-shift",
     N_("Cursor Up") },
   { GDK_Up, 0,
-    "key-up",
+    "cursor-up",
     N_("Cursor Up") },
 
   { GDK_Down, GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-down-shift-control-alt",
+    "cursor-down-shift-control-alt",
     N_("Cursor Down") },
   { GDK_Down, GDK_MOD1_MASK | GDK_CONTROL_MASK,
-    "key-down-control-alt",
+    "cursor-down-control-alt",
     N_("Cursor Down") },
   { GDK_Down, GDK_MOD1_MASK | GDK_SHIFT_MASK,
-    "key-down-shift-alt",
+    "cursor-down-shift-alt",
     N_("Cursor Down") },
   { GDK_Down, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-down-shift-control",
+    "cursor-down-shift-control",
     N_("Cursor Down") },
   { GDK_Down, GDK_MOD1_MASK,
-    "key-down-alt",
+    "cursor-down-alt",
     N_("Cursor Down") },
   { GDK_Down, GDK_CONTROL_MASK,
-    "key-down-control",
+    "cursor-down-control",
     N_("Cursor Down") },
   { GDK_Down, GDK_SHIFT_MASK,
-    "key-down-shift",
+    "cursor-down-shift",
     N_("Cursor Down") },
   { GDK_Down, 0,
-    "key-down",
+    "cursor-down",
     N_("Cursor Down") },
 
   { GDK_Left, GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-left-shift-control-alt",
+    "cursor-left-shift-control-alt",
     N_("Cursor Left") },
   { GDK_Left, GDK_MOD1_MASK | GDK_CONTROL_MASK,
-    "key-left-control-alt",
+    "cursor-left-control-alt",
     N_("Cursor Left") },
   { GDK_Left, GDK_MOD1_MASK | GDK_SHIFT_MASK,
-    "key-left-shift-alt",
+    "cursor-left-shift-alt",
     N_("Cursor Left") },
   { GDK_Left, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-left-shift-control",
+    "cursor-left-shift-control",
     N_("Cursor Left") },
   { GDK_Left, GDK_MOD1_MASK,
-    "key-left-alt",
+    "cursor-left-alt",
     N_("Cursor Left") },
   { GDK_Left, GDK_CONTROL_MASK,
-    "key-left-control",
+    "cursor-left-control",
     N_("Cursor Left") },
   { GDK_Left, GDK_SHIFT_MASK,
-    "key-left-shift",
+    "cursor-left-shift",
     N_("Cursor Left") },
   { GDK_Left, 0,
-    "key-left",
+    "cursor-left",
     N_("Cursor Left") },
 
   { GDK_Right, GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-right-shift-control-alt",
+    "cursor-right-shift-control-alt",
     N_("Cursor Right") },
   { GDK_Right, GDK_MOD1_MASK | GDK_CONTROL_MASK,
-    "key-right-control-alt",
+    "cursor-right-control-alt",
     N_("Cursor Right") },
   { GDK_Right, GDK_MOD1_MASK | GDK_SHIFT_MASK,
-    "key-right-shift-alt",
+    "cursor-right-shift-alt",
     N_("Cursor Right") },
   { GDK_Right, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
-    "key-right-shift-control",
+    "cursor-right-shift-control",
     N_("Cursor Right") },
   { GDK_Right, GDK_MOD1_MASK,
-    "key-right-alt",
+    "cursor-right-alt",
     N_("Cursor Right") },
   { GDK_Right, GDK_CONTROL_MASK,
-    "key-right-control",
+    "cursor-right-control",
     N_("Cursor Right") },
   { GDK_Right, GDK_SHIFT_MASK,
-    "key-right-shift",
+    "cursor-right-shift",
     N_("Cursor Right") },
   { GDK_Right, 0,
-    "key-right",
+    "cursor-right",
     N_("Cursor Right") }
 };
 

Modified: trunk/etc/controllerrc
==============================================================================
--- trunk/etc/controllerrc	(original)
+++ trunk/etc/controllerrc	Mon Jul 14 11:43:38 2008
@@ -21,22 +21,18 @@
     (debug-events no)
     (controller "GimpControllerKeyboard")
     (mapping
-        (map "key-up"            "view-scroll-up")
-        (map "key-down"          "view-scroll-down")
-        (map "key-left"          "view-scroll-left")
-        (map "key-right"         "view-scroll-right")
-        (map "key-up-shift"      "view-scroll-page-up")
-        (map "key-down-shift"    "view-scroll-page-down")
-        (map "key-left-shift"    "view-scroll-page-left")
-        (map "key-right-shift"   "view-scroll-page-right")
-        (map "key-up-control"    "view-scroll-top-border")
-        (map "key-down-control"  "view-scroll-bottom-border")
-        (map "key-left-control"  "view-scroll-left-border")
-        (map "key-right-control" "view-scroll-right-border")
-        (map "key-up-alt"        "tools-value-1-increase-skip")
-        (map "key-down-alt"      "tools-value-1-decrease-skip")
-        (map "key-left-alt"      "tools-value-1-decrease")
-        (map "key-right-alt"     "tools-value-1-increase")))
+        (map "cursor-up-shift"      "view-scroll-page-up")
+        (map "cursor-down-shift"    "view-scroll-page-down")
+        (map "cursor-left-shift"    "view-scroll-page-left")
+        (map "cursor-right-shift"   "view-scroll-page-right")
+        (map "cursor-up-control"    "view-scroll-top-border")
+        (map "cursor-down-control"  "view-scroll-bottom-border")
+        (map "cursor-left-control"  "view-scroll-left-border")
+        (map "cursor-right-control" "view-scroll-right-border")
+        (map "cursor-up-alt"        "tools-value-1-increase-skip")
+        (map "cursor-down-alt"      "tools-value-1-decrease-skip")
+        (map "cursor-left-alt"      "tools-value-1-decrease")
+        (map "cursor-right-alt"     "tools-value-1-increase")))
 
 # (GimpControllerInfo "Linux Input Example"
 #    (enabled yes)