diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-02-15 09:06:08 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-02-15 09:06:08 +0300 |
commit | 87494c0ad84794545ce03f7b39ddd365c3500a28 (patch) | |
tree | e3e4746219e91c6333994eb047cf93df9ae1629b /source/blender/src/header_action.c | |
parent | 8c8d585079e1888257c285ccfc4a4bf6e9a41f46 (diff) |
== Action Editor - Keyframe Selection (Added tools) ==
* Ctrl-I now swaps the selection status of keyframes/channels depending on where the mouse cursor is located. Ctrl-Shift-I does so for markers.
* (De)selecting channels now clears the 'active' flags too, so there will be no more 'selected' items lingering around even after pressing AKEY
Diffstat (limited to 'source/blender/src/header_action.c')
-rw-r--r-- | source/blender/src/header_action.c | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 51bfa37ebff..5c26e7ba0bc 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -111,6 +111,7 @@ enum { ACTMENU_SEL_ALL_MARKERS, ACTMENU_SEL_INVERSE_KEYS, ACTMENU_SEL_INVERSE_MARKERS, + ACTMENU_SEL_INVERSE_CHANNELS, ACTMENU_SEL_LEFTKEYS, ACTMENU_SEL_RIGHTKEYS }; @@ -565,33 +566,47 @@ static void do_action_selectmenu(void *arg, int event) case ACTMENU_SEL_ALL_KEYS: /* Select/Deselect All Keys */ deselect_action_keys(1, 1); - allqueue (REDRAWACTION, 0); + BIF_undo_push("(De)Select Keys"); + allqueue(REDRAWACTION, 0); allqueue(REDRAWNLA, 0); - allqueue (REDRAWIPO, 0); + allqueue(REDRAWIPO, 0); break; case ACTMENU_SEL_ALL_CHAN: /* Select/Deselect All Channels */ deselect_action_channels(1); - allqueue (REDRAWVIEW3D, 0); - allqueue (REDRAWACTION, 0); + BIF_undo_push("(De)Select Action Channels"); + allqueue(REDRAWVIEW3D, 0); + allqueue(REDRAWACTION, 0); allqueue(REDRAWNLA, 0); - allqueue (REDRAWIPO, 0); + allqueue(REDRAWIPO, 0); break; case ACTMENU_SEL_ALL_MARKERS: /* select/deselect all markers */ deselect_markers(1, 0); + BIF_undo_push("(De)Select Markers"); allqueue(REDRAWMARKER, 0); break; case ACTMENU_SEL_INVERSE_KEYS: /* invert selection status of keys */ deselect_action_keys(0, 2); - allqueue (REDRAWACTION, 0); + BIF_undo_push("Inverse Keys"); + allqueue(REDRAWACTION, 0); allqueue(REDRAWNLA, 0); - allqueue (REDRAWIPO, 0); + allqueue(REDRAWIPO, 0); + break; + + case ACTMENU_SEL_INVERSE_CHANNELS: /* invert selection status of channels */ + deselect_action_channels(2); + BIF_undo_push("Inverse Action Channels"); + allqueue(REDRAWVIEW3D, 0); + allqueue(REDRAWACTION, 0); + allqueue(REDRAWNLA, 0); + allqueue(REDRAWIPO, 0); break; case ACTMENU_SEL_INVERSE_MARKERS: /* invert selection of markers */ deselect_markers(0, 2); + BIF_undo_push("Inverse Action Channels"); allqueue(REDRAWMARKER, 0); break; @@ -635,7 +650,7 @@ static uiBlock *action_selectmenu(void *arg_unused) menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_SEL_ALL_MARKERS, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Select/Deselect All Channels", 0, yco-=20, + "Select/Deselect All Channels|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_SEL_ALL_CHAN, ""); @@ -643,13 +658,17 @@ static uiBlock *action_selectmenu(void *arg_unused) menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Inverse Keys", 0, yco-=20, + "Inverse Keys|Ctrl I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_SEL_INVERSE_KEYS, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Inverse Markers", 0, yco-=20, + "Inverse Markers|Ctrl Shift I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_SEL_INVERSE_MARKERS, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, + "Inverse All Channels|Ctrl I", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 0, + ACTMENU_SEL_INVERSE_CHANNELS, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); |