NLA SoC: DopeSheet Cleanups

* Replaced old-style menu defines with the new-style Layout Engine ones. These are now much cleaner as a result :)

* Wrapped DopeSheet and Graph Editors in RNA to allow them to use the new Layout Engine for menu drawing 

* Shortened the names of operators in the DopeSheet, removing the "keyframes" prefix since that's the only real context which can operate there.

* Standardised a few names, and renamed a confusingly named operator (cfrasnap -> jump to frame)

5 files changed, 220 insertions, 1533 deletions

diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index 27be82ccec0..b2f4751fa25 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -307,11 +307,11 @@ static int actkeys_copy_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_copy (wmOperatorType *ot)
+void ACT_OT_copy (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Copy Keyframes";
-	ot->idname= "ACT_OT_keyframes_copy";
+	ot->idname= "ACT_OT_copy";
 	
 	/* api callbacks */
 	ot->exec= actkeys_copy_exec;
@@ -351,11 +351,11 @@ static int actkeys_paste_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_paste (wmOperatorType *ot)
+void ACT_OT_paste (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Paste Keyframes";
-	ot->idname= "ACT_OT_keyframes_paste";
+	ot->idname= "ACT_OT_paste";
 	
 	/* api callbacks */
 	ot->exec= actkeys_paste_exec;
@@ -447,11 +447,11 @@ static int actkeys_insertkey_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ACT_OT_keyframes_insert (wmOperatorType *ot)
+void ACT_OT_insert (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Insert Keyframes";
-	ot->idname= "ACT_OT_keyframes_insert";
+	ot->idname= "ACT_OT_insert";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
@@ -524,11 +524,11 @@ static int actkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_duplicate (wmOperatorType *ot)
+void ACT_OT_duplicate (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Duplicate Keyframes";
-	ot->idname= "ACT_OT_keyframes_duplicate";
+	ot->idname= "ACT_OT_duplicate";
 	
 	/* api callbacks */
 	ot->invoke= actkeys_duplicate_invoke;
@@ -591,11 +591,11 @@ static int actkeys_delete_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_delete (wmOperatorType *ot)
+void ACT_OT_delete (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Delete Keyframes";
-	ot->idname= "ACT_OT_keyframes_delete";
+	ot->idname= "ACT_OT_delete";
 	
 	/* api callbacks */
 	ot->invoke= WM_operator_confirm;
@@ -654,11 +654,11 @@ static int actkeys_clean_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_clean (wmOperatorType *ot)
+void ACT_OT_clean (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Clean Keyframes";
-	ot->idname= "ACT_OT_keyframes_clean";
+	ot->idname= "ACT_OT_clean";
 	
 	/* api callbacks */
 	//ot->invoke=  // XXX we need that number popup for this! 
@@ -778,11 +778,11 @@ static int actkeys_sample_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_sample (wmOperatorType *ot)
+void ACT_OT_sample (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Sample Keyframes";
-	ot->idname= "ACT_OT_keyframes_sample";
+	ot->idname= "ACT_OT_sample";
 	
 	/* api callbacks */
 	ot->exec= actkeys_sample_exec;
@@ -853,11 +853,11 @@ static int actkeys_expo_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_extrapolation_type_set (wmOperatorType *ot)
+void ACT_OT_extrapolation_type_set (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Keyframe Extrapolation";
-	ot->idname= "ACT_OT_keyframes_extrapolation_type_set";
+	ot->idname= "ACT_OT_extrapolation_type_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
@@ -923,11 +923,11 @@ static int actkeys_ipo_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_interpolation_type (wmOperatorType *ot)
+void ACT_OT_interpolation_type_set (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Keyframe Interpolation";
-	ot->idname= "ACT_OT_keyframes_interpolation_type";
+	ot->idname= "ACT_OT_interpolation_type_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
@@ -1011,11 +1011,11 @@ static int actkeys_handletype_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_handle_type_set (wmOperatorType *ot)
+void ACT_OT_handle_type_set (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Set Keyframe Handle Type";
-	ot->idname= "ACT_OT_keyframes_handle_type_set";
+	ot->idname= "ACT_OT_handle_type_set";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
@@ -1032,10 +1032,10 @@ void ACT_OT_keyframes_handle_type_set (wmOperatorType *ot)
 /* ************************************************************************** */
 /* TRANSFORM STUFF */
 
-/* ***************** Snap Current Frame Operator *********************** */
+/* ***************** Jump to Selected Frames Operator *********************** */
 
 /* snap current-frame indicator to 'average time' of selected keyframe */
-static int actkeys_cfrasnap_exec(bContext *C, wmOperator *op)
+static int actkeys_framejump_exec(bContext *C, wmOperator *op)
 {
 	bAnimContext ac;
 	ListBase anim_data= {NULL, NULL};
@@ -1071,14 +1071,14 @@ static int actkeys_cfrasnap_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void ACT_OT_keyframes_cfrasnap (wmOperatorType *ot)
+void ACT_OT_frame_jump (wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Snap Current Frame to Keys";
-	ot->idname= "ACT_OT_keyframes_cfrasnap";
+	ot->name= "Jump to Frame";
+	ot->idname= "ACT_OT_frame_jump";
 	
 	/* api callbacks */
-	ot->exec= actkeys_cfrasnap_exec;
+	ot->exec= actkeys_framejump_exec;
 	ot->poll= ED_operator_action_active;
 	
 	/* flags */
@@ -1166,11 +1166,11 @@ static int actkeys_snap_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_snap (wmOperatorType *ot)
+void ACT_OT_snap (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Snap Keys";
-	ot->idname= "ACT_OT_keyframes_snap";
+	ot->idname= "ACT_OT_snap";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
@@ -1282,11 +1282,11 @@ static int actkeys_mirror_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_mirror (wmOperatorType *ot)
+void ACT_OT_mirror (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Mirror Keys";
-	ot->idname= "ACT_OT_keyframes_mirror";
+	ot->idname= "ACT_OT_mirror";
 	
 	/* api callbacks */
 	ot->invoke= WM_menu_invoke;
diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index fa96e1ea81f..1bc30b2ac42 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -51,11 +51,14 @@
 #include "ED_types.h"
 #include "ED_util.h"
 
+#include "RNA_access.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
+#include "BIF_transform.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
@@ -63,1494 +66,183 @@
 
 #include "action_intern.h"
 
-/* ********************************************************* */
-/* Menu Defines... */
-
-/* button events */
-enum {
-	B_REDR 	= 0,
-	B_ACTCOPYKEYS,
-	B_ACTPASTEKEYS,
-} eActHeader_ButEvents;
-
-/* ------------------------------- */
-/* enums declaring constants that are used as menu event codes  */
-
-enum {
-	ACTMENU_VIEW_CENTERVIEW= 0,
-	ACTMENU_VIEW_AUTOUPDATE,
-	ACTMENU_VIEW_PLAY3D,
-	ACTMENU_VIEW_PLAYALL,
-	ACTMENU_VIEW_ALL,
-	ACTMENU_VIEW_MAXIMIZE,
-	ACTMENU_VIEW_LOCK,
-	ACTMENU_VIEW_SLIDERS,
-	ACTMENU_VIEW_NEXTMARKER,
-	ACTMENU_VIEW_PREVMARKER,
-	ACTMENU_VIEW_NEXTKEYFRAME,
-	ACTMENU_VIEW_PREVKEYFRAME,
-	ACTMENU_VIEW_TIME,
-	ACTMENU_VIEW_NOHIDE,
-	ACTMENU_VIEW_FRANUM,
-	ACTMENU_VIEW_TRANSDELDUPS,
-	ACTMENU_VIEW_HORIZOPTIMISE,
-	ACTMENU_VIEW_GCOLORS,
-	ACTMENU_VIEW_PREVRANGESET,
-	ACTMENU_VIEW_PREVRANGECLEAR,
-	ACTMENU_VIEW_PREVRANGEAUTO
-};
-
-enum {
-	ACTMENU_SEL_BORDER = 0,
-	ACTMENU_SEL_BORDERC,
-	ACTMENU_SEL_BORDERM,
-	ACTMENU_SEL_ALL_KEYS,
-	ACTMENU_SEL_ALL_CHAN,
-	ACTMENU_SEL_ALL_MARKERS,
-	ACTMENU_SEL_INVERSE_KEYS,
-	ACTMENU_SEL_INVERSE_MARKERS,
-	ACTMENU_SEL_INVERSE_CHANNELS,
-	ACTMENU_SEL_LEFTKEYS,
-	ACTMENU_SEL_RIGHTKEYS
-};
-
-enum {
-	ACTMENU_SEL_COLUMN_KEYS	= 1,
-	ACTMENU_SEL_COLUMN_CFRA,
-	ACTMENU_SEL_COLUMN_MARKERSCOLUMN,
-	ACTMENU_SEL_COLUMN_MARKERSBETWEEN 
-};
-
-enum {
-	ACTMENU_CHANNELS_OPENLEVELS = 0,
-	ACTMENU_CHANNELS_CLOSELEVELS,
-	ACTMENU_CHANNELS_EXPANDALL,
-	ACTMENU_CHANNELS_SHOWACHANS,
-	ACTMENU_CHANNELS_DELETE
-};
-
-enum {
-	ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_UP	= 0,
-	ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_DOWN,
-	ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_TOP,
-	ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_BOTTOM
-};
-
-enum {
-	ACTMENU_CHANNELS_GROUP_ADD_TOACTIVE	= 0,
-	ACTMENU_CHANNELS_GROUP_ADD_TONEW,
-	ACTMENU_CHANNELS_GROUP_REMOVE,
-	ACTMENU_CHANNELS_GROUP_SYNCPOSE
-};
-
-enum {
-	ACTMENU_CHANNELS_SETTINGS_TOGGLE = 0,
-	ACTMENU_CHANNELS_SETTINGS_ENABLE,
-	ACTMENU_CHANNELS_SETTINGS_DISABLE,
-};
-
-enum {
-	ACTMENU_KEY_DUPLICATE = 0,
-	ACTMENU_KEY_DELETE,
-	ACTMENU_KEY_CLEAN,
-	ACTMENU_KEY_SAMPLEKEYS,
-	ACTMENU_KEY_INSERTKEY
-};
-
-enum {
-	ACTMENU_KEY_TRANSFORM_MOVE  = 0,
-	ACTMENU_KEY_TRANSFORM_SCALE,
-	ACTMENU_KEY_TRANSFORM_SLIDE,
-	ACTMENU_KEY_TRANSFORM_EXTEND
-};
-
-enum {
-	ACTMENU_KEY_HANDLE_AUTO = 0,
-	ACTMENU_KEY_HANDLE_ALIGN,
-	ACTMENU_KEY_HANDLE_FREE,
-	ACTMENU_KEY_HANDLE_VECTOR
-};
-
 enum {
-	ACTMENU_KEY_INTERP_CONST = 0,
-	ACTMENU_KEY_INTERP_LINEAR,
-	ACTMENU_KEY_INTERP_BEZIER
-};
+	B_REDR= 0,
+} eActHeader_Events;
 
-enum {
-	ACTMENU_KEY_EXTEND_CONST = 0,
-	ACTMENU_KEY_EXTEND_EXTRAPOLATION,
-	ACTMENU_KEY_EXTEND_CYCLIC,
-	ACTMENU_KEY_EXTEND_CYCLICEXTRAPOLATION
-};
-
-enum {
-	ACTMENU_KEY_SNAP_NEARFRAME = 1,
-	ACTMENU_KEY_SNAP_CURFRAME,
-	ACTMENU_KEY_SNAP_NEARMARK,
-	ACTMENU_KEY_SNAP_NEARTIME,
-	ACTMENU_KEY_SNAP_CFRA2KEY,
-};
-
-enum {
-	ACTMENU_KEY_MIRROR_CURFRAME = 1,
-	ACTMENU_KEY_MIRROR_YAXIS,
-	ACTMENU_KEY_MIRROR_XAXIS,
-	ACTMENU_KEY_MIRROR_MARKER
-};
-
-enum {
-	ACTMENU_MARKERS_ADD = 0,
-	ACTMENU_MARKERS_DUPLICATE,
-	ACTMENU_MARKERS_DELETE,
-	ACTMENU_MARKERS_NAME,
-	ACTMENU_MARKERS_MOVE,
-	ACTMENU_MARKERS_LOCALADD,
-	ACTMENU_MARKERS_LOCALRENAME,
-	ACTMENU_MARKERS_LOCALDELETE,
-	ACTMENU_MARKERS_LOCALMOVE
-};
-
-/* ------------------------------- */
-/* macros for easier state testing (only for use here) */
-
-/* test if active action editor is showing any markers */
-#if 0
-	#define SACTION_HASMARKERS \
-		((saction->action && saction->action->markers.first) \
-		 || (scene->markers.first))
-#endif
-
-/* need to find out how to get scene from context */
-#define SACTION_HASMARKERS (saction->action && saction->action->markers.first)
-
-/* ------------------------------- */
-
-/* *************************************************************** */
-/* menus */
-
-/* Key menu ---------------------------  */
-
-static void do_keymenu_transformmenu(bContext *C, void *arg, int event)
-{
-	switch (event)
-	{
-		case ACTMENU_KEY_TRANSFORM_MOVE:
-			//transform_action_keys('g', 0);
-			break;
-		case ACTMENU_KEY_TRANSFORM_SCALE:
-			//transform_action_keys('s', 0);
-			break;
-		case ACTMENU_KEY_TRANSFORM_SLIDE:
-			//transform_action_keys('t', 0);
-			break;
-		case ACTMENU_KEY_TRANSFORM_EXTEND:
-			//transform_action_keys('e', 0);
-			break;
-	}
-}
+/* ********************************************************* */
+/* Menu Defines... */
 
-static uiBlock *action_keymenu_transformmenu(bContext *C, ARegion *ar, void *arg_unused)
+static void act_viewmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_keymenu_transformmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_keymenu_transformmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Grab/Move|G", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,  
-					 ACTMENU_KEY_TRANSFORM_MOVE, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Grab/Extend from Frame|E", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_TRANSFORM_EXTEND, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Scale|S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_TRANSFORM_SCALE, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Time Slide|T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_TRANSFORM_SLIDE, "");
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
+	bScreen *sc= CTX_wm_screen(C);
+	ScrArea *sa= CTX_wm_area(C);
+	SpaceAction *sact= (SpaceAction*)CTX_wm_space_data(C);
+	PointerRNA spaceptr;
 	
-	return block;
-}
-
-static void do_keymenu_snapmenu(bContext *C, void *arg, int event)
-{
-	switch(event)
-	{
-		case ACTMENU_KEY_SNAP_NEARFRAME:
-		case ACTMENU_KEY_SNAP_CURFRAME:
-		case ACTMENU_KEY_SNAP_NEARMARK:
-		case ACTMENU_KEY_SNAP_NEARTIME:
-			//snap_action_keys(event);
-			break;
-			
-		case ACTMENU_KEY_SNAP_CFRA2KEY:
-			//snap_cfra_action();
-			break;
-	}
-}
-
-static uiBlock *action_keymenu_snapmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-
+	/* retrieve state */
+	RNA_pointer_create(&sc->id, &RNA_SpaceDopeSheetEditor, sact, &spaceptr);
 	
-	block= uiBeginBlock(C, ar, "action_keymenu_snapmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_keymenu_snapmenu, NULL);
-
-	if (saction->flag & SACTION_DRAWTIME) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Key -> Nearest Second|Shift S, 1", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_KEY_SNAP_NEARTIME, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Key -> Current Time|Shift S, 2", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_KEY_SNAP_CURFRAME, "");
-
-	}
-	else {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Key -> Nearest Frame|Shift S, 1", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_KEY_SNAP_NEARFRAME, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Key -> Current Frame|Shift S, 2", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_KEY_SNAP_CURFRAME, "");
-	}
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Key -> Nearest Marker|Shift S, 3", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_SNAP_NEARMARK, "");
-					 
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-			 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Current Frame -> Key|Ctrl Shift S", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_SNAP_NEARMARK, "");
+	/* create menu */
+	//uiItemO(layout, NULL, ICON_MENU_PANEL, "ACT_OT_properties");
 	
-	uiBlockSetDirection(block, UI_RIGHT);
+	//uiItemS(layout);
 	
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_cframe_indicator", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "show_sliders", 0, 0, 0);
+	uiItemR(layout, NULL, 0, &spaceptr, "automerge_keyframes", 0, 0, 0);
 	
-	return block;
-}
-
-static void do_keymenu_mirrormenu(bContext *C, void *arg, int event)
-{
-	switch(event)
-	{
-		case ACTMENU_KEY_MIRROR_CURFRAME:
-		case ACTMENU_KEY_MIRROR_YAXIS:
-			//mirror_action_keys(event);
-			break;
-	}
-
-}
-
-static uiBlock *action_keymenu_mirrormenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
+	if (sact->flag & SACTION_DRAWTIME)
+		uiItemO(layout, "Show Frames", 0, "ANIM_OT_time_toggle");
+	else
+		uiItemO(layout, "Show Seconds", 0, "ANIM_OT_time_toggle");
 	
-	block= uiBeginBlock(C, ar, "action_keymenu_mirrormenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_keymenu_mirrormenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Current Frame|Shift M, 1", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_MIRROR_CURFRAME, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Vertical Axis|Shift M, 2", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_MIRROR_YAXIS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Horizontal Axis|Shift M, 3", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_MIRROR_XAXIS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Selected Marker|Shift M, 4", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_MIRROR_MARKER, "");
+	uiItemS(layout);
 	
-	uiBlockSetDirection(block, UI_RIGHT);
+	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_set");
+	uiItemO(layout, NULL, 0, "ANIM_OT_previewrange_clear");
 	
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
+	uiItemO(layout, NULL, 0, "ACT_OT_previewrange_set");
 	
-	return block;
-}
-
-static void do_keymenu_handlemenu(bContext *C, void *arg, int event)
-{
-	switch (event) {
-		case ACTMENU_KEY_HANDLE_AUTO:
-			//sethandles_action_keys(HD_AUTO);
-			break;
-
-		case ACTMENU_KEY_HANDLE_ALIGN:
-		case ACTMENU_KEY_HANDLE_FREE:
-			/* OK, this is kinda dumb, need to fix the
-			 * toggle crap in sethandles_ipo_keys() 
-			 */
-			//sethandles_action_keys(HD_ALIGN);
-			break;
-
-		case ACTMENU_KEY_HANDLE_VECTOR:
-			//sethandles_action_keys(HD_VECT);	
-			break;
-	}
-}
-
-static uiBlock *action_keymenu_handlemenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
+	uiItemS(layout);
 	
-	block= uiBeginBlock(C, ar, "action_keymenu_handlemenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_keymenu_handlemenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Auto|Shift H", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_HANDLE_AUTO, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Aligned|H", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_HANDLE_ALIGN, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Free|H", 0, yco-=20, menuwidth, 
-					 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_HANDLE_FREE, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Vector|V", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_HANDLE_VECTOR, "");
+	uiItemO(layout, NULL, 0, "ACT_OT_frame_jump");
 	
-	uiBlockSetDirection(block, UI_RIGHT);
+	uiItemO(layout, NULL, 0, "ACT_OT_view_all");
 	
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-static void do_keymenu_extendmenu(bContext *C, void *arg, int event)
-{
-	switch(event)
-	{
-		case ACTMENU_KEY_EXTEND_CONST:
-			//action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_CONSTANT);
-			break;
-		case ACTMENU_KEY_EXTEND_EXTRAPOLATION:
-			//action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_EXTRAPOLATION);
-			break;
-		case ACTMENU_KEY_EXTEND_CYCLIC:
-			//action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_CYCLIC);
-			break;
-		case ACTMENU_KEY_EXTEND_CYCLICEXTRAPOLATION:
-			//action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_CYCLICEXTRAPOLATION);
-			break;
-	}
+	if (sa->full) 
+		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Tile Window", Ctrl UpArrow
+	else 
+		uiItemO(layout, NULL, 0, "SCREEN_OT_screen_full_area"); // "Maximize Window", Ctrl DownArrow
 }
 
-static uiBlock *action_keymenu_extendmenu(bContext *C, ARegion *ar, void *arg_unused)
+static void act_selectmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
+	uiItemO(layout, NULL, 0, "ACT_OT_select_all_toggle");
+	uiItemBooleanO(layout, "Invert All", 0, "ACT_OT_select_all_toggle", "invert", 1);
 	
-	block= uiBeginBlock(C, ar, "action_keymenu_extendmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_keymenu_extendmenu, NULL);
+	uiItemS(layout);
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Constant", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_EXTEND_CONST, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Extrapolation", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_EXTEND_EXTRAPOLATION, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Cyclic", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_EXTEND_CYCLIC, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Cyclic Extrapolation", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_EXTEND_CYCLICEXTRAPOLATION, "");
+	uiItemO(layout, NULL, 0, "ACT_OT_select_border");
+	uiItemBooleanO(layout, "Border Axis Range", 0, "ACT_OT_select_border", "axis_range", 1);
 	
-	uiBlockSetDirection(block, UI_RIGHT);
+	uiItemS(layout);
 	
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
+	uiItemEnumO(layout, "Columns on Selected Keys", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_KEYS);
+	uiItemEnumO(layout, "Column on Current Frame", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_CFRA);
 	
-	return block;
+	uiItemEnumO(layout, "Columns on Selected Markers", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN);
+	uiItemEnumO(layout, "Between Selected Markers", 0, "ACT_OT_select_column", "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN);
 }
 
-static void do_keymenu_intpolmenu(bContext *C, void *arg, int event)
+static void act_channelmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	switch(event)
-	{
-		case ACTMENU_KEY_INTERP_CONST:
-			//action_set_ipo_flags(SET_IPO_MENU, SET_IPO_CONSTANT);
-			break;
-		case ACTMENU_KEY_INTERP_LINEAR:
-			//action_set_ipo_flags(SET_IPO_MENU, SET_IPO_LINEAR);
-			break;
-		case ACTMENU_KEY_INTERP_BEZIER:
-			//action_set_ipo_flags(SET_IPO_MENU, SET_IPO_BEZIER);
-			break;
-	}
-}
-
-static uiBlock *action_keymenu_intpolmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
+	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_toggle");
+	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_enable");
+	uiItemO(layout, NULL, 0, "ANIM_OT_channels_setting_disable");
 	
-	block= uiBeginBlock(C, ar, "action_keymenu_intpolmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_keymenu_intpolmenu, NULL);
+	uiItemS(layout);
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Constant|Shift T, 1", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_INTERP_CONST, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Linear|Shift T, 2", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_INTERP_LINEAR, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Bezier|Shift T, 3", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_INTERP_BEZIER, "");
+	uiItemO(layout, NULL, 0, "ANIM_OT_channels_editable_toggle");
 	
-	uiBlockSetDirection(block, UI_RIGHT);
+	uiItemS(layout);
 	
-	uiTextBoundsBlock(block, 60);
-	uiEndBlock(C, block);
-	
-	return block;
+	uiItemO(layout, NULL, 0, "ANIM_OT_channels_expand");
+	uiItemO(layout, NULL, 0, "ANIM_OT_channels_collapse");
 }
 
-static void do_action_keymenu(bContext *C, void *arg, int event)
+static void act_gplayermenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	bAction	*act;
-	//Key *key;
-	
-	if (!saction) return;
-
-	act = saction->action;
-	//key = get_action_mesh_key();
-
-	switch(event)
-	{
-		case ACTMENU_KEY_DUPLICATE:
-			//duplicate_action_keys();
- 			break;
-		case ACTMENU_KEY_DELETE:
-			//delete_action_keys();
-			break;
-		case ACTMENU_KEY_CLEAN:
-			//clean_action();
-			break;
-		case ACTMENU_KEY_SAMPLEKEYS:
-			//sample_action_keys();
-			break;
-		case ACTMENU_KEY_INSERTKEY:
-			//insertkey_action();
-			break;
-	}
+	//uiItemMenuF(layout, "Transform", 0, nla_edit_transformmenu);
+	//uiItemS(layout);
+	//uiItemO(layout, NULL, 0, "NLAEDIT_OT_duplicate");
 }
 
-static uiBlock *action_keymenu(bContext *C, ARegion *ar, void *arg_unused)
+static void act_edit_transformmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_keymenu", UI_EMBOSSP);
-
-
-	uiBlockSetButmFunc(block, do_action_keymenu, NULL);
-	
-	uiDefIconTextBlockBut(block, action_keymenu_transformmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 20, "");
-	
-	uiDefIconTextBlockBut(block, action_keymenu_snapmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 20, "");
-	
-	uiDefIconTextBlockBut(block, action_keymenu_mirrormenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, 120, 20, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					"Insert Key|I", 0, yco-=20, 
-					menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					ACTMENU_KEY_INSERTKEY, "");
-
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					"Duplicate|Shift D", 0, yco-=20, 
-					menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					ACTMENU_KEY_DUPLICATE, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					"Delete|X", 0, yco-=20, 
-					menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					ACTMENU_KEY_DELETE, "");
-
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Clean Action|O", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_CLEAN, "");
-					 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Sample Keys|Alt O", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_KEY_SAMPLEKEYS, "");
-
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-
-	uiDefIconTextBlockBut(block, action_keymenu_handlemenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Handle Type", 0, yco-=20, 120, 20, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-
-	uiDefIconTextBlockBut(block, action_keymenu_extendmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Extend Mode", 0, yco-=20, 120, 20, "");
-	uiDefIconTextBlockBut(block, action_keymenu_intpolmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Interpolation Mode", 0, yco-=20, 120, 20, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
+	uiItemEnumO(layout, "Grab/Move", 0, "TFM_OT_transform", "mode", TFM_TIME_TRANSLATE);
+	uiItemEnumO(layout, "Extend", 0, "TFM_OT_transform", "mode", TFM_TIME_EXTEND);
+	uiItemEnumO(layout, "Scale", 0, "TFM_OT_transform", "mode", TFM_TIME_SCALE);
 }
 
-/* Frame menu ---------------------------  */
-
-
-// framemenu uses functions from keymenu
-static uiBlock *action_framemenu(bContext *C, ARegion *ar, void *arg_unused)
+static void act_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_framemenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_action_keymenu, NULL);
-	
-	uiDefIconTextBlockBut(block, action_keymenu_transformmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 20, "");
-	
-	uiDefIconTextBlockBut(block, action_keymenu_snapmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 20, "");
-	
-	uiDefIconTextBlockBut(block, action_keymenu_mirrormenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, 120, 20, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					"Duplicate|Shift D", 0, yco-=20, 
-					menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					ACTMENU_KEY_DUPLICATE, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					"Delete|X", 0, yco-=20, 
-					menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					ACTMENU_KEY_DELETE, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
+	uiItemEnumO(layout, "To Current Frame", 0, "ACT_OT_snap", "mode", ACTKEYS_SNAP_CFRA);
+	uiItemEnumO(layout, "To Nearest Frame", 0, "ACT_OT_snap", "mode", ACTKEYS_SNAP_NEAREST_FRAME);
+	uiItemEnumO(layout, "To Nearest Second", 0, "ACT_OT_snap", "mode", ACTKEYS_SNAP_NEAREST_SECOND);
+	uiItemEnumO(layout, "To Nearest Marker", 0, "ACT_OT_snap", "mode", ACTKEYS_SNAP_NEAREST_MARKER);
 }
 
-/* Marker menu ---------------------------  */
-
-static void do_markermenu(bContext *C, void *arg, int event)
+static void act_edit_mirrormenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	switch(event)
-	{
-		case ACTMENU_MARKERS_ADD:
-			//add_marker(CFRA);
-			break;
-		case ACTMENU_MARKERS_DUPLICATE:
-			//duplicate_marker();
-			break;
-		case ACTMENU_MARKERS_DELETE:
-			//remove_marker();
-			break;
-		case ACTMENU_MARKERS_NAME:
-			//rename_marker();
-			break;
-		case ACTMENU_MARKERS_MOVE:
-			//transform_markers('g', 0);
-			break;
-		case ACTMENU_MARKERS_LOCALADD:
-			//action_add_localmarker(G.saction->action, CFRA);
-			break;
-		case ACTMENU_MARKERS_LOCALDELETE:
-			//action_remove_localmarkers(G.saction->action);
-			break;
-		case ACTMENU_MARKERS_LOCALRENAME:
-			//action_rename_localmarker(G.saction->action);
-			break;
-		case ACTMENU_MARKERS_LOCALMOVE:
-			/*G.saction->flag |= SACTION_POSEMARKERS_MOVE;
-			transform_markers('g', 0);
-			G.saction->flag &= ~SACTION_POSEMARKERS_MOVE;*/
-			break;
-	}
+	uiItemEnumO(layout, "Over Current Frame", 0, "ACT_OT_mirror", "mode", ACTKEYS_MIRROR_CFRA);
+	uiItemEnumO(layout, "Over Vertical Axis", 0, "ACT_OT_mirror", "mode", ACTKEYS_MIRROR_YAXIS);
+	uiItemEnumO(layout, "Over Horizontal Axis", 0, "ACT_OT_mirror", "mode", ACTKEYS_MIRROR_XAXIS);
+	uiItemEnumO(layout, "Over Selected Marker", 0, "ACT_OT_mirror", "mode", ACTKEYS_MIRROR_MARKER);
 }
 
-static uiBlock *action_markermenu(bContext *C, ARegion *ar, void *arg_unused)
+static void act_edit_handlesmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_markermenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_markermenu, NULL);
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Marker|M", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_ADD, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate Marker|Ctrl Shift D", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_DUPLICATE, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Marker|Shift X", 0, yco-=20,
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_DELETE, "");
-					
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "(Re)Name Marker|Ctrl M", 0, yco-=20,
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_NAME, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Marker|Ctrl G", 0, yco-=20,
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_MOVE, "");
-		
-	if (saction->mode == SACTCONT_ACTION) {
-		uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-		
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Pose Marker|Shift L", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALADD, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Rename Pose Marker|Ctrl Shift L", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALRENAME, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Pose Marker|Alt L", 0, yco-=20,
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALDELETE, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Pose Marker|Ctrl L", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALMOVE, "");
-	}
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type_set", "type", HD_FREE);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type_set", "type", HD_AUTO);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type_set", "type", HD_VECT);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type_set", "type", HD_ALIGN);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_handle_type_set", "type", HD_AUTO_ANIM); // xxx?
 }
 
-
-/* Channel menu ---------------------------  */
-
-static void do_channelmenu_posmenu(bContext *C, void *arg, int event)
+static void act_edit_ipomenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	switch(event)
-	{
-		case ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_DOWN:
-			//rearrange_action_channels(REARRANGE_ACTCHAN_DOWN);
-			break;
-		case ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_UP:
-			//rearrange_action_channels(REARRANGE_ACTCHAN_UP);
-			break;
-		case ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_TOP:
-			//rearrange_action_channels(REARRANGE_ACTCHAN_TOP);
-			break;
-		case ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_BOTTOM:
-			//rearrange_action_channels(REARRANGE_ACTCHAN_BOTTOM);
-			break;
-	}
-}
-
-static uiBlock *action_channelmenu_posmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-
-	block= uiBeginBlock(C, ar, "action_channelmenu_posmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_channelmenu_posmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Move Up|Shift Page Up", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_UP, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Move Down|Shift Page Down", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_DOWN, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Move to Top|Ctrl Shift Page Up", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_TOP, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Move to Bottom|Ctrl Shift Page Down", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_CHANPOS_MOVE_CHANNEL_BOTTOM, "");
-
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-
-	return block;
-}
-
-static void do_channelmenu_groupmenu(bContext *C, void *arg, int event)
-{
-	switch(event)
-	{
-		case ACTMENU_CHANNELS_GROUP_ADD_TOACTIVE:
-			//action_groups_group(0);
-			break;
-		case ACTMENU_CHANNELS_GROUP_ADD_TONEW:
-			//action_groups_group(1);
-			break;
-		case ACTMENU_CHANNELS_GROUP_REMOVE:
-			//action_groups_ungroup();
-			break;
-		case ACTMENU_CHANNELS_GROUP_SYNCPOSE: /* Syncronise Pose-data and Action-data */
-			//sync_pchan2achan_grouping();
-			break;
-	}
-}
-
-static uiBlock *action_channelmenu_groupmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-
-	block= uiBeginBlock(C, ar, "action_channelmenu_groupmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_channelmenu_groupmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Add to Active Group|Shift G", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_GROUP_ADD_TOACTIVE, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Add to New Group|Ctrl Shift G", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_GROUP_ADD_TONEW, "");
-		
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Remove From Group|Alt G", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_GROUP_REMOVE, "");
-					 
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Synchronise with Armature", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_GROUP_SYNCPOSE, "");
-
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-
-	return block;
-}
-
-static void do_channelmenu_settingsmenu(bContext *C, void *arg, int event)
-{
-	//setflag_action_channels(event);
-}
-
-static uiBlock *action_channelmenu_settingsmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-
-	block= uiBeginBlock(C, ar, "action_channelmenu_settingsmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_channelmenu_settingsmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Toggle a Setting|Shift W", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_SETTINGS_TOGGLE, "");
-					 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Enable a Setting|Ctrl Shift W", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_SETTINGS_ENABLE, "");
-					
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Disable a Setting|Alt W", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_CHANNELS_SETTINGS_DISABLE, "");
-
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-
-	return block;
-}
-
-static void do_channelmenu(bContext *C, void *arg, int event)
-{
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	
-	if (saction == NULL) return;
-	
-	switch(event)
-	{
-		case ACTMENU_CHANNELS_OPENLEVELS: /* Unfold selected channels one step */
-			//openclose_level_action(1);
-			break;
-		case ACTMENU_CHANNELS_CLOSELEVELS: /* Fold selected channels one step */
-			//openclose_level_action(-1);
-			break;
-		case ACTMENU_CHANNELS_EXPANDALL: /* Expands all channels */
-			//expand_all_action();
-			break;
-		case ACTMENU_CHANNELS_SHOWACHANS: /* Unfold groups that are hiding selected achans */
-			//expand_obscuregroups_action();
-			break;
-		case ACTMENU_CHANNELS_DELETE: /* Deletes selected channels */
-			//delete_action_channels();
-			break;
-	}
-}
-
-static uiBlock *action_channelmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_channelmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_channelmenu, NULL);
-		
-	uiDefIconTextBlockBut(block, action_channelmenu_groupmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Grouping", 0, yco-=20, 120, 20, "");	 
-						  
-	uiDefIconTextBlockBut(block, action_channelmenu_posmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Ordering", 0, yco-=20, 120, 20, "");
-	
-	uiDefIconTextBlockBut(block, action_channelmenu_settingsmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Settings", 0, yco-=20, 120, 20, "");	
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-			"Delete|X", 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_DELETE, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-		
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-			"Toggle Show Hierachy|~", 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_EXPANDALL, "");
-			
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-			"Show Group-Hidden Channels|Shift ~", 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_SHOWACHANS, "");
-			
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-			"Expand One Level|Ctrl NumPad+", 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_OPENLEVELS, "");
-			
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-			"Collapse One Level|Ctrl NumPad-", 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_CLOSELEVELS, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-/* Grease Pencil ---------------------------  */
-
-/* Uses channelmenu functions */
-static uiBlock *action_gplayermenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_gplayermenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_channelmenu, NULL);
-		
-	uiDefIconTextBlockBut(block, action_channelmenu_settingsmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, 
-						  "Settings", 0, yco-=20, 120, 20, "");	
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-			"Delete|X", 0, yco-=20,
-			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_DELETE, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
-}
-
-/* Select menu ---------------------------  */
-
-static void do_selectmenu_columnmenu(bContext *C, void *arg, int event)
-{
-	switch (event) {
-		case ACTMENU_SEL_COLUMN_MARKERSBETWEEN:
-			//markers_selectkeys_between();
-			break;
-		case ACTMENU_SEL_COLUMN_KEYS:
-			//column_select_action_keys(1);
-			break;
-		case ACTMENU_SEL_COLUMN_MARKERSCOLUMN:
-			//column_select_action_keys(2);
-			break;
-		case ACTMENU_SEL_COLUMN_CFRA:
-			//column_select_action_keys(3);
-			break;
-	}
-}
-
-static uiBlock *action_selectmenu_columnmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-
-	block= uiBeginBlock(C, ar, "action_selectmenu_columnmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_selectmenu_columnmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "On Selected Keys|K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,  
-					 ACTMENU_SEL_COLUMN_KEYS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "On Current Frame|Ctrl K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,  
-					 ACTMENU_SEL_COLUMN_CFRA, "");
-	
-	if (SACTION_HASMARKERS) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "On Selected Markers|Shift K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_COLUMN_MARKERSCOLUMN, "");
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Between Selected Markers|Alt K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_COLUMN_MARKERSBETWEEN, "");
-	}
-	
-	uiBlockSetDirection(block, UI_RIGHT);
-	uiTextBoundsBlock(block, 60);
-
-	return block;
-}
-
-static void do_selectmenu(bContext *C, void *arg, int event)
-{
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	//Key *key;
-	
-	if (saction == NULL) return;
-
-	//key = get_action_mesh_key();
-	
-	switch(event)
-	{
-		case ACTMENU_SEL_BORDER: /* Border Select */
-			//borderselect_action();
-			break;
-			
-		case ACTMENU_SEL_BORDERC: /* Border Select */
-			//borderselect_actionchannels();
-			break;
-			
-		case ACTMENU_SEL_BORDERM: /* Border Select */
-			//borderselect_markers();
-			break;
-			
-		case ACTMENU_SEL_ALL_KEYS: /* Select/Deselect All Keys */
-			/*deselect_action_keys(1, 1);
-			BIF_undo_push("(De)Select Keys");
-			allqueue(REDRAWACTION, 0);
-			allqueue(REDRAWNLA, 0);
-			allqueue(REDRAWIPO, 0);*/
-			break;
-			
-		case ACTMENU_SEL_ALL_CHAN: /* Select/Deselect All Channels */
-			/*deselect_action_channels(1);
-			BIF_undo_push("(De)Select Action Channels");
-			allqueue(REDRAWVIEW3D, 0);
-			allqueue(REDRAWACTION, 0);
-			allqueue(REDRAWNLA, 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);
-			BIF_undo_push("Inverse Keys");
-			allqueue(REDRAWACTION, 0);
-			allqueue(REDRAWNLA, 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;
-			
-		case ACTMENU_SEL_LEFTKEYS:
-			//selectkeys_leftright(1, SELECT_REPLACE);
-			break;
-			
-		case ACTMENU_SEL_RIGHTKEYS:
-			//selectkeys_leftright(0, SELECT_REPLACE);
-			break;
-	}
-}
-
-static uiBlock *action_selectmenu(bContext *C, ARegion *ar, void *arg_unused)
-{
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
-	
-	block= uiBeginBlock(C, ar, "action_selectmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_selectmenu, NULL);
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Border Select Keys|B", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_BORDER, "");
-	if (SACTION_HASMARKERS) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Border Select Markers|Ctrl B", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_BORDERM, "");
-	}
-	if (saction->mode != SACTCONT_SHAPEKEY) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Border Select Channels|B", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_BORDERC, "");
-	}
-					 
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-			 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Select/Deselect All Keys|A", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_ALL_KEYS, "");
-	if (SACTION_HASMARKERS) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Select/Deselect All Markers|Ctrl A", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_ALL_MARKERS, "");
-	}
-	if (saction->mode != SACTCONT_SHAPEKEY) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Select/Deselect All Channels|A", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_ALL_CHAN, "");
-	}
-					 
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Inverse Keys|Ctrl I", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_INVERSE_KEYS, "");
-	if (SACTION_HASMARKERS) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						 "Inverse Markers|Ctrl Shift I", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_SEL_INVERSE_MARKERS, "");
-	}
-	if (saction->mode != SACTCONT_SHAPEKEY) {
-		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, "");
-			 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Back In Time|Alt RMB", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_LEFTKEYS, "");
-								 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Ahead In Time|Alt RMB", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_RIGHTKEYS, "");		 
-			 
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-			 
-	uiDefIconTextBlockBut(block, action_selectmenu_columnmenu, 
-						  NULL, ICON_RIGHTARROW_THIN, "Column Select Keys", 0, yco-=20, 120, 20, "");
-	
-	if(curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
-	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
-	
-	return block;
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_interpolation_type_set", "type", BEZT_IPO_CONST);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_interpolation_type_set", "type", BEZT_IPO_LIN);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_interpolation_type_set", "type", BEZT_IPO_BEZ);
 }
 
-/* View menu ---------------------------  */
-
-static void do_viewmenu(bContext *C, void *arg, int event)
+static void act_edit_expomenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	switch(event) {
-		case ACTMENU_VIEW_CENTERVIEW: /* Center View to Current Frame */
-			//center_currframe();
-			break;
-		case ACTMENU_VIEW_AUTOUPDATE: /* Update Automatically */
-			/*if (BTST(G.saction->lock, 0)) 
-				G.saction->lock = BCLR(G.saction->lock, 0);
-			else 
-				G.saction->lock = BSET(G.saction->lock, 0);*/
-			break;
-		case ACTMENU_VIEW_PLAY3D: /* Play Back Animation */
-			//play_anim(0);
-			break;
-		case ACTMENU_VIEW_PLAYALL: /* Play Back Animation in All */
-			//play_anim(1);
-			break;	
-		case ACTMENU_VIEW_ALL: /* View All */
-			//do_action_buttons(B_ACTHOME);
-			break;
-		case ACTMENU_VIEW_LOCK:
-			/*G.v2d->flag ^= V2D_VIEWLOCK;
-			if (G.v2d->flag & V2D_VIEWLOCK)
-				view2d_do_locks(curarea, 0);*/
-			break;
-		case ACTMENU_VIEW_SLIDERS:	 /* Show sliders (when applicable) */
-			//G.saction->flag ^= SACTION_SLIDERS;
-			break;
-		case ACTMENU_VIEW_MAXIMIZE: /* Maximize Window */
-			/* using event B_FULL */
-			break;
-		case ACTMENU_VIEW_NEXTMARKER: /* Jump to next marker */
-			//nextprev_marker(1);
-			break;
-		case ACTMENU_VIEW_PREVMARKER: /* Jump to previous marker */
-			//nextprev_marker(-1);
-			break;
-		case ACTMENU_VIEW_TIME: /* switch between frames and seconds display */
-			//G.saction->flag ^= SACTION_DRAWTIME;
-			break;
-		case ACTMENU_VIEW_NOHIDE: /* Show hidden channels */
-			//G.saction->flag ^= SACTION_NOHIDE;
-			break;
-		case ACTMENU_VIEW_NEXTKEYFRAME: /* Jump to next keyframe */
-			//nextprev_action_keyframe(1);
-			break;
-		case ACTMENU_VIEW_PREVKEYFRAME: /* Jump to previous keyframe */
-			//nextprev_action_keyframe(-1);
-			break;
-		case ACTMENU_VIEW_TRANSDELDUPS: /* Don't delete duplicate/overlapping keyframes after transform */
-			//G.saction->flag ^= SACTION_NOTRANSKEYCULL;
-			break;
-		case ACTMENU_VIEW_HORIZOPTIMISE: /* Include keyframes not in view (horizontally) when preparing to draw */
-			//G.saction->flag ^= SACTION_HORIZOPTIMISEON;
-			break;
-		case ACTMENU_VIEW_GCOLORS: /* Draw grouped-action channels using its group's color */
-			//G.saction->flag ^= SACTION_NODRAWGCOLORS;
-			break;
-		case ACTMENU_VIEW_PREVRANGESET: /* Set preview range */
-			//anim_previewrange_set();
-			break;
-		case ACTMENU_VIEW_PREVRANGECLEAR: /* Clear preview range */
-			//anim_previewrange_clear();
-			break;
-		case ACTMENU_VIEW_PREVRANGEAUTO: /* Auto preview-range length */
-			//action_previewrange_set(G.saction->action);
-			break;
-	}
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_extrapolation_type_set", "type", FCURVE_EXTRAPOLATE_CONSTANT);
+	uiItemEnumO(layout, NULL, 0, "ACT_OT_extrapolation_type_set", "type", FCURVE_EXTRAPOLATE_LINEAR);
 }
 
-static uiBlock *action_viewmenu(bContext *C, ARegion *ar, void *arg_unused)
+static void act_editmenu(bContext *C, uiLayout *layout, void *arg_unused)
 {
-	ScrArea *curarea= CTX_wm_area(C);
-	SpaceAction *saction= (SpaceAction*)CTX_wm_space_data(C);
-	View2D *v2d= UI_view2d_fromcontext_rwin(C);
-	uiBlock *block;
-	short yco= 0, menuwidth=120;
+	uiItemMenuF(layout, "Transform", 0, act_edit_transformmenu);
+	uiItemMenuF(layout, "Snap", 0, act_edit_snapmenu);
+	uiItemMenuF(layout, "Mirror", 0, act_edit_mirrormenu);
 	
-	block= uiBeginBlock(C, ar, "viewmenu", UI_EMBOSSP);
-	uiBlockSetButmFunc(block, do_viewmenu, NULL);
+	uiItemS(layout);
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Center View to Current Frame|C", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_CENTERVIEW, "");
-		
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-			 
-	if (saction->flag & SACTION_DRAWTIME) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						"Show Frames|Ctrl T", 0, yco-=20, 
-						menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						ACTMENU_VIEW_TIME, "");
-	}
-	else {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-						"Show Seconds|Ctrl T", 0, yco-=20, 
-						menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						ACTMENU_VIEW_TIME, "");
-	}
+	uiItemO(layout, NULL, 0, "ACT_OT_insert");
 	
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	uiItemS(layout);
 	
