2.5:

Brought back basics for Action Editor header. The contents of the menus have yet to come, but at least now the Action Editor 'looks' functional.

Fixed mistake in previous commit for TimeLine header (button collision).

2 files changed, 364 insertions, 16 deletions

diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index 91abdea1d32..a81e95f7dc9 100644
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "DNA_action_types.h"
 #include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
@@ -41,6 +42,7 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
+#include "ED_anim_api.h"
 #include "ED_screen.h"
 #include "ED_types.h"
 #include "ED_util.h"
@@ -57,15 +59,224 @@
 
 #include "action_intern.h"
 
+/* ********************************************************* */
+/* Menu Defines... */
 
-/* ************************ header area region *********************** */
+// XXX button events
+enum {
+	B_REDR 	= 0,
+	B_ACTCOPYKEYS,
+	B_ACTPASTEKEYS,
+} eActHeader_ButEvents;
+
+// ---------------- menus 
+
+/* Key menu ---------------------------  */
+
+static void do_keymenu(bContext *C, void *arg, int event)
+{
+	
+}
+
+static uiBlock *action_keymenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+	ScrArea *curarea= CTX_wm_area(C);
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "dummy_keymenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_keymenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+/* Frame menu ---------------------------  */
+
+static void do_framemenu(bContext *C, void *arg, int event)
+{
+	
+}
+
+static uiBlock *action_framemenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+	ScrArea *curarea= CTX_wm_area(C);
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "dummy_framemenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_framemenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+/* Marker menu ---------------------------  */
+
+static void do_markermenu(bContext *C, void *arg, int event)
+{
+	
+}
+
+static uiBlock *action_markermenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+	ScrArea *curarea= CTX_wm_area(C);
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "dummy_markermenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_markermenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	
+	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 ---------------------------  */
+
+static void do_gplayermenu(bContext *C, void *arg, int event)
+{
+	
+}
+
+static uiBlock *action_gplayermenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+	ScrArea *curarea= CTX_wm_area(C);
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "dummy_gplayermenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_gplayermenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+/* Channel menu ---------------------------  */
+
+static void do_channelmenu(bContext *C, void *arg, int event)
+{
+	
+}
+
+static uiBlock *action_channelmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+	ScrArea *curarea= CTX_wm_area(C);
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "dummy_channelmenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_channelmenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	
+	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(bContext *C, void *arg, int event)
+{
+	
+}
+
+static uiBlock *action_selectmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+	ScrArea *curarea= CTX_wm_area(C);
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "dummy_selectmenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_selectmenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+/* View menu ---------------------------  */
 
 static void do_viewmenu(bContext *C, void *arg, int event)
 {
 	
 }
 
-static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+static uiBlock *action_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
 {
 	ScrArea *curarea= CTX_wm_area(C);
 	uiBlock *block;
@@ -91,37 +302,174 @@ static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg
 	return block;
 }
 
+/* ************************ header area region *********************** */
+
 static void do_action_buttons(bContext *C, void *arg, int event)
 {
 	switch(event) {
+		case B_REDR:
+			WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
+			break;
 	}
 }
 
-
 void action_header_buttons(const bContext *C, ARegion *ar)
 {
 	ScrArea *sa= CTX_wm_area(C);
+	SpaceAction *saction= (SpaceAction *)CTX_wm_space_data(C);
+	bAnimContext ac;
 	uiBlock *block;
-	int xco, yco= 3;
+	int xco, yco= 3, xmax;
 	
 	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
 	uiBlockSetHandleFunc(block, do_action_buttons, NULL);
 	
 	xco= ED_area_header_standardbuttons(C, block, yco);
 	
-	if((sa->flag & HEADER_NO_PULLDOWN)==0) {
-		int xmax;
+	uiBlockSetEmboss(block, UI_EMBOSS);
+	
+	/* get context... (also syncs data) */
+	if ((ANIM_animdata_get_context(C, &ac)) && (ac.data)) { 
+		if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
+			/* pull down menus */
+			uiBlockSetEmboss(block, UI_EMBOSSP);
+			
+			xmax= GetButStringLength("View");
+			uiDefPulldownBut(block, action_viewmenu, CTX_wm_area(C), 
+						  "View", xco, yco, xmax-3, 24, "");
+			xco+= xmax;
+			
+			xmax= GetButStringLength("Select");
+			uiDefPulldownBut(block, action_selectmenu, CTX_wm_area(C), 
+						  "Select", xco, yco, xmax-3, 24, "");
+			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, xmax-3, 24, "");
+				xco+= xmax;
+			}
+			else if (saction->mode==SACTCONT_GPENCIL) {
+				xmax= GetButStringLength("Channel");
+				uiDefPulldownBut(block, action_gplayermenu, CTX_wm_area(C), 
+							  "Channel", xco, yco, xmax-3, 24, "");
+				xco+= xmax;
+			}
+			
+			xmax= GetButStringLength("Marker");
+			uiDefPulldownBut(block, action_markermenu, CTX_wm_area(C), 
+						  "Marker", xco, yco, xmax-3, 24, "");
+			xco+= xmax;
+			
+			if (saction->mode == SACTCONT_GPENCIL) {
+				xmax= GetButStringLength("Frame");
+				uiDefPulldownBut(block, action_framemenu, CTX_wm_area(C), 
+							  "Frame", xco, yco, xmax-3, 24, "");
+				xco+= xmax;
+			}
+			else {
+				xmax= GetButStringLength("Key");
+				uiDefPulldownBut(block, action_keymenu, CTX_wm_area(C), 
+							  "Key", xco, yco, xmax-3, 24, "");
+				xco+= xmax;
+			}
+		}
+
+		uiBlockSetEmboss(block, UI_EMBOSS);
+		
+		/* MODE SELECTOR */
+		uiDefButC(block, MENU, B_REDR, 
+				"Editor Mode %t|DopeSheet %x3|Action Editor %x0|ShapeKey Editor %x1|Grease Pencil %x2", 
+				xco,yco,90,YIC, &saction->mode, 0, 1, 0, 0, 
+				"Editing modes for this editor");
+
 		
