[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25539] trunk/blender: Key map related things:
Matt Ebb
matt at mke3.net
Thu Dec 24 10:26:06 CET 2009
Revision: 25539
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25539
Author: broken
Date: 2009-12-24 10:26:06 +0100 (Thu, 24 Dec 2009)
Log Message:
-----------
Key map related things:
* Moved 'change shortcut' (previously directly RMB on menu items) to a context-menu item, and added Remove Shortcut and Add Shortcut. This is all available now in a RMB context menu for operator buttons and menu entries.
* Renamed a bunch of key maps to be consistent with UI names, and human-readable. Since these key map names are now being directly used in the UI for people to find things, they should be understandable and in plain language.
This renaming may break some older saved key map setups - though previously saved .b25.blends should convert over ok. Exported .py files may need some find/replacing - in this commit check the changes in resources.c to see what's changed.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_buttons/space_buttons.c
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_logic/space_logic.c
trunk/blender/source/blender/editors/space_nla/nla_ops.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_time/time_ops.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2009-12-23 15:56:00 UTC (rev 25538)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2009-12-24 09:26:06 UTC (rev 25539)
@@ -21,71 +21,79 @@
KM_HIERARCHY = [
('Window', 'EMPTY', 'WINDOW', []), # file save, window change, exit
- ('Screen Editing', 'EMPTY', 'WINDOW', []), # resizing, action corners
- ('Screen', 'EMPTY', 'WINDOW', []), # full screen, undo, screenshot
+ ('Screen', 'EMPTY', 'WINDOW', [ # full screen, undo, screenshot
+ ('Screen Editing', 'EMPTY', 'WINDOW', []), # resizing, action corners
+ ]),
('View2D', 'EMPTY', 'WINDOW', []), # view 2d navigation (per region)
- ('Frames', 'EMPTY', 'WINDOW', []), # frame navigation (per region)
+ ('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation
('Header', 'EMPTY', 'WINDOW', []), # header stuff (per region)
- ('Markers', 'EMPTY', 'WINDOW', []), # markers (per region)
- ('Animation', 'EMPTY', 'WINDOW', []), # frame change on click, preview range (per region)
('Grease Pencil', 'EMPTY', 'WINDOW', []), # grease pencil stuff (per region)
-
- ('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation
- ('Animation_Channels', 'EMPTY', 'WINDOW', []),
-
- ('Buttons Generic', 'PROPERTIES', 'WINDOW', []), # align context menu
- ('TimeLine', 'TIMELINE', 'WINDOW', []),
- ('Outliner', 'OUTLINER', 'WINDOW', []),
-
- ('View3D', 'VIEW_3D', 'WINDOW', [ # view 3d navigation and generic stuff (select, transform)
+
+ ('3D View', 'VIEW_3D', 'WINDOW', [ # view 3d navigation and generic stuff (select, transform)
+ ('Object Mode', 'EMPTY', 'WINDOW', []),
+ ('Mesh', 'EMPTY', 'WINDOW', []),
+ ('Curve', 'EMPTY', 'WINDOW', []),
+ ('Armature', 'EMPTY', 'WINDOW', []),
+ ('Metaball', 'EMPTY', 'WINDOW', []),
+ ('Lattice', 'EMPTY', 'WINDOW', []),
+ ('Font', 'EMPTY', 'WINDOW', []),
+
('Pose', 'EMPTY', 'WINDOW', []),
- ('Object Mode', 'EMPTY', 'WINDOW', []),
+
('Vertex Paint', 'EMPTY', 'WINDOW', []),
('Weight Paint', 'EMPTY', 'WINDOW', []),
('Face Mask', 'EMPTY', 'WINDOW', []),
+ ('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d
('Sculpt', 'EMPTY', 'WINDOW', []),
- ('EditMesh', 'EMPTY', 'WINDOW', []),
- ('Curve', 'EMPTY', 'WINDOW', []),
- ('Armature', 'EMPTY', 'WINDOW', []),
- ('Metaball', 'EMPTY', 'WINDOW', []),
- ('Lattice', 'EMPTY', 'WINDOW', []),
- ('Armature_Sketch', 'EMPTY', 'WINDOW', []),
+
+ ('Armature Sketch', 'EMPTY', 'WINDOW', []),
('Particle', 'EMPTY', 'WINDOW', []),
- ('Font', 'EMPTY', 'WINDOW', []),
+
('Object Non-modal', 'EMPTY', 'WINDOW', []), # mode change
- ('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d
- ('View3D Generic', 'VIEW_3D', 'WINDOW', []) # toolbar and properties
+
+ ('3D View Generic', 'VIEW_3D', 'WINDOW', []) # toolbar and properties
]),
- ('GraphEdit Keys', 'GRAPH_EDITOR', 'WINDOW', [
- ('GraphEdit Generic', 'GRAPH_EDITOR', 'WINDOW', [])
+
+ ('Frames', 'EMPTY', 'WINDOW', []), # frame navigation (per region)
+ ('Markers', 'EMPTY', 'WINDOW', []), # markers (per region)
+ ('Animation', 'EMPTY', 'WINDOW', []), # frame change on click, preview range (per region)
+ ('Animation Channels', 'EMPTY', 'WINDOW', []),
+ ('Graph Editor', 'GRAPH_EDITOR', 'WINDOW', [
+ ('Graph Editor Generic', 'GRAPH_EDITOR', 'WINDOW', [])
]),
+ ('Dopesheet', 'DOPESHEET_EDITOR', 'WINDOW', []),
+ ('NLA Editor', 'NLA_EDITOR', 'WINDOW', [
+ ('NLA Channels', 'NLA_EDITOR', 'WINDOW', []),
+ ('NLA Generic', 'NLA_EDITOR', 'WINDOW', [])
+ ]),
('Image', 'IMAGE_EDITOR', 'WINDOW', [
- ('UVEdit', 'EMPTY', 'WINDOW', []), # image (reverse order, UVEdit before Image
+ ('UV Editor', 'EMPTY', 'WINDOW', []), # image (reverse order, UVEdit before Image
('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d
('Image Generic', 'IMAGE_EDITOR', 'WINDOW', [])
]),
-
- ('Node Generic', 'NODE_EDITOR', 'WINDOW', [
- ('Node', 'NODE_EDITOR', 'WINDOW', [])
+
+ ('Timeline', 'TIMELINE', 'WINDOW', []),
+ ('Outliner', 'OUTLINER', 'WINDOW', []),
+
+ ('Node Editor', 'NODE_EDITOR', 'WINDOW', [
+ ('Node Generic', 'NODE_EDITOR', 'WINDOW', [])
]),
- ('File', 'FILE_BROWSER', 'WINDOW', [
- ('FileMain', 'FILE_BROWSER', 'WINDOW', []),
- ('FileButtons', 'FILE_BROWSER', 'WINDOW', [])
+ ('Sequencer', 'SEQUENCE_EDITOR', 'WINDOW', []),
+ ('Logic Editor', 'LOGIC_EDITOR', 'WINDOW', []),
+
+ ('File Browser', 'FILE_BROWSER', 'WINDOW', [
+ ('File Browser Main', 'FILE_BROWSER', 'WINDOW', []),
+ ('File Browser Buttons', 'FILE_BROWSER', 'WINDOW', [])
]),
- ('Action_Keys', 'DOPESHEET_EDITOR', 'WINDOW', []),
- ('NLA Generic', 'NLA_EDITOR', 'WINDOW', [
- ('NLA Channels', 'NLA_EDITOR', 'WINDOW', []),
- ('NLA Data', 'NLA_EDITOR', 'WINDOW', [])
- ]),
+
+ ('Property Editor', 'PROPERTIES', 'WINDOW', []), # align context menu
+
('Script', 'SCRIPTS_WINDOW', 'WINDOW', []),
('Text', 'TEXT_EDITOR', 'WINDOW', []),
- ('Sequencer', 'SEQUENCE_EDITOR', 'WINDOW', []),
- ('Logic Generic', 'LOGIC_EDITOR', 'WINDOW', []),
('Console', 'CONSOLE', 'WINDOW', []),
-
-
+
('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
('Gesture Border', 'EMPTY', 'WINDOW', []),
('Standard Modal Map', 'EMPTY', 'WINDOW', []),
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2009-12-23 15:56:00 UTC (rev 25538)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2009-12-24 09:26:06 UTC (rev 25539)
@@ -1901,7 +1901,7 @@
void ED_keymap_animchannels(wmKeyConfig *keyconf)
{
- wmKeyMap *keymap = WM_keymap_find(keyconf, "Animation_Channels", 0, 0);
+ wmKeyMap *keymap = WM_keymap_find(keyconf, "Animation Channels", 0, 0);
/* selection */
/* click-select */
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2009-12-23 15:56:00 UTC (rev 25538)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-12-24 09:26:06 UTC (rev 25539)
@@ -592,6 +592,7 @@
#define UI_ITEM_R_EVENT 32
#define UI_ITEM_R_FULL_EVENT 64
#define UI_ITEM_R_NO_BG 128
+#define UI_ITEM_R_IMMEDIATE 256
uiLayout *uiBlockLayout(uiBlock *block, int dir, int type, int x, int y, int size, int em, struct uiStyle *style);
void uiBlockSetCurLayout(uiBlock *block, uiLayout *layout);
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2009-12-23 15:56:00 UTC (rev 25538)
+++ trunk/blender/source/blender/editors/interface/interface.c 2009-12-24 09:26:06 UTC (rev 25539)
@@ -1995,23 +1995,18 @@
case HOTKEYEVT:
if (but->flag & UI_SELECT) {
- short *sp= (short *)but->func_arg3;
+ strncpy(but->drawstr, "", UI_MAX_DRAW_STR);
- if(but->flag & UI_BUT_IMMEDIATE)
- strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR);
- else
- strncpy(but->drawstr, "", UI_MAX_DRAW_STR);
-
- if(*sp) {
+ if(but->modifier_key) {
char *str= but->drawstr;
- if(*sp & KM_SHIFT)
+ if(but->modifier_key & KM_SHIFT)
str= strcat(str, "Shift ");
- if(*sp & KM_CTRL)
+ if(but->modifier_key & KM_CTRL)
str= strcat(str, "Ctrl ");
- if(*sp & KM_ALT)
+ if(but->modifier_key & KM_ALT)
str= strcat(str, "Alt ");
- if(*sp & KM_OSKEY)
+ if(but->modifier_key & KM_OSKEY)
str= strcat(str, "Cmd ");
}
else
@@ -3169,7 +3164,7 @@
uiBut *uiDefHotKeyevtButS(uiBlock *block, int retval, char *str, short x1, short y1, short x2, short y2, short *keypoin, short *modkeypoin, char *tip)
{
uiBut *but= ui_def_but(block, HOTKEYEVT|SHO, retval, str, x1, y1, x2, y2, keypoin, 0.0, 0.0, 0.0, 0.0, tip);
- but->func_arg3= modkeypoin; /* XXX hrmf, abuse! */
+ but->modifier_key= *modkeypoin;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list