2.5

- Brought back (most of) buttons in TimeLine window.
  They don't work yet though! Waiting for Brecht to commit callbacks
  for menus and ui-blocks

- Area headers hilite again when mouse is inside.

9 files changed, 677 insertions, 19 deletions

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 4161da135e4..0a3772f2853 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -41,10 +41,10 @@ struct AreagionType;
 
 /* regions */
 void	ED_region_do_listen(ARegion *ar, struct wmNotifier *note);
-void	ED_region_do_draw(struct bContext *C, ARegion *ar);
-void	ED_region_exit(struct bContext *C, ARegion *ar);
-void	ED_region_pixelspace(const struct bContext *C, ARegion *ar);
-void	ED_region_init(struct bContext *C, ARegion *ar);
+void	ED_region_do_draw(struct bContext *C, struct ARegion *ar);
+void	ED_region_exit(struct bContext *C, struct ARegion *ar);
+void	ED_region_pixelspace(const struct bContext *C, struct ARegion *ar);
+void	ED_region_init(struct bContext *C, struct ARegion *ar);
 ARegion *ED_region_copy(ARegion *ar);
 
 /* spaces */
@@ -54,17 +54,18 @@ struct ARegionType *ED_regiontype_from_id(struct SpaceType *st, int regionid);
 
 /* areas */
 void	ED_area_initialize(struct wmWindowManager *wm, struct wmWindow *win, struct ScrArea *sa);
-void	ED_area_exit(struct bContext *C, ScrArea *sa);
-void	ED_area_do_draw(struct bContext *C, ScrArea *sa);
+void	ED_area_exit(struct bContext *C, struct ScrArea *sa);
+void	ED_area_do_draw(struct bContext *C, struct ScrArea *sa);
+int		ED_screen_area_active(const struct bContext *C);
 
 /* screens */
 void	ED_screens_initialize(struct wmWindowManager *wm);
 void	ED_screen_draw(struct wmWindow *win);
 void	ED_screen_refresh(struct wmWindowManager *wm, struct wmWindow *win);
 void	ED_screen_do_listen(struct wmWindow *win, struct wmNotifier *note);
-bScreen *ED_screen_duplicate(struct wmWindow *win, bScreen *sc);
+bScreen *ED_screen_duplicate(struct wmWindow *win, struct bScreen *sc);
 void	ED_screen_set_subwinactive(struct wmWindow *win);
-void	ED_screen_exit(struct bContext *C, struct wmWindow *window, bScreen *screen);
+void	ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen);
 
 void	ED_operatortypes_screen(void);
 void	ED_keymap_screen(struct wmWindowManager *wm);
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index 57b6a0f52d0..82af517b1e9 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -28,7 +28,14 @@
 #ifndef ED_UTIL_H
 #define ED_UTIL_H
 
+/* ************** XXX OLD CRUFT WARNING ************* */
+
+#define XIC 20
+#define YIC 20
+
 void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert);
 
+int GetButStringLength(char *str);
+
 #endif /* ED_UTIL_H */
 
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 7b85a7c6556..6fd0e9d6c03 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -98,8 +98,7 @@ void ED_region_pixelspace(const bContext *C, ARegion *ar)
 	int height= ar->winrct.ymax-ar->winrct.ymin+1;
 	
 	wmOrtho2(C->window, -0.375, (float)width-0.375, -0.375, (float)height-0.375);
-	wmLoadIdentity(C->window);
-	
+	wmLoadIdentity(C->window);	
 }
 
 void ED_region_do_listen(ARegion *ar, wmNotifier *note)
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 94f907ee06b..43f80580c74 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -958,6 +958,7 @@ void ED_screen_set_subwinactive(wmWindow *win)
 	if(win->screen) {
 		wmEvent *event= win->eventstate;
 		ScrArea *sa;
+		int oldswin= win->screen->subwinactive;
 		
 		for(sa= win->screen->areabase.first; sa; sa= sa->next) {
 			if(event->x > sa->totrct.xmin && event->x < sa->totrct.xmax)
@@ -974,7 +975,34 @@ void ED_screen_set_subwinactive(wmWindow *win)
 		else
 			win->screen->subwinactive= win->screen->mainwin;
 		
+		/* check for redraw headers */
+		if(oldswin!=win->screen->subwinactive) {
+			
+			for(sa= win->screen->areabase.first; sa; sa= sa->next) {
+				ARegion *ar;
+				int do_draw= 0;
+				
+				for(ar= sa->regionbase.first; ar; ar= ar->next)
+					if(ar->swinid==oldswin || ar->swinid==win->screen->subwinactive)
+						do_draw= 1;
+				
+				if(do_draw)
+					for(ar= sa->regionbase.first; ar; ar= ar->next)
+						if(ar->regiontype==RGN_TYPE_HEADER)
+							ar->do_draw= 1; /* XXX */
+			}
+		}
 	}
 }
 