-	if (saction->mode == SACTCONT_GPENCIL) {
-			// this option may get removed in future
-		uiDefIconTextBut(block, BUTM, 1, (saction->flag & SACTION_HORIZOPTIMISEON)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-						 "Cull Out-of-View Keys (Time)|", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						 ACTMENU_VIEW_HORIZOPTIMISE, "");
-	}
-	else {
-		uiDefIconTextBut(block, BUTM, 1, (saction->flag & SACTION_SLIDERS)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-						 "Show Sliders|", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						 ACTMENU_VIEW_SLIDERS, "");
-						 
-		uiDefIconTextBut(block, BUTM, 1, (saction->flag & SACTION_NOHIDE)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-						 "Show Hidden Channels|", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						 ACTMENU_VIEW_NOHIDE, "");
-						 
-		uiDefIconTextBut(block, BUTM, 1, (saction->flag & SACTION_NODRAWGCOLORS)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
-						 "Use Group Colors|", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						 ACTMENU_VIEW_GCOLORS, "");
-						 
-			// this option may get removed in future
-		uiDefIconTextBut(block, BUTM, 1, (saction->flag & SACTION_HORIZOPTIMISEON)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-						 "Cull Out-of-View Keys (Time)|", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						 ACTMENU_VIEW_HORIZOPTIMISE, "");
-		
-		uiDefIconTextBut(block, BUTM, 1, (saction->flag & SACTION_NOTRANSKEYCULL)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
-						 "AutoMerge Keyframes|", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-						 ACTMENU_VIEW_TRANSDELDUPS, "");
-	}	
+	uiItemO(layout, NULL, 0, "ACT_OT_duplicate");
+	uiItemO(layout, NULL, 0, "ACT_OT_delete");
 	
