Commit: 57628cb562f2053ed0b27ac52723f85ee30dc7d5
Author: Julian Eisel
Date: Sat Nov 28 18:15:56 2015 +0100
Branches: master
https://developer.blender.org/rB57628cb562f2053ed0b27ac52723f85ee30dc7d5
UI: More minor UI cleanups for keymap editor
Place non-editor related keymaps together, place animation editor keymaps
together, move 'Header' keymap (which had exactly 1 entry) into 'Screen'
keymap, move SCREEN_OT_header (for showing/hiding header) into 'Header' keymap.
Again, this shouldn't break any key configs, but key configs that contain
SCREEN_OT_header will add an entry for this under 'Screen' again. Just a very
minor glitch.
===================================================================
M release/scripts/modules/bpy_extras/keyconfig_utils.py
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py
b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index 600a3d7..c4b29e2 100644
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -27,15 +27,11 @@ KM_HIERARCHY = [
('Window', 'EMPTY', 'WINDOW', []), # file save, window change, exit
('Screen', 'EMPTY', 'WINDOW', [ # full screen, undo, screenshot
('Screen Editing', 'EMPTY', 'WINDOW', []), # re-sizing, action
corners
+ ('Header', 'EMPTY', 'WINDOW', []), # header stuff (per
region)
]),
('View2D', 'EMPTY', 'WINDOW', []), # view 2d navigation (per region)
('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons
navigation
- ('Header', 'EMPTY', 'WINDOW', []), # header stuff (per region)
-
- ('Grease Pencil', 'EMPTY', 'WINDOW', [ # grease pencil stuff (per region)
- ('Grease Pencil Stroke Edit Mode', 'EMPTY', 'WINDOW', []),
- ]),
('3D View', 'VIEW_3D', 'WINDOW', [ # view 3d navigation and generic stuff
(select, transform)
('Object Mode', 'EMPTY', 'WINDOW', []),
@@ -73,10 +69,6 @@ KM_HIERARCHY = [
('3D View Generic', 'VIEW_3D', 'WINDOW', []), # toolbar and
properties
]),
- ('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', []),
]),
@@ -85,15 +77,15 @@ KM_HIERARCHY = [
('NLA Channels', 'NLA_EDITOR', 'WINDOW', []),
('NLA Generic', 'NLA_EDITOR', 'WINDOW', []),
]),
+ ('Timeline', 'TIMELINE', 'WINDOW', []),
('Image', 'IMAGE_EDITOR', 'WINDOW', [
- ('UV Editor', '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
('UV Sculpt', 'EMPTY', 'WINDOW', []),
('Image Generic', 'IMAGE_EDITOR', 'WINDOW', []),
]),
- ('Timeline', 'TIMELINE', 'WINDOW', []),
('Outliner', 'OUTLINER', 'WINDOW', []),
('Node Editor', 'NODE_EDITOR', 'WINDOW', [
@@ -124,7 +116,14 @@ KM_HIERARCHY = [
('Clip Dopesheet Editor', 'CLIP_EDITOR', 'WINDOW', []),
]),
+ ('Grease Pencil', 'EMPTY', 'WINDOW', [ # grease pencil stuff (per region)
+ ('Grease Pencil Stroke Edit Mode', 'EMPTY', 'WINDOW', []),
+ ]),
('Mask Editing', 'EMPTY', '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', []),
('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
('Gesture Straight Line', 'EMPTY', 'WINDOW', []),
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 24653dc..7b68327 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4302,14 +4302,13 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
WM_keymap_verify_item(keymap, "SCREEN_OT_area_move", LEFTMOUSE,
KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_area_options", RIGHTMOUSE,
KM_PRESS, 0, 0);
-
- WM_keymap_add_item(keymap, "SCREEN_OT_header", F9KEY, KM_PRESS, KM_ALT,
0);
-
+
/* Header Editing ------------------------------------------------ */
keymap = WM_keymap_find(keyconf, "Header", 0, 0);
-
+
+ WM_keymap_add_item(keymap, "SCREEN_OT_header", F9KEY, KM_PRESS, KM_ALT,
0);
WM_keymap_add_item(keymap, "SCREEN_OT_header_toolbox", RIGHTMOUSE,
KM_PRESS, 0, 0);
-
+
/* Screen General ------------------------------------------------ */
keymap = WM_keymap_find(keyconf, "Screen", 0, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
