diff options
Diffstat (limited to 'source/blender/editors/space_nla/nla_ops.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_ops.c | 175 |
1 files changed, 6 insertions, 169 deletions
diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index bfc6138fb03..0122306f709 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -39,6 +39,7 @@ #include "ED_anim_api.h" #include "ED_markers.h" #include "ED_screen.h" +#include "ED_select_utils.h" #include "ED_transform.h" #include "WM_api.h" @@ -123,8 +124,8 @@ void nla_operatortypes(void) /* select */ WM_operatortype_append(NLA_OT_click_select); - WM_operatortype_append(NLA_OT_select_border); - WM_operatortype_append(NLA_OT_select_all_toggle); + WM_operatortype_append(NLA_OT_select_box); + WM_operatortype_append(NLA_OT_select_all); WM_operatortype_append(NLA_OT_select_leftright); /* view */ @@ -171,172 +172,10 @@ void nla_operatortypes(void) /* ************************** registration - keymaps **********************************/ -static void nla_keymap_channels(wmKeyMap *keymap) -{ - wmKeyMapItem *kmi; - - /* keymappings here are NLA-specific (different to standard channels keymap) */ - - /* selection --------------------------------------------------------------------- */ - /* click-select */ - // XXX for now, only leftmouse.... - kmi = WM_keymap_add_item(keymap, "NLA_OT_channels_click", LEFTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "extend", false); - kmi = WM_keymap_add_item(keymap, "NLA_OT_channels_click", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "extend", true); - - /* channel operations ------------------------------------------------------------ */ - /* add tracks */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_tracks_add", AKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "above_selected", false); - kmi = WM_keymap_add_item(keymap, "NLA_OT_tracks_add", AKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "above_selected", true); - - /* delete tracks */ - WM_keymap_add_item(keymap, "NLA_OT_tracks_delete", XKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NLA_OT_tracks_delete", DELKEY, KM_PRESS, 0, 0); -} - -static void nla_keymap_main(wmKeyConfig *keyconf, wmKeyMap *keymap) -{ - wmKeyMapItem *kmi; - - /* selection ------------------------------------------------ */ - /* click select */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_click_select", SELECTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "extend", false); - kmi = WM_keymap_add_item(keymap, "NLA_OT_click_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "extend", true); - - /* select left/right */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_leftright", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); - RNA_boolean_set(kmi->ptr, "extend", false); - RNA_enum_set(kmi->ptr, "mode", NLAEDIT_LRSEL_TEST); - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_leftright", SELECTMOUSE, KM_PRESS, KM_CTRL | KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "extend", true); - RNA_enum_set(kmi->ptr, "mode", NLAEDIT_LRSEL_TEST); - - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_leftright", LEFTBRACKETKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "extend", false); - RNA_enum_set(kmi->ptr, "mode", NLAEDIT_LRSEL_LEFT); - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_leftright", RIGHTBRACKETKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "extend", false); - RNA_enum_set(kmi->ptr, "mode", NLAEDIT_LRSEL_RIGHT); - - - /* deselect all */ - /* TODO: uniformize with other select_all ops? */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "invert", false); - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0); - RNA_boolean_set(kmi->ptr, "invert", true); - - /* borderselect */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_border", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "axis_range", false); - kmi = WM_keymap_add_item(keymap, "NLA_OT_select_border", BKEY, KM_PRESS, KM_ALT, 0); - RNA_boolean_set(kmi->ptr, "axis_range", true); - - /* view ---------------------------------------------------- */ - /* auto-set range */ - WM_keymap_add_item(keymap, "NLA_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL | KM_ALT, 0); - - WM_keymap_add_item(keymap, "NLA_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); -#ifdef WITH_INPUT_NDOF - WM_keymap_add_item(keymap, "NLA_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0); -#endif - WM_keymap_add_item(keymap, "NLA_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NLA_OT_view_frame", PAD0, KM_PRESS, 0, 0); - - /* editing ------------------------------------------------ */ - - /* add strips */ - WM_keymap_add_item(keymap, "NLA_OT_actionclip_add", AKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "NLA_OT_transition_add", TKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "NLA_OT_soundclip_add", KKEY, KM_PRESS, KM_SHIFT, 0); - - /* meta-strips */ - WM_keymap_add_item(keymap, "NLA_OT_meta_add", GKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "NLA_OT_meta_remove", GKEY, KM_PRESS, KM_ALT, 0); - - /* duplicate */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "linked", false); - - kmi = WM_keymap_add_item(keymap, "NLA_OT_duplicate", DKEY, KM_PRESS, KM_ALT, 0); - RNA_boolean_set(kmi->ptr, "linked", true); - - /* single user */ - WM_keymap_add_item(keymap, "NLA_OT_make_single_user", UKEY, KM_PRESS, 0, 0); - - /* delete */ - WM_keymap_add_item(keymap, "NLA_OT_delete", XKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NLA_OT_delete", DELKEY, KM_PRESS, 0, 0); - - /* split */ - WM_keymap_add_item(keymap, "NLA_OT_split", YKEY, KM_PRESS, 0, 0); - - /* toggles */ - WM_keymap_add_item(keymap, "NLA_OT_mute_toggle", HKEY, KM_PRESS, 0, 0); - - /* swap */ - WM_keymap_add_item(keymap, "NLA_OT_swap", FKEY, KM_PRESS, KM_ALT, 0); - - /* move up */ - WM_keymap_add_item(keymap, "NLA_OT_move_up", PAGEUPKEY, KM_PRESS, 0, 0); - /* move down */ - WM_keymap_add_item(keymap, "NLA_OT_move_down", PAGEDOWNKEY, KM_PRESS, 0, 0); - - /* apply scale */ - WM_keymap_add_item(keymap, "NLA_OT_apply_scale", AKEY, KM_PRESS, KM_CTRL, 0); - /* clear scale */ - WM_keymap_add_item(keymap, "NLA_OT_clear_scale", SKEY, KM_PRESS, KM_ALT, 0); - - /* snap */ - WM_keymap_add_item(keymap, "NLA_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0); - - /* add f-modifier */ - WM_keymap_add_item(keymap, "NLA_OT_fmodifier_add", MKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0); - - /* transform system */ - transform_keymap_for_space(keyconf, keymap, SPACE_NLA); - - /* special markers hotkeys for anim editors: see note in definition of this function */ - ED_marker_keymap_animedit_conflictfree(keymap); -} - -/* --------------- */ - void nla_keymap(wmKeyConfig *keyconf) { - wmKeyMap *keymap; - wmKeyMapItem *kmi; - /* keymap for all regions ------------------------------------------- */ - keymap = WM_keymap_ensure(keyconf, "NLA Generic", SPACE_NLA, 0); - - /* region management */ - WM_keymap_add_item(keymap, "NLA_OT_properties", NKEY, KM_PRESS, 0, 0); - - /* tweakmode - * - enter and exit are separate operators with the same hotkey... - * This works as they use different poll()'s - */ - WM_keymap_add_item(keymap, "NLA_OT_tweakmode_enter", TABKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NLA_OT_tweakmode_exit", TABKEY, KM_PRESS, 0, 0); - - /* tweakmode for stashed actions - * - similar to normal tweakmode, except we mark the tracks as being "solo" - * too so that the action can be edited in isolation - */ - kmi = WM_keymap_add_item(keymap, "NLA_OT_tweakmode_enter", TABKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "isolate_action", true); - - kmi = WM_keymap_add_item(keymap, "NLA_OT_tweakmode_exit", TABKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "isolate_action", true); - - /* find (i.e. a shortcut for setting the name filter) */ - WM_keymap_add_item(keymap, "ANIM_OT_channels_find", FKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_ensure(keyconf, "NLA Generic", SPACE_NLA, 0); /* channels ---------------------------------------------------------- */ /* Channels are not directly handled by the NLA Editor module, but are inherited from the Animation module. @@ -346,10 +185,8 @@ void nla_keymap(wmKeyConfig *keyconf) * However, those operations which involve clicking on channels and/or * the placement of them in the view are implemented here instead */ - keymap = WM_keymap_ensure(keyconf, "NLA Channels", SPACE_NLA, 0); - nla_keymap_channels(keymap); + WM_keymap_ensure(keyconf, "NLA Channels", SPACE_NLA, 0); /* data ------------------------------------------------------------- */ - keymap = WM_keymap_ensure(keyconf, "NLA Editor", SPACE_NLA, 0); - nla_keymap_main(keyconf, keymap); + WM_keymap_ensure(keyconf, "NLA Editor", SPACE_NLA, 0); } |