-		
-	uiDefIconTextBut(block, BUTM, 1, (v2d->flag & V2D_VIEWSYNC_SCREEN_TIME)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Lock Time to Other Windows|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_LOCK, "");
-					 
-	/*uiDefIconTextBut(block, BUTM, 1, BTST(saction->lock, 0)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Update Automatically|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_AUTOUPDATE, "");*/
-
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-		
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-				"Jump To Next Marker|PageUp", 0, yco-=20,
-				menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_VIEW_NEXTMARKER, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-				"Jump To Prev Marker|PageDown", 0, yco-=20, 
-				menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_VIEW_PREVMARKER, "");
-				
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-				"Jump To Next Keyframe|Ctrl PageUp", 0, yco-=20,
-				menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_VIEW_NEXTKEYFRAME, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-				"Jump To Prev Keyframe|Ctrl PageDown", 0, yco-=20, 
-				menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_VIEW_PREVKEYFRAME, "");
-					 
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-			
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Play Back Animation|Alt A", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_PLAY3D, "");
-	//uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-	//				 "Play Back Animation in 3D View|Alt Shift A", 0, yco-=20,
-	//				 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-	//				 ACTMENU_VIEW_PLAYALL, "");
-	
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-		
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Set Preview Range|Ctrl P", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_PREVRANGESET, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Clear Preview Range|Alt P", 0, yco-=20,
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_PREVRANGECLEAR, "");
-		
-	if ((saction->mode == SACTCONT_ACTION) && (saction->action)) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Preview Range from Action Length|Ctrl Alt P", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_PREVRANGEAUTO, "");
-	}
-		
-	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
-			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	uiItemS(layout);
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "View All|Home", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_ALL, "");
+	uiItemMenuF(layout, "Handle Type", 0, act_edit_handlesmenu);
+	uiItemMenuF(layout, "Interpolation Mode", 0, act_edit_ipomenu);
+	uiItemMenuF(layout, "Extrapolation Mode", 0, act_edit_expomenu);
 	