+int ED_screen_area_active(const bContext *C)
+{
 
+	if(C->screen && C->area) {
+		ARegion *ar;
+		for(ar= C->area->regionbase.first; ar; ar= ar->next)
+			if(ar->swinid == C->screen->subwinactive)
+				return 1;
+	}	
+	return 0;
+}
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index 29a849541b2..37d9ce2906a 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -452,9 +452,12 @@ static void outliner_header_area_draw(const bContext *C, ARegion *ar)
 
 	path= (soutliner->rnapath)? soutliner->rnapath: "Main";
 
-	/* clear */
-	UI_GetThemeColor3fv(TH_BACK, col);
-	glClearColor(MAX2(col[0]-0.3f, 0.0f), MAX2(col[1]-0.3f, 0.0f), MAX2(col[2]-0.3f, 0.0f), 0.0);
+	if(ED_screen_area_active(C))
+		UI_GetThemeColor3fv(TH_HEADER, col);
+	else
+		UI_GetThemeColor3fv(TH_HEADERDESEL, col);
+	
+	glClearColor(col[0], col[1], col[2], 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	width= ar->winrct.xmax - ar->winrct.xmin;
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index a8fc955c485..78afe75d013 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -43,6 +43,7 @@
 
 #include "ED_area.h"
 #include "ED_screen.h"
+#include "ED_util.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -126,9 +127,6 @@ static void time_main_area_draw(const bContext *C, ARegion *ar)
 	float col[3];
 	int unit;
 	
-	/* XXX can be removed */
-	UI_view2d_size_update(v2d, ar->winx, ar->winy);
-
 	/* clear and setup matrix */
 	UI_GetThemeColor3fv(TH_BACK, col);
 	glClearColor(col[0], col[1], col[2], 0.0);
@@ -168,17 +166,20 @@ static void time_main_area_listener(ARegion *ar, wmNotifier *wmn)
 
 /* ************************ header time area region *********************** */
 
-
 static void time_header_area_draw(const bContext *C, ARegion *ar)
 {
 	float col[3];
 
 	/* clear */
-	UI_GetThemeColor3fv(TH_HEADER, col);
+	if(ED_screen_area_active(C))
+		UI_GetThemeColor3fv(TH_HEADER, col);
+	else
+		UI_GetThemeColor3fv(TH_HEADERDESEL, col);
+		
 	glClearColor(col[0], col[1], col[2], 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
-	uiTestRegion(C);
+	time_header_buttons(C, ar);
 }
 
 static void time_header_area_free(ARegion *ar)
diff --git a/source/blender/editors/space_time/time_header.c b/source/blender/editors/space_time/time_header.c
new file mode 100644
index 00000000000..a3cf93c9630
--- /dev/null
+++ b/source/blender/editors/space_time/time_header.c
@@ -0,0 +1,604 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_global.h"
+#include "BKE_screen.h"
+
+#include "ED_area.h"
+#include "ED_screen.h"
+#include "ED_util.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "ED_markers.h"
+
+#include "time_intern.h"
+
+
+/* ************************ header time area region *********************** */
+
+static void start_animated_screen(SpaceTime *stime)
+{
+// XXX	add_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM, stime->redraws);
+	
+//	if(stime->redraws & TIME_WITH_SEQ_AUDIO)
+//		audiostream_start( CFRA );
+	
+//	BKE_ptcache_set_continue_physics((stime->redraws & TIME_CONTINUE_PHYSICS));
+}
+
+static void end_animated_screen(SpaceTime *stime)
+{
+//	rem_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM);
+	
+//	audiostream_stop();
+//	BKE_ptcache_set_continue_physics(0);
+}
+
+#define B_TL_REW		751
+#define B_TL_PLAY		752
+#define B_TL_FF			753
+#define B_TL_PREVKEY	754
+#define B_TL_NEXTKEY	755
+#define B_TL_STOP		756
+#define B_TL_PREVIEWON	757
+#define B_TL_INSERTKEY	758
+#define B_TL_DELETEKEY	759
+
+void do_time_buttons(ScrArea *sa, unsigned short event)
+{
+	SpaceTime *stime= sa->spacedata.first;
+	
+	switch(event) {
+		
+		case B_TL_REW:
+			CFRA= PSFRA;
+			//update_for_newframe();
+			break;
+		case B_TL_PLAY:
+			start_animated_screen(stime);
+			break;
+		case B_TL_STOP:
+			end_animated_screen(stime);
+			//allqueue(REDRAWALL, 0);
+			break;
+		case B_TL_FF:
+			/* end frame */
+			CFRA= PEFRA;
+			//update_for_newframe();
+			break;
+		case B_TL_PREVKEY:
+			/* previous keyframe */
+			//nextprev_timeline_key(-1);
+			break;
+		case B_TL_NEXTKEY:
+			/* next keyframe */
+			//nextprev_timeline_key(1);
+			break;
+			
+		case B_TL_PREVIEWON:
+			if (G.scene->r.psfra) {
+				/* turn on preview range */
+				G.scene->r.psfra= G.scene->r.sfra;
+				G.scene->r.pefra= G.scene->r.efra;
+			}
+			else {
+				/* turn off preview range */
+				G.scene->r.psfra= 0;
+				G.scene->r.pefra= 0;
+			}
+			//BIF_undo_push("Set anim-preview range");
+			//allqueue(REDRAWALL, 0);
+			break;
+			
+		case B_TL_INSERTKEY:
+			/* insert keyframe */
+			//common_insertkey();
+			//allqueue(REDRAWTIME, 1);
+			break;
+		case B_TL_DELETEKEY:
+			/* delete keyframe */
+			//common_deletekey();
+			//allqueue(REDRAWTIME, 1);
+			break;
+	}
+}
+
+static void do_time_redrawmenu(void *arg, int event)
+{
+	ScrArea *curarea;
+	SpaceTime *stime= curarea->spacedata.first;
+	
+	if(event < 1001) {
+		
+		stime->redraws ^= event;
+		/* update handler when it's running */
+//		if(has_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM))
+//			start_animated_screen(stime);
+	}
+	else {
+		if(event==1001) {
+//			button(&G.scene->r.frs_sec,1,120,"FPS:");
+		}
+	}
+}
+
+
+static uiBlock *time_redrawmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_area)
+{
+	ScrArea *curarea= arg_area;
+	SpaceTime *stime= curarea->spacedata.first;
+	uiBlock *block;
+	short yco= 0, menuwidth=120, icon;
+	char str[32];
+	
+	block= uiBeginBlock(C, handle->region, "header time_redrawmenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_time_redrawmenu, NULL);
+	
+	if(stime->redraws & TIME_LEFTMOST_3D_WIN) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "Top-Left 3D Window",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_LEFTMOST_3D_WIN, "");
+	
+	if(stime->redraws & TIME_ALL_3D_WIN) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "All 3D Windows",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_ALL_3D_WIN, "");
+	
+	if(stime->redraws & TIME_ALL_ANIM_WIN) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "Animation Windows",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_ALL_ANIM_WIN, "");
+	
+	if(stime->redraws & TIME_ALL_BUTS_WIN) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "Buttons Windows",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_ALL_BUTS_WIN, "");
+	
+	if(stime->redraws & TIME_ALL_IMAGE_WIN) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "Image Windows",      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_ALL_IMAGE_WIN, "");
+	
+	/* Add sequencer only redraw*/
+	if(stime->redraws & TIME_SEQ) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "Sequencer Windows",      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_SEQ, "");
+	
+	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	sprintf(str, "Set Frames/Sec (%d/%f)", G.scene->r.frs_sec, G.scene->r.frs_sec_base);
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, str,	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1001, "");
+	
+	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	if(stime->redraws & TIME_CONTINUE_PHYSICS) icon= ICON_CHECKBOX_HLT;
+	else icon= ICON_CHECKBOX_DEHLT;
+	uiDefIconTextBut(block, BUTM, 1, icon, "Continue Physics",      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, TIME_CONTINUE_PHYSICS, "During playblack, continue physics simulations regardless of the frame number");
+	
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+static void do_time_viewmenu(void *arg, int event)
+{
+	ScrArea *curarea;
+	SpaceTime *stime= curarea->spacedata.first;
+	int first;
+	
+	switch(event) {
+		case 2: /* Play Back Animation */
+			//if(!has_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM))
+			//	start_animated_screen(stime);
+			break;
+		case 3: /* View All */
+			first= G.scene->r.sfra;
+			if(first >= G.scene->r.efra) first= G.scene->r.efra;
+				G.v2d->cur.xmin=G.v2d->tot.xmin= (float)first-2;
+			G.v2d->cur.xmax=G.v2d->tot.xmax= (float)G.scene->r.efra+2;
+			
+			//test_view2d(G.v2d, curarea->winx, curarea->winy);
+			//scrarea_queue_winredraw(curarea);
+			break;
+		case 4: /* Maximize Window */
+			/* using event B_FULL */
+			break;
+		case 5:	/* show time or frames */
+			stime->flag ^= TIME_DRAWFRAMES;
+			break;
+		case 6:
+			//nextprev_marker(1);
+			break;
+		case 7:
+			//nextprev_marker(-1);
+			break;
+		case 8:
+			//nextprev_timeline_key(1);
+			break;
+		case 9:
+			//nextprev_timeline_key(-1);
+			break;
+		case 10:
+			//timeline_frame_to_center();
+			break;
+		case 11:
+			//G.v2d->flag ^= V2D_VIEWSYNC_X;
+			//if(G.v2d->flag & V2D_VIEWSYNC_X)
+			//	view2d_do_locks(curarea, 0);
+				break;
+		case 12: /* only show keyframes from selected data */
+			stime->flag ^= TIME_ONLYACTSEL;
+			break;
+	}
+	//allqueue(REDRAWVIEW3D, 0);
+}
+
+static uiBlock *time_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_area)
+{
+	ScrArea *curarea= arg_area;
+	SpaceTime *stime= curarea->spacedata.first;
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "time_viewmenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_time_viewmenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Play Back Animation", 0, yco-=20,
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	
+	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	if(stime->flag & TIME_DRAWFRAMES)
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Seconds|T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
+	else 
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Frames|T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, (stime->flag & TIME_ONLYACTSEL)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+					 "Only Selected Data Keys|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, "");
+	
+	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, 6, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Prev Marker|PageDown", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Next Key|Ctrl PageUp", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump To Prev Key|Ctrl PageDown", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
+	
+	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Center View|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "View All|Home", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	uiDefIconTextBut(block, BUTM, 1, (handle->region->v2d.flag & V2D_VIEWSYNC_X)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+					 "Lock Time to Other Windows|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");
+	
+//	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, 4, "");
+//	else 
+//		uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Tile Window|Ctrl DownArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+static void do_time_framemenu(void *arg, int event)
+{
+	switch(event) {
+		case 1: /*Set as Start */
+			if (G.scene->r.psfra) {
+				if (G.scene->r.pefra < CFRA)
+					G.scene->r.pefra= CFRA;
+				G.scene->r.psfra= CFRA;
+			}				
+			else
+				G.scene->r.sfra = CFRA;
+			//allqueue(REDRAWALL, 1);
+			break;
+		case 2: /* Set as End */
+			if (G.scene->r.psfra) {
+				if (CFRA < G.scene->r.psfra)
+					G.scene->r.psfra= CFRA;
+				G.scene->r.pefra= CFRA;
+			}				
+			else
+				G.scene->r.efra = CFRA;
+			//allqueue(REDRAWALL, 1);
+			break;
+		case 3: /* Add Marker */
+			//add_marker(CFRA);
+			break;
+		case 4: /* Remove Marker */
+			//remove_marker();
+			break;
+		case 5: /* Rename Marker */
+			//rename_marker();
+			break;
+		case 6: /* Grab Marker */
+			//transform_markers('g', 0);
+			break;
+		case 7: /* duplicate marker */
+			//duplicate_marker();
+			break;
+	}
+	//allqueue(REDRAWTIME, 0);
+	//allqueue(REDRAWIPO, 0);
+	//allqueue(REDRAWACTION, 0);
+	//allqueue(REDRAWNLA, 0);
+	//allqueue(REDRAWSOUND, 0);
+}
+
+static uiBlock *time_framemenu(bContext *C, uiMenuBlockHandle *handle, void *arg_area)
+{
+	ScrArea *curarea= arg_area;
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+	
+	block= uiBeginBlock(C, handle->region, "time_framemenu", UI_EMBOSSP, UI_HELV);
+	uiBlockSetButmFunc(block, do_time_framemenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Marker|M", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate Marker|Shift D", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Marker|X", 0, yco-=20,
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	
+	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Name Marker|Ctrl M", 0, yco-=20,
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Marker|G", 0, yco-=20,
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+	
+	uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set as Start|S", 0, yco-=20, 
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Set as End|E", 0, yco-=20,
+					 menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+	
+	uiTextBoundsBlock(block, 50);
+	uiEndBlock(C, block);
+	
+	return block;
+}
+
+#define B_NEWSPACE 0
+#define B_FLIPINFOMENU 0
+#define B_NEWFRAME 0
+#define AUTOKEY_ON 0
+#define B_DIFF 0
+
+
+void time_header_buttons(const bContext *C, ARegion *ar)
+{
+	ScrArea *sa= C->area;
+	SpaceTime *stime= sa->spacedata.first;
+	uiBlock *block;
+	int xco, yco= 3;
+	
+	block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+	
+	if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER);
+	else uiBlockSetCol(block, TH_HEADERDESEL);
+
+	xco = 8;
+	
+//	uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, 
+//					  windowtype_pup(), xco, 0, XIC+10, YIC, 
+//					  &(C->area->butspacetype), 1.0, SPACEICONMAX, 0, 0, 
+//					  "Displays Current Window Type. "
+//					  "Click for menu of available types.");
+	
+	xco += XIC + 14;
+	
+	uiBlockSetEmboss(block, UI_EMBOSSN);
+	if (sa->flag & HEADER_NO_PULLDOWN) {
+		uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, B_FLIPINFOMENU, 
+						 ICON_DISCLOSURE_TRI_RIGHT,
+						 xco,yco,XIC,YIC-2,
+						 &(sa->flag), 0, 0, 0, 0, 
+						 "Show pulldown menus");
+	}
+	else {
+		uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, B_FLIPINFOMENU, 
+						 ICON_DISCLOSURE_TRI_DOWN,
+						 xco,yco,XIC,YIC-2,
+						 &(sa->flag), 0, 0, 0, 0, 
+						 "Hide pulldown menus");
+	}
+	uiBlockSetEmboss(block, UI_EMBOSS);
+	xco+=XIC;
+	
+	if((sa->flag & HEADER_NO_PULLDOWN)==0) {
+		int xmax;
+		
+		/* pull down menus */
+		uiBlockSetEmboss(block, UI_EMBOSSP);
+		
+		xmax= GetButStringLength("View");
+		uiDefPulldownBut(block, time_viewmenu, C->area, 
+						 "View", xco, yco-2, xmax-3, 24, "");
+		xco+= xmax;
+		xmax= GetButStringLength("Frame");
+		uiDefPulldownBut(block, time_framemenu, C->area, 
+						 "Frame", xco, yco-2, xmax-3, 24, "");
+		xco+= xmax;
+		
+		xmax= GetButStringLength("Playback");
+		uiDefPulldownBut(block, time_redrawmenu, C->area, 
+						 "Playback", xco, yco-2, xmax-3, 24, "");
+		xco+= xmax;
+	}
+	
+	uiBlockSetEmboss(block, UI_EMBOSS);
+	
+	uiBlockBeginAlign(block);
+	
+	uiDefButI(block, TOG, B_TL_PREVIEWON,"Preview",	
+			  xco,yco, XIC, YIC,
+			  &G.scene->r.psfra,0, 1, 0, 0,
+			  "Show settings for frame range of animation preview");
+	
+	xco += XIC;
+	
+	if (G.scene->r.psfra) {
+		uiDefButI(block, NUM, REDRAWALL,"Start:",	
+				  xco,yco, 4.5*XIC, YIC,
+				  &G.scene->r.psfra,MINFRAMEF, MAXFRAMEF, 0, 0,
+				  "The start frame of the animation preview (inclusive)");
+		
+		xco += (short)(4.5*XIC);
+		
+		uiDefButI(block, NUM, REDRAWALL,"End:",	
+				  xco,yco,4.5*XIC,YIC,
+				  &G.scene->r.pefra,PSFRA,MAXFRAMEF, 0, 0,
+				  "The end frame of the animation preview (inclusive)");
+	}
+	else {
+		uiDefButI(block, NUM, REDRAWALL,"Start:",	
+				  xco,yco, 4.5*XIC, YIC,
+				  &G.scene->r.sfra,MINFRAMEF, MAXFRAMEF, 0, 0,
+				  "The start frame of the animation (inclusive)");
+		
+		xco += (short)(4.5*XIC);
+		
+		uiDefButI(block, NUM, REDRAWALL,"End:",	
+				  xco,yco,4.5*XIC,YIC,
+				  &G.scene->r.efra,(float)SFRA,MAXFRAMEF, 0, 0,
+				  "The end frame of the animation (inclusive)");
+	}
+	uiBlockEndAlign(block);
+	
+	xco += (short)(4.5 * XIC + 16);
+	
+	uiDefButI(block, NUM, B_NEWFRAME, "",
+			  xco,yco,3.5*XIC,YIC,
+			  &(G.scene->r.cfra), MINFRAMEF, MAXFRAMEF, 0, 0,
+			  "Displays Current Frame of animation");
+	
+	xco += (short)(3.5 * XIC + 16);
+	
+	uiDefIconBut(block, BUT, B_TL_REW, ICON_REW,
+				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Skip to Start frame (Shift DownArrow)");
+	xco+= XIC+4;
+	uiDefIconBut(block, BUT, B_TL_PREVKEY, ICON_PREV_KEYFRAME,
+				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Skip to previous keyframe (Ctrl PageDown)");
+	xco+= XIC+4;
+	
+//	if(has_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM))
+//		uiDefIconBut(block, BUT, B_TL_STOP, ICON_PAUSE,
+//					 xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Stop Playing Timeline");
+//	else 	   
+//		uiDefIconBut(block, BUT, B_TL_PLAY, ICON_PLAY,
+//					 xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Play Timeline ");
+	
+	xco+= XIC+4;
+	uiDefIconBut(block, BUT, B_TL_NEXTKEY, ICON_NEXT_KEYFRAME,
+				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Skip to next keyframe (Ctrl PageUp)");
+	xco+= XIC+4;
+	uiDefIconBut(block, BUT, B_TL_FF, ICON_FF,
+				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Skip to End frame (Shift UpArrow)");
+	xco+= XIC+8;
+	
+	uiDefIconButBitS(block, TOG, AUTOKEY_ON, REDRAWINFO, ICON_REC,
+					 xco, yco, XIC, YIC, &(G.scene->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
+	xco+= XIC;
+	if (C->scene->autokey_mode & AUTOKEY_ON) {
+		uiDefButS(block, MENU, REDRAWINFO, 
+				  "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
+				  xco, yco, 3.5*XIC, YIC, &(G.scene->autokey_mode), 0, 1, 0, 0, 
+				  "Mode of automatic keyframe insertion for Objects and Bones");
+		xco+= (4*XIC);
+	}
+	
+	xco+= 16;
+	
+	uiDefIconBut(block, BUT, B_TL_INSERTKEY, ICON_KEY_HLT,
+				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Insert Keyframe for the context of the largest area (IKEY)");
+	xco+= XIC+4;
+	uiDefIconBut(block, BUT, B_TL_DELETEKEY, ICON_KEY_DEHLT,
+				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Delete Keyframe for the context of the largest area (ALTKEY-IKEY)");
+	xco+= XIC+4;
+	
+	xco+= 16;
+	
+	uiDefIconButBitI(block, TOG, TIME_WITH_SEQ_AUDIO, B_DIFF, ICON_SPEAKER,
+					 xco, yco, XIC, YIC, &(stime->redraws), 0, 0, 0, 0, "Play back and sync with audio from Sequence Editor");
+	
+	
+	/* always as last  */
+	sa->headbutlen= xco+XIC+80; // +80 because the last button is not an icon
+	
+	uiEndBlock(C, block);
+	uiDrawBlock(block);
+}
+
+
diff --git a/source/blender/editors/space_time/time_intern.h b/source/blender/editors/space_time/time_intern.h
index e7fb9af7906..25f4c63fed1 100644
--- a/source/blender/editors/space_time/time_intern.h
+++ b/source/blender/editors/space_time/time_intern.h
@@ -37,5 +37,8 @@ struct wmWindowManager;
 void time_operatortypes(void);
 void time_keymap(struct wmWindowManager *wm);
 
+/* time_header.c */
+void time_header_buttons(const bContext *C, ARegion *ar);
+
 #endif /* ED_TIME_INTERN_H */
 
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index fc485b8df7b..78cc5495864 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -32,11 +32,13 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
 
 #include "BLI_blenlib.h"
 
 #include "BKE_global.h"
 
+#include "UI_text.h"
 
 /* ********* general editor util funcs, not BKE stuff please! ********* */
 /* ***** XXX: functions are using old blender names, cleanup later ***** */
@@ -66,3 +68,13 @@ void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert)
 	}
 }
 
+
+int GetButStringLength(char *str) 
+{
+	int rt;
+	
+	rt= UI_GetStringWidth(G.font, str, (U.transopts & USER_TR_BUTTONS));
+	
+	return rt + 15;
+}
+