-		/* pull down menus */
-		uiBlockSetEmboss(block, UI_EMBOSSP);
+		xco += (90 + 8);
 		
-		xmax= GetButStringLength("View");
-		uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C), 
-						 "View", xco, yco-2, xmax-3, 24, "");
-		xco+=XIC+xmax;
+		/* MODE-DEPENDENT DRAWING */
+		if (saction->mode == SACTCONT_DOPESHEET) {
+			/* FILTERING OPTIONS */
+			xco -= 10;
+			
+			//uiBlockBeginAlign(block);
+				uiDefIconButBitI(block, TOG, ADS_FILTER_ONLYSEL, B_REDR, ICON_RESTRICT_SELECT_OFF,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Only display selected Objects");
+			//uiBlockEndAlign(block);
+			xco += 5;
+			
+			uiBlockBeginAlign(block);
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOOBJ, B_REDR, ICON_OBJECT,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Non-Armature Objects");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOARM, B_REDR, ICON_ARMATURE,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Armature Objects");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSHAPEKEYS, B_REDR, ICON_EDIT,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display ShapeKeys");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOMAT, B_REDR, ICON_MATERIAL,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Materials");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOLAM, B_REDR, ICON_LAMP,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Lamps");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCAM, B_REDR, ICON_CAMERA,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Cameras");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCUR, B_REDR, ICON_CURVE,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Curves");
+			uiBlockEndAlign(block);
+			xco += 5;
+			
+			uiBlockBeginAlign(block);		
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOIPOS, B_REDR, ICON_IPO,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Object IPO's");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOACTS, B_REDR, ICON_ACTION,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Actions");
+				uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCONSTRAINTS, B_REDR, ICON_CONSTRAINT,	(short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Object Constraints");
+			uiBlockEndAlign(block);
+			xco += 30;
+		}
+		else if (saction->mode == SACTCONT_ACTION) { // not too appropriate for shapekeys atm...
+			/* NAME ETC */
+				// XXX missing stuff here!
+			//ob= OBACT;
+			//from = (ID *)ob;
+			
+			//xco= std_libbuttons(block, xco, 0, B_ACTPIN, saction->pin, 
+			//					B_ACTIONBROWSE, ID_AC, 0, (ID*)saction->action, 
+			//					from, &(saction->actnr), B_ACTALONE, 
+			//					B_ACTLOCAL, B_ACTIONDELETE, 0, B_KEEPDATA);	
+			
+			//uiClearButLock();
+			
+			xco += 8;
+		}
+		
+		/* COPY PASTE */
+		uiBlockBeginAlign(block);
+		if (sa->headertype==HEADERTOP) {
+			uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYUP,	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_PASTEUP,	xco+=XIC,yco,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
+		}
+		else {
+			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");
+		}
+		uiBlockEndAlign(block);
+		xco += (XIC + 8);
+		
+		/* draw AUTOSNAP */
+		if (saction->mode != SACTCONT_GPENCIL) {
+			if (saction->flag & SACTION_DRAWTIME) {
+				uiDefButC(block, MENU, B_REDR,
+						"Auto-Snap Keyframes %t|No Snap %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3", 
+						xco,yco,70,YIC, &(saction->autosnap), 0, 1, 0, 0, 
+						"Auto-snapping mode for keyframes when transforming");
+			}
+			else {
+				uiDefButC(block, MENU, B_REDR, 
+						"Auto-Snap Keyframes %t|No Snap %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3", 
+						xco,yco,70,YIC, &(saction->autosnap), 0, 1, 0, 0, 
+						"Auto-snapping mode for keyframes when transforming");
+			}
+			
+			xco += (70 + 8);
+		}
+		
+		/* draw LOCK */
+		uiDefIconButS(block, ICONTOG, 1, ICON_UNLOCKED,	xco, yco, XIC, YIC, 
+					  &(saction->lock), 0, 0, 0, 0, 
+					  "Updates other affected window spaces automatically "
+					  "to reflect changes in real time");
 	}
-	
-	uiBlockSetEmboss(block, UI_EMBOSS);
 
 	/* always as last  */
 	UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin);
diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c
index 2dac1fefd09..57705ebed6a 100644
--- a/source/blender/editors/space_time/time_header.c
+++ b/source/blender/editors/space_time/time_header.c
@@ -458,11 +458,11 @@ void time_header_buttons(const bContext *C, ARegion *ar)
 	uiBlockBeginAlign(block);
 	
 	uiDefButI(block, TOG, B_TL_PREVIEWON,"PR",	
-			  xco,yco, XIC*3, YIC,
+			  xco,yco, XIC*2, YIC,
 			  &scene->r.psfra,0, 1, 0, 0,
 			  "Show settings for frame range of animation preview");
 	
-	xco += XIC;
+	xco += XIC*2;
 	
 	if (scene->r.psfra) {
 		uiDefButI(block, NUM, B_REDRAWALL,"Start:",