-/*	if (!curarea->full) 
-		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, 
-						 "Maximize Window|Ctrl UpArrow", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_VIEW_MAXIMIZE, "");
-	else 
-		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, 
-						 "Tile Window|Ctrl DownArrow", 0, yco-=20, 
-						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-						 ACTMENU_VIEW_MAXIMIZE, "");
-*/
+	uiItemS(layout);
 	
-	if (curarea->headertype==HEADERTOP) {
-		uiBlockSetDirection(block, UI_DOWN);
-	}
-	else {
-		uiBlockSetDirection(block, UI_TOP);
-		uiBlockFlipOrder(block);
-	}
+	uiItemO(layout, NULL, 0, "ACT_OT_clean");
+	uiItemO(layout, NULL, 0, "ACT_OT_sample");
 	
-	uiTextBoundsBlock(block, 50);
-	uiEndBlock(C, block);
+	uiItemS(layout);
 	
-	return block;
+	uiItemO(layout, NULL, 0, "ACT_OT_copy");
+	uiItemO(layout, NULL, 0, "ACT_OT_paste");
 }
 
 /* ************************ header area region *********************** */
 
 static void do_action_buttons(bContext *C, void *arg, int event)
 {
-	switch(event) {
+	switch (event) {
 		case B_REDR:
 			ED_area_tag_redraw(CTX_wm_area(C));
 			break;
-			
-		case B_ACTCOPYKEYS:
-			WM_operator_name_call(C, "ACT_OT_keyframes_copy", WM_OP_EXEC_REGION_WIN, NULL);
-			break;
-		case B_ACTPASTEKEYS:
-			WM_operator_name_call(C, "ACT_OT_keyframes_paste", WM_OP_EXEC_REGION_WIN, NULL);
-			break;
 	}
 }
 
@@ -1622,45 +314,38 @@ void action_header_buttons(const bContext *C, ARegion *ar)
 	if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
 		
 		xmax= GetButStringLength("View");
-		uiDefPulldownBut(block, action_viewmenu, CTX_wm_area(C), 
-					  "View", xco, yco-2, xmax-3, 24, "");
+		uiDefMenuBut(block, act_viewmenu, NULL, "View", xco, yco, xmax-3, 20, "");
 		xco+= xmax;
 		
 		xmax= GetButStringLength("Select");
-		uiDefPulldownBut(block, action_selectmenu, CTX_wm_area(C), 
-					  "Select", xco, yco-2, xmax-3, 24, "");
+		uiDefMenuBut(block, act_selectmenu, NULL, "Select", xco, yco, xmax-3, 20, "");
 		xco+= xmax;
 		
 		if ( (saction->mode == SACTCONT_DOPESHEET) ||
 			 ((saction->action) && (saction->mode==SACTCONT_ACTION)) ) 
 		{
 			xmax= GetButStringLength("Channel");
-			uiDefPulldownBut(block, action_channelmenu, CTX_wm_area(C), 
-						  "Channel", xco, yco-2, xmax-3, 24, "");
+			uiDefMenuBut(block, act_channelmenu, NULL, "Channel", xco, yco, xmax-3, 20, "");
 			xco+= xmax;
 		}
 		else if (saction->mode==SACTCONT_GPENCIL) {
 			xmax= GetButStringLength("Channel");
-			uiDefPulldownBut(block, action_gplayermenu, CTX_wm_area(C), 
-						  "Channel", xco, yco-2, xmax-3, 24, "");
+			uiDefMenuBut(block, act_gplayermenu, NULL, "Channel", xco, yco, xmax-3, 20, "");
 			xco+= xmax;
 		}
 		
-		xmax= GetButStringLength("Marker");
-		uiDefPulldownBut(block, action_markermenu, CTX_wm_area(C), 
-					  "Marker", xco, yco-2, xmax-3, 24, "");
-		xco+= xmax;
+		//xmax= GetButStringLength("Marker");
+		//uiDefMenuBut(block, act_markermenu, NULL, "Marker", xco, yco, xmax-3, 20, "");
+		//xco+= xmax;
 		
 		if (saction->mode == SACTCONT_GPENCIL) {
-			xmax= GetButStringLength("Frame");
-			uiDefPulldownBut(block, action_framemenu, CTX_wm_area(C), 
-						  "Frame", xco, yco-2, xmax-3, 24, "");
-			xco+= xmax;
+			//xmax= GetButStringLength("Frame");
+			//uiDefMenuBut(block, act_selectmenu, NULL, "Frame", xco, yco, xmax-3, 20, "");
+			//xco+= xmax;
 		}
 		else {
 			xmax= GetButStringLength("Key");
-			uiDefPulldownBut(block, action_keymenu, CTX_wm_area(C), 
-						  "Key", xco, yco-2, xmax-3, 24, "");
+			uiDefMenuBut(block, act_editmenu, NULL, "Key", xco, yco, xmax-3, 20, "");
 			xco+= xmax;
 		}
 	}
