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.
This commit is contained in:
parent
f55f2db6bd
commit
0e304ca8f5
|
@ -3644,7 +3644,7 @@ void ED_screens_header_tools_menu_create(bContext *C, uiLayout *layout, void *UN
|
|||
}
|
||||
}
|
||||
|
||||
static int header_toolbox_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
|
||||
static int header_context_menu_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
|
||||
{
|
||||
uiPopupMenu *pup;
|
||||
uiLayout *layout;
|
||||
|
@ -3659,15 +3659,15 @@ static int header_toolbox_invoke(bContext *C, wmOperator *UNUSED(op), const wmEv
|
|||
return OPERATOR_INTERFACE;
|
||||
}
|
||||
|
||||
static void SCREEN_OT_header_toolbox(wmOperatorType *ot)
|
||||
static void SCREEN_OT_header_context_menu(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Header Toolbox";
|
||||
ot->description = "Display header region toolbox";
|
||||
ot->idname = "SCREEN_OT_header_toolbox";
|
||||
ot->name = "Header Context Menu";
|
||||
ot->description = "Display header region context menu";
|
||||
ot->idname = "SCREEN_OT_header_context_menu";
|
||||
|
||||
/* api callbacks */
|
||||
ot->invoke = header_toolbox_invoke;
|
||||
ot->invoke = header_context_menu_invoke;
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
@ -4682,7 +4682,7 @@ void ED_operatortypes_screen(void)
|
|||
WM_operatortype_append(SCREEN_OT_region_flip);
|
||||
WM_operatortype_append(SCREEN_OT_header);
|
||||
WM_operatortype_append(SCREEN_OT_header_toggle_menus);
|
||||
WM_operatortype_append(SCREEN_OT_header_toolbox);
|
||||
WM_operatortype_append(SCREEN_OT_header_context_menu);
|
||||
WM_operatortype_append(SCREEN_OT_screen_set);
|
||||
WM_operatortype_append(SCREEN_OT_screen_full_area);
|
||||
WM_operatortype_append(SCREEN_OT_back_to_previous);
|
||||
|
@ -4801,7 +4801,7 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
|
|||
/* note: this is only used when the cursor is inside the header */
|
||||
keymap = WM_keymap_find(keyconf, "Header", 0, 0);
|
||||
|
||||
WM_keymap_add_item(keymap, "SCREEN_OT_header_toolbox", RIGHTMOUSE, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "SCREEN_OT_header_context_menu", RIGHTMOUSE, KM_PRESS, 0, 0);
|
||||
|
||||
/* Screen General ------------------------------------------------ */
|
||||
keymap = WM_keymap_find(keyconf, "Screen", 0, 0);
|
||||
|
|
|
@ -1590,7 +1590,7 @@ void ACTION_OT_clickselect(wmOperatorType *ot)
|
|||
PropertyRNA *prop;
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Mouse Select Keys";
|
||||
ot->name = "Select Keyframes";
|
||||
ot->idname = "ACTION_OT_clickselect";
|
||||
ot->description = "Select keyframes by clicking on them";
|
||||
|
||||
|
|
|
@ -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__ */
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -468,7 +468,7 @@ static void view_pan_cancel(bContext *C, wmOperator *op)
|
|||
void CLIP_OT_view_pan(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "View Pan";
|
||||
ot->name = "Pan View";
|
||||
ot->idname = "CLIP_OT_view_pan";
|
||||
ot->description = "Pan the view";
|
||||
|
||||
|
|
|
@ -458,7 +458,7 @@ static int file_border_select_exec(bContext *C, wmOperator *op)
|
|||
void FILE_OT_select_border(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Activate/Select File";
|
||||
ot->name = "Border Select";
|
||||
ot->description = "Activate/select the file(s) contained in the border";
|
||||
ot->idname = "FILE_OT_select_border";
|
||||
|
||||
|
@ -527,7 +527,7 @@ void FILE_OT_select(wmOperatorType *ot)
|
|||
PropertyRNA *prop;
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Activate/Select File";
|
||||
ot->name = "Select";
|
||||
ot->description = "Activate/select file";
|
||||
ot->idname = "FILE_OT_select";
|
||||
|
||||
|
|
|
@ -1530,7 +1530,7 @@ void GRAPH_OT_clickselect(wmOperatorType *ot)
|
|||
PropertyRNA *prop;
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Mouse Select Keys";
|
||||
ot->name = "Select Keyframes";
|
||||
ot->idname = "GRAPH_OT_clickselect";
|
||||
ot->description = "Select keyframes by clicking on them";
|
||||
|
||||
|
|
|
@ -423,7 +423,7 @@ static void image_view_pan_cancel(bContext *C, wmOperator *op)
|
|||
void IMAGE_OT_view_pan(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "View Pan";
|
||||
ot->name = "Pan View";
|
||||
ot->idname = "IMAGE_OT_view_pan";
|
||||
ot->description = "Pan the view";
|
||||
|
||||
|
@ -639,7 +639,7 @@ void IMAGE_OT_view_zoom(wmOperatorType *ot)
|
|||
PropertyRNA *prop;
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "View Zoom";
|
||||
ot->name = "Zoom View";
|
||||
ot->idname = "IMAGE_OT_view_zoom";
|
||||
ot->description = "Zoom in/out the image";
|
||||
|
||||
|
|
|
@ -653,7 +653,7 @@ void NLA_OT_click_select(wmOperatorType *ot)
|
|||
PropertyRNA *prop;
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Mouse Select";
|
||||
ot->name = "Select";
|
||||
ot->idname = "NLA_OT_click_select";
|
||||
ot->description = "Handle clicks to select NLA Strips";
|
||||
|
||||
|
|
|
@ -1142,9 +1142,9 @@ static int outliner_item_activate_invoke(bContext *C, wmOperator *op, const wmEv
|
|||
|
||||
void OUTLINER_OT_item_activate(wmOperatorType *ot)
|
||||
{
|
||||
ot->name = "Activate Item";
|
||||
ot->name = "Select";
|
||||
ot->idname = "OUTLINER_OT_item_activate";
|
||||
ot->description = "Handle mouse clicks to activate/select items";
|
||||
ot->description = "Handle mouse clicks to select and activate items";
|
||||
|
||||
ot->invoke = outliner_item_activate_invoke;
|
||||
|
||||
|
|
|
@ -1914,7 +1914,7 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), const wmEvent
|
|||
/* Menu only! Calls other operators */
|
||||
void OUTLINER_OT_operation(wmOperatorType *ot)
|
||||
{
|
||||
ot->name = "Execute Operation";
|
||||
ot->name = "Context Menu";
|
||||
ot->idname = "OUTLINER_OT_operation";
|
||||
ot->description = "Context menu for item operations";
|
||||
|
||||
|
|
|
@ -557,7 +557,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot)
|
|||
};
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Activate/Select";
|
||||
ot->name = "Select";
|
||||
ot->idname = "SEQUENCER_OT_select";
|
||||
ot->description = "Select a strip (last selected becomes the \"active strip\")";
|
||||
|
||||
|
|
|
@ -1554,7 +1554,7 @@ static int ndof_all_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
|||
void VIEW3D_OT_ndof_all(struct wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "NDOF Move View";
|
||||
ot->name = "NDOF Pan View";
|
||||
ot->description = "Pan and rotate the view with the 3D mouse";
|
||||
ot->idname = "VIEW3D_OT_ndof_all";
|
||||
|
||||
|
@ -1744,7 +1744,7 @@ void VIEW3D_OT_move(wmOperatorType *ot)
|
|||
{
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Move View";
|
||||
ot->name = "Pan View";
|
||||
ot->description = "Move the view";
|
||||
ot->idname = "VIEW3D_OT_move";
|
||||
|
||||
|
@ -4255,8 +4255,8 @@ static int viewpan_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
|||
void VIEW3D_OT_view_pan(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "View Pan";
|
||||
ot->description = "Pan the view";
|
||||
ot->name = "Pan View Direction";
|
||||
ot->description = "Pan the view in a given direction";
|
||||
ot->idname = "VIEW3D_OT_view_pan";
|
||||
|
||||
/* api callbacks */
|
||||
|
|
|
@ -2518,8 +2518,8 @@ void VIEW3D_OT_select(wmOperatorType *ot)
|
|||
PropertyRNA *prop;
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Activate/Select";
|
||||
ot->description = "Activate/select item(s)";
|
||||
ot->name = "Select";
|
||||
ot->description = "Select and activate item(s)";
|
||||
ot->idname = "VIEW3D_OT_select";
|
||||
|
||||
/* api callbacks */
|
||||
|
|
|
@ -4365,6 +4365,9 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, struct wmWindow *win)
|
|||
}
|
||||
|
||||
/* Keep as-is. */
|
||||
if (ELEM(sa->spacetype, SPACE_STATUSBAR, SPACE_TOPBAR)) {
|
||||
return;
|
||||
}
|
||||
if (ELEM(ar->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TEMPORARY, RGN_TYPE_HUD)) {
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue