diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-11 16:36:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-11 16:36:57 +0300 |
commit | 43f396218f5d1a8cb0449cc945eb975ec1d943d7 (patch) | |
tree | 5088eb89a601ea8ba4df9867d6b5ef874ad68688 /source/blender/windowmanager | |
parent | c1a74d9bd6b186966568e6455f6fe4c50a3cf17f (diff) |
move report/operator view out of the 'Console' into the 'Info' space (file menu).
Ton will work on moving the File menu out of the Info space before release.
notes.
- reply Operator isn't working anymore.
- UI for reports is commented out so its not mixed with the file menu.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 34 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
4 files changed, 23 insertions, 19 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 7af6de6c86c..134e3890b16 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -241,23 +241,23 @@ typedef struct wmNotifier { /* NC_SPACE */ #define ND_SPACE_CONSOLE (1<<16) /* general redraw */ -#define ND_SPACE_CONSOLE_REPORT (2<<16) /* update for reports, could specify type */ -#define ND_SPACE_INFO (2<<16) -#define ND_SPACE_IMAGE (3<<16) -#define ND_SPACE_FILE_PARAMS (4<<16) -#define ND_SPACE_FILE_LIST (5<<16) -#define ND_SPACE_NODE (6<<16) -#define ND_SPACE_OUTLINER (7<<16) -#define ND_SPACE_VIEW3D (8<<16) -#define ND_SPACE_PROPERTIES (9<<16) -#define ND_SPACE_TEXT (10<<16) -#define ND_SPACE_TIME (11<<16) -#define ND_SPACE_GRAPH (12<<16) -#define ND_SPACE_DOPESHEET (13<<16) -#define ND_SPACE_NLA (14<<16) -#define ND_SPACE_SEQUENCER (15<<16) -#define ND_SPACE_NODE_VIEW (16<<16) -#define ND_SPACE_CHANGED (17<<16) /*sent to a new editor type after it's replaced an old one*/ +#define ND_SPACE_INFO_REPORT (2<<16) /* update for reports, could specify type */ +#define ND_SPACE_INFO (3<<16) +#define ND_SPACE_IMAGE (4<<16) +#define ND_SPACE_FILE_PARAMS (5<<16) +#define ND_SPACE_FILE_LIST (6<<16) +#define ND_SPACE_NODE (7<<16) +#define ND_SPACE_OUTLINER (8<<16) +#define ND_SPACE_VIEW3D (9<<16) +#define ND_SPACE_PROPERTIES (10<<16) +#define ND_SPACE_TEXT (11<<16) +#define ND_SPACE_TIME (12<<16) +#define ND_SPACE_GRAPH (13<<16) +#define ND_SPACE_DOPESHEET (14<<16) +#define ND_SPACE_NLA (15<<16) +#define ND_SPACE_SEQUENCER (16<<16) +#define ND_SPACE_NODE_VIEW (17<<16) +#define ND_SPACE_CHANGED (18<<16) /*sent to a new editor type after it's replaced an old one*/ /* subtype, 256 entries too */ #define NOTE_SUBTYPE 0x0000FF00 diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 76b5762fa4e..fa4ff7a7b9b 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -127,7 +127,7 @@ void wm_operator_register(bContext *C, wmOperator *op) } /* so the console is redrawn */ - WM_event_add_notifier(C, NC_SPACE|ND_SPACE_CONSOLE_REPORT, NULL); + WM_event_add_notifier(C, NC_SPACE|ND_SPACE_INFO_REPORT, NULL); WM_event_add_notifier(C, NC_WM|ND_HISTORY, NULL); } diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 5da9bb46cfd..628c2aa1922 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -888,6 +888,10 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, char *opname) else if (strstr(opname, "CONSOLE_OT")) { km = WM_keymap_find_all(C, "Console", sl->spacetype, 0); } + /* Console */ + else if (strstr(opname, "INFO_OT")) { + km = WM_keymap_find_all(C, "Info", sl->spacetype, 0); + } /* Transform */ else if (strstr(opname, "TRANSFORM_OT")) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 42e64646351..b686048e7c8 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3286,7 +3286,7 @@ static void gesture_border_modal_keymap(wmKeyConfig *keyconf) WM_modalkeymap_assign(keymap, "ACTION_OT_select_border"); WM_modalkeymap_assign(keymap, "ANIM_OT_channels_select_border"); WM_modalkeymap_assign(keymap, "ANIM_OT_previewrange_set"); - WM_modalkeymap_assign(keymap, "CONSOLE_OT_select_border"); + WM_modalkeymap_assign(keymap, "INFO_OT_select_border"); WM_modalkeymap_assign(keymap, "FILE_OT_select_border"); WM_modalkeymap_assign(keymap, "GRAPH_OT_select_border"); WM_modalkeymap_assign(keymap, "MARKER_OT_select_border"); |