diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-27 18:07:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-27 20:04:04 +0300 |
| commit | 0e304ca8f57563c8f22313f6cee2551c88dcef3f (patch) | |
| tree | fca6b66043cad47b0175283462b55b875f39bd77 /source/blender/editors/space_buttons | |
| parent | f55f2db6bd6f1fc25bdf9b8a04e8f5283137811c (diff) | |
UI: some renaming for more clear/consistent cursor keymaps in status bar.
There's much more work to be done here, this is just fixing some obvious ones.
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h index 2219b2a932c..2e1a448edf0 100644 --- a/source/blender/editors/space_buttons/buttons_intern.h +++ b/source/blender/editors/space_buttons/buttons_intern.h @@ -98,7 +98,7 @@ void buttons_texture_context_compute(const struct bContext *C, struct SpaceButs /* buttons_ops.c */ void BUTTONS_OT_file_browse(struct wmOperatorType *ot); void BUTTONS_OT_directory_browse(struct wmOperatorType *ot); -void BUTTONS_OT_toolbox(struct wmOperatorType *ot); +void BUTTONS_OT_context_menu(struct wmOperatorType *ot); #endif /* __BUTTONS_INTERN_H__ */ diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 47f97b8087f..93670919d4c 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -60,9 +60,9 @@ #include "buttons_intern.h" /* own include */ -/********************** toolbox operator *********************/ +/********************** context_menu operator *********************/ -static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) +static int context_menu_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) { bScreen *sc = CTX_wm_screen(C); SpaceButs *sbuts = CTX_wm_space_buts(C); @@ -80,15 +80,15 @@ static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UN return OPERATOR_INTERFACE; } -void BUTTONS_OT_toolbox(wmOperatorType *ot) +void BUTTONS_OT_context_menu(wmOperatorType *ot) { /* identifiers */ - ot->name = "Toolbox"; - ot->description = "Display button panel toolbox"; - ot->idname = "BUTTONS_OT_toolbox"; + ot->name = "Context Menu"; + ot->description = "Display button panel context_menu"; + ot->idname = "BUTTONS_OT_context_menu"; /* api callbacks */ - ot->invoke = toolbox_invoke; + ot->invoke = context_menu_invoke; ot->poll = ED_operator_buttons_active; } diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 4fe3423e730..ab09631cb87 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -298,7 +298,7 @@ static void buttons_main_region_listener( static void buttons_operatortypes(void) { - WM_operatortype_append(BUTTONS_OT_toolbox); + WM_operatortype_append(BUTTONS_OT_context_menu); WM_operatortype_append(BUTTONS_OT_file_browse); WM_operatortype_append(BUTTONS_OT_directory_browse); } @@ -307,7 +307,7 @@ static void buttons_keymap(struct wmKeyConfig *keyconf) { wmKeyMap *keymap = WM_keymap_find(keyconf, "Property Editor", SPACE_BUTS, 0); - WM_keymap_add_item(keymap, "BUTTONS_OT_toolbox", RIGHTMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "BUTTONS_OT_context_menu", RIGHTMOUSE, KM_PRESS, 0, 0); } /* add handlers, stuff you only do once or on area/region changes */ |