@@ -1712,8 +397,8 @@ void action_header_buttons(const bContext *C, ARegion *ar)
 		
 		/* COPY PASTE */
 		uiBlockBeginAlign(block);
-		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYDOWN,	xco,yco,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
-		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEDOWN,	xco+=XIC,yco,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
+			uiDefIconButO(block, BUT, "ACT_OT_copy", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco,yco,XIC,YIC, "Copies the selected keyframes to the buffer.");
+			uiDefIconButO(block, BUT, "ACT_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_COPYDOWN, xco,yco,XIC,YIC, "Pastes the keyframes from the buffer into the selected channels.");
 		uiBlockEndAlign(block);
 		xco += (XIC + 8);
 		
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h
index b4d2528b3b4..377b25030e5 100644
--- a/source/blender/editors/space_action/action_intern.h
+++ b/source/blender/editors/space_action/action_intern.h
@@ -53,10 +53,10 @@ void action_header_buttons(const struct bContext *C, struct ARegion *ar);
 /* ***************************************** */
 /* action_select.c */
 
-void ACT_OT_keyframes_select_all_toggle(struct wmOperatorType *ot);
-void ACT_OT_keyframes_select_border(struct wmOperatorType *ot);
-void ACT_OT_keyframes_select_column(struct wmOperatorType *ot);
-void ACT_OT_keyframes_clickselect(struct wmOperatorType *ot);
+void ACT_OT_select_all_toggle(struct wmOperatorType *ot);
+void ACT_OT_select_border(struct wmOperatorType *ot);
+void ACT_OT_select_column(struct wmOperatorType *ot);
+void ACT_OT_clickselect(struct wmOperatorType *ot);
 
 /* defines for left-right select tool */
 enum {
@@ -80,22 +80,23 @@ enum {
 void ACT_OT_previewrange_set(struct wmOperatorType *ot);
 void ACT_OT_view_all(struct wmOperatorType *ot);
 
-void ACT_OT_keyframes_copy(struct wmOperatorType *ot);
-void ACT_OT_keyframes_paste(struct wmOperatorType *ot);
+void ACT_OT_copy(struct wmOperatorType *ot);
+void ACT_OT_paste(struct wmOperatorType *ot);
 
-void ACT_OT_keyframes_insert(struct wmOperatorType *ot);
-void ACT_OT_keyframes_duplicate(struct wmOperatorType *ot);
-void ACT_OT_keyframes_delete(struct wmOperatorType *ot);
-void ACT_OT_keyframes_clean(struct wmOperatorType *ot);
-void ACT_OT_keyframes_sample(struct wmOperatorType *ot);
+void ACT_OT_insert(struct wmOperatorType *ot);
+void ACT_OT_duplicate(struct wmOperatorType *ot);
+void ACT_OT_delete(struct wmOperatorType *ot);
+void ACT_OT_clean(struct wmOperatorType *ot);
+void ACT_OT_sample(struct wmOperatorType *ot);
 
-void ACT_OT_keyframes_handle_type_set(struct wmOperatorType *ot);
-void ACT_OT_keyframes_interpolation_type(struct wmOperatorType *ot);
-void ACT_OT_keyframes_extrapolation_type_set(struct wmOperatorType *ot);
+void ACT_OT_handle_type_set(struct wmOperatorType *ot);
+void ACT_OT_interpolation_type_set(struct wmOperatorType *ot);
+void ACT_OT_extrapolation_type_set(struct wmOperatorType *ot);
 
-void ACT_OT_keyframes_cfrasnap(struct wmOperatorType *ot);
-void ACT_OT_keyframes_snap(struct wmOperatorType *ot);
-void ACT_OT_keyframes_mirror(struct wmOperatorType *ot);
+void ACT_OT_frame_jump(struct wmOperatorType *ot);
+
+void ACT_OT_snap(struct wmOperatorType *ot);
+void ACT_OT_mirror(struct wmOperatorType *ot);
 
 /* defines for snap keyframes 
  * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h)
diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c
index 49a0befdbe2..1a677e9191d 100644
--- a/source/blender/editors/space_action/action_ops.c
+++ b/source/blender/editors/space_action/action_ops.c
@@ -63,25 +63,25 @@ void action_operatortypes(void)
 {
 	/* keyframes */
 		/* selection */
-	WM_operatortype_append(ACT_OT_keyframes_clickselect);
-	WM_operatortype_append(ACT_OT_keyframes_select_all_toggle);
-	WM_operatortype_append(ACT_OT_keyframes_select_border);
-	WM_operatortype_append(ACT_OT_keyframes_select_column);
+	WM_operatortype_append(ACT_OT_clickselect);
+	WM_operatortype_append(ACT_OT_select_all_toggle);
+	WM_operatortype_append(ACT_OT_select_border);
+	WM_operatortype_append(ACT_OT_select_column);
 	
 		/* editing */
-	WM_operatortype_append(ACT_OT_keyframes_snap);
-	WM_operatortype_append(ACT_OT_keyframes_mirror);
-	WM_operatortype_append(ACT_OT_keyframes_cfrasnap);
-	WM_operatortype_append(ACT_OT_keyframes_handle_type_set);
-	WM_operatortype_append(ACT_OT_keyframes_interpolation_type);
-	WM_operatortype_append(ACT_OT_keyframes_extrapolation_type_set);
-	WM_operatortype_append(ACT_OT_keyframes_sample);
-	WM_operatortype_append(ACT_OT_keyframes_clean);
-	WM_operatortype_append(ACT_OT_keyframes_delete);
-	WM_operatortype_append(ACT_OT_keyframes_duplicate);
-	WM_operatortype_append(ACT_OT_keyframes_insert);
-	WM_operatortype_append(ACT_OT_keyframes_copy);
-	WM_operatortype_append(ACT_OT_keyframes_paste);
+	WM_operatortype_append(ACT_OT_snap);
+	WM_operatortype_append(ACT_OT_mirror);
+	WM_operatortype_append(ACT_OT_frame_jump);
+	WM_operatortype_append(ACT_OT_handle_type_set);
+	WM_operatortype_append(ACT_OT_interpolation_type_set);
+	WM_operatortype_append(ACT_OT_extrapolation_type_set);
+	WM_operatortype_append(ACT_OT_sample);
+	WM_operatortype_append(ACT_OT_clean);
+	WM_operatortype_append(ACT_OT_delete);
+	WM_operatortype_append(ACT_OT_duplicate);
+	WM_operatortype_append(ACT_OT_insert);
+	WM_operatortype_append(ACT_OT_copy);
+	WM_operatortype_append(ACT_OT_paste);
 	
 	WM_operatortype_append(ACT_OT_previewrange_set);
 	WM_operatortype_append(ACT_OT_view_all);
@@ -95,57 +95,58 @@ static void action_keymap_keyframes (wmWindowManager *wm, ListBase *keymap)
 	
 	/* action_select.c - selection tools */
 		/* click-select */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, 0, 0);
-	kmi= WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, 0, 0);
+	kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT, 0);
 		RNA_boolean_set(kmi->ptr, "column", 1);
