Revision: 23081
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23081
Author: billrey
Date: 2009-09-09 17:45:12 +0200 (Wed, 09 Sep 2009)
Log Message:
-----------
Keyboard shortcuts
Moved to modern OS standards for opening, saving, copying, pasting, cutting
(text), new document, undo and redo.
For Mac users, Cmd is used in addition to the Ctrl-based shortcuts.
These changes are made according to an agreement among developers on IRC.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified:
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c
2009-09-09 11:52:56 UTC (rev 23080)
+++
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c
2009-09-09 15:45:12 UTC (rev 23081)
@@ -215,7 +215,7 @@
/* onion-skinning */
subcol= uiLayoutColumn(col, 1);
uiItemR(subcol, "Onion Skinning", 0, &ptr,
"use_onion_skinning", 0);
- uiItemR(subcol, "GStep", 0, &ptr, "max_ghost_range",
0); // XXX shorter name here? (i.e. GStep)
+ uiItemR(subcol, "Frames", 0, &ptr, "max_ghost_range",
0); // XXX shorter name here? (i.e. GStep)
/* additional options... */
subcol= uiLayoutColumn(col, 1);
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-09-09 11:52:56 UTC (rev 23080)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-09-09 15:45:12 UTC (rev 23081)
@@ -3328,7 +3328,7 @@
WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS,
KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS,
KM_OSKEY, 0);//Mac Exception
WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0,
0);
WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS,
0, 0);
@@ -3347,11 +3347,7 @@
/* render */
WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
-// WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS,
KM_CTRL, 0);
-// WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS,
KM_OSKEY, 0);
RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY,
KM_PRESS, KM_CTRL, 0)->ptr, "animation", 1);
-// RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY,
KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "animation", 1);
-// RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY,
KM_PRESS, KM_OSKEY|KM_SHIFT, 0)->ptr, "animation", 1);
WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY,
KM_PRESS, 0, 0);
Modified:
branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
2009-09-09 11:52:56 UTC (rev 23080)
+++ branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
2009-09-09 15:45:12 UTC (rev 23081)
@@ -220,40 +220,44 @@
WM_keymap_add_item(keymap, "TEXT_OT_run_script", PKEY, KM_PRESS,
KM_ALT, 0);
+
+ WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY,
0);//Mac Exception
WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_ALT, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY,
0);//Mac Exception
WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_ALT, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY,
0);//Mac Exception
WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_ALT, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_paste", VKEY, KM_PRESS, KM_OSKEY,
0);
if(U.uiflag & USER_MMB_PASTE) // XXX not dynamic
RNA_boolean_set(WM_keymap_add_item(keymap, "TEXT_OT_paste",
MIDDLEMOUSE, KM_PRESS, 0, 0)->ptr, "selection", 1);
WM_keymap_add_item(keymap, "TEXT_OT_jump", JKEY, KM_PRESS, KM_ALT, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_ALT, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_find", FKEY, KM_PRESS, KM_OSKEY,
0);//Mac Exception
+ WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS,
KM_CTRL, 0);
WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS,
KM_ALT, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_properties", FKEY, KM_PRESS,
KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_CTRL,
0);
WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_ALT,
0);
- WM_keymap_add_item(keymap, "TEXT_OT_replace", HKEY, KM_PRESS, KM_CTRL,
0);
WM_keymap_add_item(keymap, "TEXT_OT_to_3d_object", MKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS,
KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "TEXT_OT_select_all", AKEY, KM_PRESS,
KM_OSKEY, 0);//Mac Exception
WM_keymap_add_item(keymap, "TEXT_OT_indent", TABKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "TEXT_OT_unindent", TABKEY, KM_PRESS,
KM_SHIFT, 0);
WM_keymap_add_item(keymap, "TEXT_OT_uncomment", DKEY, KM_PRESS,
KM_CTRL|KM_SHIFT, 0);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", HOMEKEY,
KM_PRESS, 0, 0)->ptr, "type", LINE_BEGIN);
- RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY,
KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY,
KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception
+ RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", LEFTARROWKEY,
KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", ENDKEY,
KM_PRESS, 0, 0)->ptr, "type", LINE_END);
- RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY,
KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY,
KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac Exception
+ RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", RIGHTARROWKEY,
KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", EKEY, KM_PRESS,
KM_CTRL, 0)->ptr, "type", LINE_END);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", EKEY, KM_PRESS,
KM_CTRL|KM_SHIFT, 0)->ptr, "type", LINE_END);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move", ENDKEY,
KM_PRESS, 0, 0)->ptr, "type", LINE_END);
@@ -268,8 +272,8 @@
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", HOMEKEY,
KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_BEGIN);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select", ENDKEY,
KM_PRESS, KM_SHIFT, 0)->ptr, "type", LINE_END);
- RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
- RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac
Exception
+ RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
RIGHTARROWKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);//Mac
Exception
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", PREV_CHAR);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "type", NEXT_CHAR);
RNA_enum_set(WM_keymap_add_item(keymap, "TEXT_OT_move_select",
LEFTARROWKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "type", PREV_WORD);
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-09 11:52:56 UTC (rev 23080)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-09 15:45:12 UTC (rev 23081)
@@ -1918,22 +1918,17 @@
/* note, this doesn't replace existing keymap items */
WM_keymap_verify_item(keymap, "WM_OT_window_duplicate", WKEY, KM_PRESS,
KM_CTRL|KM_ALT, 0);
-// WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_read_homefile", XKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS,
KM_OSKEY, 0);
- WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS,
KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS,
KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS,
KM_OSKEY, 0);//Mac Exception
+ WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS,
KM_CTRL, 0);
WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS,
KM_SHIFT|KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_open_recentfile", OKEY, KM_PRESS,
KM_SHIFT|KM_OSKEY, 0);
-// WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_open_mainfile", F1KEY, KM_PRESS, 0,
0);
- WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS,
KM_OSKEY, 0);
-// WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_save_mainfile", WKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS,
KM_OSKEY, 0);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