-	kmi= WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0);
+	kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0);
 		RNA_boolean_set(kmi->ptr, "extend", 1);
-	kmi= WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT|KM_SHIFT, 0);
+	kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_ALT|KM_SHIFT, 0);
 		RNA_boolean_set(kmi->ptr, "extend", 1);
 		RNA_boolean_set(kmi->ptr, "column", 1);
-	kmi= WM_keymap_add_item(keymap, "ACT_OT_keyframes_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
+	kmi= WM_keymap_add_item(keymap, "ACT_OT_clickselect", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
 		RNA_enum_set(kmi->ptr, "left_right", ACTKEYS_LRSEL_TEST);
 	
 		/* deselect all */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_all_toggle", AKEY, KM_PRESS, 0, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
+	WM_keymap_add_item(keymap, "ACT_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
 	
 		/* borderselect */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_border", BKEY, KM_PRESS, 0, 0);
-	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1);
+	WM_keymap_add_item(keymap, "ACT_OT_select_border", BKEY, KM_PRESS, 0, 0);
+	RNA_boolean_set(WM_keymap_add_item(keymap, "ACT_OT_select_border", BKEY, KM_PRESS, KM_ALT, 0)->ptr, "axis_range", 1);
 	
 		/* column select */
-	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN);
-	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_keyframes_select_column", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, 0, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_KEYS);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, KM_CTRL, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_CFRA);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_COLUMN);
+	RNA_enum_set(WM_keymap_add_item(keymap, "ACT_OT_select_column", KKEY, KM_PRESS, KM_ALT, 0)->ptr, "mode", ACTKEYS_COLUMNSEL_MARKERS_BETWEEN);
 	
 	/* action_edit.c */
 		/* snap - current frame to selected keys */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_cfrasnap", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+		// TODO: maybe since this is called jump, we're better to have it on <something>-J?
+	WM_keymap_add_item(keymap, "ACT_OT_frame_jump", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
 		
 		/* menu + single-step transform */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_mirror", MKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_mirror", MKEY, KM_PRESS, KM_SHIFT, 0);
 	
 		/* menu + set setting */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_handle_type_set", HKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_interpolation_type", TKEY, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_extrapolation_type_set", EKEY, KM_PRESS, KM_SHIFT, 0); 
+	WM_keymap_add_item(keymap, "ACT_OT_handle_type_set", HKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_interpolation_type_set", TKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_extrapolation_type_set", EKEY, KM_PRESS, KM_SHIFT, 0); 
 	
 		/* destructive */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_clean", OKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_sample", OKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_clean", OKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_sample", OKEY, KM_PRESS, KM_SHIFT, 0);
 	
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_delete", XKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_delete", DELKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_delete", XKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_delete", DELKEY, KM_PRESS, 0, 0);
 	
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_insert", IKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_insert", IKEY, KM_PRESS, 0, 0);
 	
 		/* copy/paste */
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_copy", CKEY, KM_PRESS, KM_CTRL, 0);
-	WM_keymap_add_item(keymap, "ACT_OT_keyframes_paste", VKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "ACT_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
 	
 		/* auto-set range */
 	WM_keymap_add_item(keymap, "ACT_OT_previewrange_set", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index f99a08bc26d..4cb39712f84 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -179,11 +179,11 @@ static int actkeys_deselectall_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_select_all_toggle (wmOperatorType *ot)
+void ACT_OT_select_all_toggle (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select All";
-	ot->idname= "ACT_OT_keyframes_select_all_toggle";
+	ot->idname= "ACT_OT_select_all_toggle";
 	
 	/* api callbacks */
 	ot->exec= actkeys_deselectall_exec;
@@ -338,11 +338,11 @@ static int actkeys_borderselect_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 } 
 
-void ACT_OT_keyframes_select_border(wmOperatorType *ot)
+void ACT_OT_select_border(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Border Select";
-	ot->idname= "ACT_OT_keyframes_select_border";
+	ot->idname= "ACT_OT_select_border";
 	
 	/* api callbacks */
 	ot->invoke= WM_border_select_invoke;
@@ -555,11 +555,11 @@ static int actkeys_columnselect_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
  
-void ACT_OT_keyframes_select_column (wmOperatorType *ot)
+void ACT_OT_select_column (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Select All";
-	ot->idname= "ACT_OT_keyframes_select_column";
+	ot->idname= "ACT_OT_select_column";
 	
 	/* api callbacks */
 	ot->exec= actkeys_columnselect_exec;
@@ -960,11 +960,11 @@ static int actkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *even
 	return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
 }
  
-void ACT_OT_keyframes_clickselect (wmOperatorType *ot)
+void ACT_OT_clickselect (wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Mouse Select Keys";
-	ot->idname= "ACT_OT_keyframes_clickselect";
+	ot->idname= "ACT_OT_clickselect";
 	
 	/* api callbacks - absolutely no exec() this yet... */
 	ot->invoke= actkeys_clickselect_invoke;