==Sequencer==

Added patch by Matt Ebb, that enhances the sequencer GUI in several ways:
- It looks a lot better
- Strip colours are themeable.
- The drawing code is more readable.
- The background of the timeline makes now distinguishing the channels easier
  by alternating between different shades of gray.
- Handle-scaling is clamped to min and max-values, making it possible to
  grab strips at large zooming levels more easily.
- Preview-images can be panned by dragging it with the middle mouse button.
  Home-Key resets the position.
- Since some people can't grab the meaning of "C 0", it is renamed to "Chan: 0"
- Effect strips have slightly different colors to distinguish them better.

Additionally:
- fixed an off by one error in Matt's patch
- Scene-rendering saves CFRA to avoid jumping current-scene on scrub
  (might be academic fix, since most likely it only happens if you add
  the sequencer-scene to the timeline... But nevertheless it bugs you on
  testing the GUI ;-)

7 files changed, 622 insertions, 341 deletions

diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index 44f002f28bd..017b602c4f4 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -79,54 +79,45 @@
 
 #include "blendef.h"	/* CFRA */
 #include "mydevice.h"	/* REDRAWSEQ */
+#include "interface.h"
 
-int no_rightbox=0, no_leftbox= 0;
-
-static void EmbossBoxf(float x1, float y1, float x2, float y2, int sel, unsigned int dark, unsigned int light)
-{
-
-	if(sel) cpack(dark);
-	else cpack(light);
-	if(sel) glLineWidth(2.0);
-	fdrawline(x1,  y2,  x2,  y2); 	/* top */
-	if(no_leftbox==0) fdrawline(x1,  y1,  x1,  y2);	/* left */
-
-	if(sel) glLineWidth(1.0);
+#define SEQ_LEFTHANDLE		1
+#define SEQ_RIGHTHANDLE	2
 
-	if(sel) cpack(light);
-	else cpack(dark);
-	fdrawline(x1,  y1,  x2,  y1); /* bottom */
-	if(no_rightbox==0) fdrawline(x2,  y1,  x2,  y2); 	/* right */
+#define SEQ_STRIP_OFSBOTTOM		0.2
+#define SEQ_STRIP_OFSTOP		0.8
 
-}
+int no_rightbox=0, no_leftbox= 0;
+static void draw_seq_handle(Sequence *seq, SpaceSeq *sseq, short direction);
+static void draw_seq_extensions(Sequence *seq, SpaceSeq *sseq);
+static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2);
+static void draw_shadedstrip(Sequence *seq, char *col, float x1, float y1, float x2, float y2);
+static void draw_seq_strip(struct Sequence *seq, struct ScrArea *sa, struct SpaceSeq *sseq);
 
 static char *give_seqname(Sequence *seq)
 {
-	if(seq->type==SEQ_META) {
-		if(seq->name[2]) return seq->name+2;
-		return "META";
-	}
-	else if(seq->type==SEQ_IMAGE) return "IMAGE";
-	else if(seq->type==SEQ_SCENE) return "SCENE";
-	else if(seq->type==SEQ_MOVIE) return "MOVIE";
-	else if(seq->type==SEQ_RAM_SOUND) return "AUDIO (RAM)";
-	else if(seq->type==SEQ_HD_SOUND) return "AUDIO (HD)";
+	if(seq->type==SEQ_META) return "Meta";
+	else if(seq->type==SEQ_IMAGE) return "Image";
+	else if(seq->type==SEQ_SCENE) return "Scene";
+	else if(seq->type==SEQ_MOVIE) return "Movie";
+	else if(seq->type==SEQ_RAM_SOUND) return "Audio (RAM)";
+	else if(seq->type==SEQ_HD_SOUND) return "Audio (HD)";
 	else if(seq->type<SEQ_EFFECT) return seq->strip->dir;
-	else if(seq->type==SEQ_CROSS) return "CROSS";
-	else if(seq->type==SEQ_GAMCROSS) return "GAMMA CROSS";
-	else if(seq->type==SEQ_ADD) return "ADD";
-	else if(seq->type==SEQ_SUB) return "SUB";
-	else if(seq->type==SEQ_MUL) return "MUL";
-	else if(seq->type==SEQ_ALPHAOVER) return "ALPHAOVER";
-	else if(seq->type==SEQ_ALPHAUNDER) return "ALPHAUNDER";
-	else if(seq->type==SEQ_OVERDROP) return "OVER DROP";
-	else if(seq->type==SEQ_WIPE) return "WIPE";
-	else if(seq->type==SEQ_GLOW) return "GLOW";
+	else if(seq->type==SEQ_CROSS) return "Cross";
+	else if(seq->type==SEQ_GAMCROSS) return "Gamma Cross";
+	else if(seq->type==SEQ_ADD) return "Add";
+	else if(seq->type==SEQ_SUB) return "Sub";
+	else if(seq->type==SEQ_MUL) return "Mul";
+	else if(seq->type==SEQ_ALPHAOVER) return "Alpha Over";
+	else if(seq->type==SEQ_ALPHAUNDER) return "Alpha Under";
+	else if(seq->type==SEQ_OVERDROP) return "Over Drop";
+	else if(seq->type==SEQ_WIPE) return "Wipe";
+	else if(seq->type==SEQ_GLOW) return "Glow";
 	else if(seq->type==SEQ_PLUGIN) {
 		if(seq->plugin && seq->plugin->doit) return seq->plugin->pname;
-		return "PLUGIN";
+		return "Plugin";
 	}
-	else return "EFFECT";
+	else return "Effect";
 
 }
 static void draw_cfra_seq(void)
@@ -140,53 +131,96 @@ static void draw_cfra_seq(void)
 	glLineWidth(1.0);
 }
 
-static unsigned int seq_color(Sequence *seq)
+static void get_seq_color3ubv(Sequence *seq, char *col)
 {
+	char blendcol[3];
+	float hsv[3], rgb[3];
+	
 	switch(seq->type) {
+	case SEQ_IMAGE:
+		BIF_GetThemeColor3ubv(TH_SEQ_IMAGE, col);
+		break;
 	case SEQ_META:
-		return 0x509090;
+		BIF_GetThemeColor3ubv(TH_SEQ_META, col);
+		break;
 	case SEQ_MOVIE:
-		return 0x805040;
+		BIF_GetThemeColor3ubv(TH_SEQ_MOVIE, col);
+		break;
 	case SEQ_SCENE:
-		if(seq->scene==G.scene) return 0x709050;
-		return 0x609060;
+		BIF_GetThemeColor3ubv(TH_SEQ_SCENE, col);
+		
+		if(seq->scene==G.scene) {
+			BIF_GetColorPtrBlendShade3ubv(col, col, col, 1.0, 20);
+		}
+		break;
+
+	/* transitions */
 	case SEQ_CROSS:
-		return 0x505090;
 	case SEQ_GAMCROSS:
-		return 0x5040A0;
+	case SEQ_WIPE:
+		/* slightly offset hue to distinguish different effects */
+		BIF_GetThemeColor3ubv(TH_SEQ_TRANSITION, col);
+		
+		rgb[0] = col[0]/255.0; rgb[1] = col[1]/255.0; rgb[2] = col[2]/255.0; 
+		rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2);
+		
+		if (seq->type == SEQ_CROSS)		hsv[0]+= 0.04;
+		if (seq->type == SEQ_GAMCROSS)	hsv[0]+= 0.08;
+		if (seq->type == SEQ_WIPE)		hsv[0]+= 0.12;
+		
+		if(hsv[0]>1.0) hsv[0]-=1.0; else if(hsv[0]<0.0) hsv[0]+= 1.0;
+		hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);
+		col[0] = (char)(rgb[0]*255); col[1] = (char)(rgb[1]*255); col[2] = (char)(rgb[2]*255); 
+		break;
+		
+	/* effects */
 	case SEQ_ADD:
-		return 0x6060A0;
 	case SEQ_SUB:
-		return 0x8060A0;
 	case SEQ_MUL:
-		return 0x8080A0;
 	case SEQ_ALPHAOVER:
-		return 0x6080A0;
 	case SEQ_ALPHAUNDER:
-		return 0x9080A0;
 	case SEQ_OVERDROP:
-		return 0x5080B0;
-	case SEQ_WIPE:
-		return 0x2080B0;
 	case SEQ_GLOW:
-		return 0x0080B0;
+		/* slightly offset hue to distinguish different effects */
+		BIF_GetThemeColor3ubv(TH_SEQ_EFFECT, col);
+		
+		rgb[0] = col[0]/255.0; rgb[1] = col[1]/255.0; rgb[2] = col[2]/255.0; 
+		rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2);
+		
+		if (seq->type == SEQ_ADD)		hsv[0]+= 0.04;
+		if (seq->type == SEQ_SUB)		hsv[0]+= 0.08;
+		if (seq->type == SEQ_MUL)		hsv[0]+= 0.12;
+		if (seq->type == SEQ_ALPHAOVER)	hsv[0]+= 0.16;
+		if (seq->type == SEQ_ALPHAUNDER)	hsv[0]+= 0.20;
+		if (seq->type == SEQ_OVERDROP)	hsv[0]+= 0.24;
+		if (seq->type == SEQ_GLOW)		hsv[0]+= 0.28;
+		
+		if(hsv[0]>1.0) hsv[0]-=1.0; else if(hsv[0]<0.0) hsv[0]+= 1.0;
+		hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);
+		col[0] = (char)(rgb[0]*255); col[1] = (char)(rgb[1]*255); col[2] = (char)(rgb[2]*255); 
+		break;
+		
 	case SEQ_PLUGIN:
-		return 0x906000;
+		BIF_GetThemeColor3ubv(TH_SEQ_PLUGIN, col);
+		break;
 	case SEQ_HD_SOUND:
-		if(seq->flag & SEQ_MUTE) return 0x707060; else return 0x787850;
 	case SEQ_RAM_SOUND:
-		if(seq->flag & SEQ_MUTE) return 0x707060; else return 0x787850;
+		BIF_GetThemeColor3ubv(TH_SEQ_AUDIO, col);
+		blendcol[0] = blendcol[1] = blendcol[2] = 128;
+		if(seq->flag & SEQ_MUTE) BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20);
+		break;
 	default:
-		return 0x906060;
+		col[0] = 10; col[1] = 255; col[2] = 40;
 	}
-
 }
+
 static void drawmeta_contents(Sequence *seqm, float x1, float y1, float x2, float y2)
 {
 	Sequence *seq;
 	float dx;
 	int nr;
-
+	char col[3];
+	
 	nr= 0;
 	WHILE_SEQ(&seqm->seqbase) {
 		nr++;
@@ -196,9 +230,17 @@ static void drawmeta_contents(Sequence *seqm, float x1, float y1, float x2, floa
 	dx= (x2-x1)/nr;
 
 	WHILE_SEQ(&seqm->seqbase) {
-		cpack(seq_color(seq));
+		get_seq_color3ubv(seq, col);
+		
+		glColor3ubv(col);
+
 		glRectf(x1,  y1,  x1+0.9*dx,  y2);
-		EmbossBoxf(x1, y1, x1+0.9*dx, y2, 0, 0x404040, 0xB0B0B0);
+		
+		BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -30);
+		glColor3ubv(col);
+
+		fdrawbox(x1,  y1,  x1+0.9*dx,  y2);
+		
 		x1+= dx;
 	}
 	END_SEQ
@@ -292,83 +334,358 @@ static void drawseqwave(Sequence *seq, float x1, float y1, float x2, float y2, i
 	glEnd();
 }
 
-/*
-Draw a sequencer block, bounds check alredy made
-ScrArea is currently only used to get the windows width in pixels
-so wave file sample drawing precission is zoom adjusted
-*/
-void drawseq(Sequence *seq, ScrArea *sa)
+/* draw a handle, for each end of a sequence strip */
+static void draw_seq_handle(Sequence *seq, SpaceSeq *sseq, short direction)
 {
-	float v1[2], v2[2], x1, x2, y1, y2, color_tint[4];
-	unsigned int body, dark, light;
-	int len, size;
-	short mval[2];
-	char str[120], *strp;
-
+	float v1[2], v2[2], v3[2], rx1=0, rx2=0; //for triangles and rect
+	float x1, x2, y1, y2;
+	float pixelx;
+	float handsize;
+	float minhandle, maxhandle;
+	char str[120];
+	unsigned int whichsel=0;
+	View2D *v2d;
+	
+	x1= seq->startdisp;
+	x2= seq->enddisp;
+	
+	y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
+	y2= seq->machine+SEQ_STRIP_OFSTOP;
+	
+	v2d = &sseq->v2d;
+	pixelx = (v2d->cur.xmax - v2d->cur.xmin)/(v2d->mask.xmax - v2d->mask.xmin);
+	
+	/* clamp handles to defined size in pixel space */
+	handsize = seq->handsize;
+	minhandle = 7;
+	maxhandle = 28;
+	CLAMP(handsize, minhandle*pixelx, maxhandle*pixelx);
+	
+	/* set up co-ordinates/dimensions for either left or right handle */
+	if (direction == SEQ_LEFTHANDLE) {	
+		rx1 = x1;
+		rx2 = x1+handsize*0.75;
+		
+		v1[0]= x1+handsize/4; v1[1]= y1+( ((y1+y2)/2.0 - y1)/2);
+		v2[0]= x1+handsize/4; v2[1]= y2-( ((y1+y2)/2.0 - y1)/2);
+		v3[0]= v2[0] + handsize/4; v3[1]= (y1+y2)/2.0;
+		
+		whichsel = SEQ_LEFTSEL;
+	} else if (direction == SEQ_RIGHTHANDLE) {	
+		rx1 = x2-handsize*0.75;
+		rx2 = x2;
+		
+		v1[0]= x2-handsize/4; v1[1]= y1+( ((y1+y2)/2.0 - y1)/2);
+		v2[0]= x2-handsize/4; v2[1]= y2-( ((y1+y2)/2.0 - y1)/2);
+		v3[0]= v2[0] - handsize/4; v3[1]= (y1+y2)/2.0;
+		
+		whichsel = SEQ_RIGHTSEL;
+	}
+	
+	/* draw! */
+	if(seq->type < SEQ_EFFECT) {
+		glEnable( GL_BLEND );
+		
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		
+		if(seq->flag & whichsel) glColor4ub(0, 0, 0, 80);
+		else if (seq->flag & SELECT) glColor4ub(255, 255, 255, 30);
+		else glColor4ub(0, 0, 0, 22);
+		
+		glRectf(rx1, y1, rx2, y2);
+		
+		if(seq->flag & whichsel) glColor4ub(255, 255, 255, 200);
+		else glColor4ub(0, 0, 0, 50);
+		
+		glEnable( GL_POLYGON_SMOOTH );
+		glBegin(GL_TRIANGLES);
+		glVertex2fv(v1); glVertex2fv(v2); glVertex2fv(v3);
+		glEnd();
+		
+		glDisable( GL_POLYGON_SMOOTH );
+		glDisable( GL_BLEND );
+	}
+	
+	if(G.moving || (seq->flag & whichsel)) {
+		cpack(0xFFFFFF);
+		if (direction == SEQ_LEFTHANDLE) {
+			sprintf(str, "%d", seq->startdisp);
+			glRasterPos3f(rx1,  y1-0.15, 0.0);
+		} else {
+			sprintf(str, "%d", seq->enddisp - 1);
+			glRasterPos3f((x2-BMF_GetStringWidth(G.font, str)*pixelx),  y2+0.05, 0.0);
+		}
+		BMF_DrawString(G.font, str);
+	}	
+}
 
-	if(seq->startdisp > seq->enddisp) body= 0x707070;
+static void draw_seq_extensions(Sequence *seq, SpaceSeq *sseq)
+{
+	float x1, x2, y1, y2, pixely, a;
+	char col[3], blendcol[3];
+	View2D *v2d;
+	
+	if(seq->type >= SEQ_EFFECT) return;
 
-	body= seq_color(seq);
-	dark= 0x202020;
-	light= 0xB0B0B0;
+	x1= seq->startdisp;
+	x2= seq->enddisp;
+	
+	y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
+	y2= seq->machine+SEQ_STRIP_OFSTOP;
+	
+	v2d = &sseq->v2d;
+	pixely = (v2d->cur.ymax - v2d->cur.ymin)/(v2d->mask.ymax - v2d->mask.ymin);
+	
+	blendcol[0] = blendcol[1] = blendcol[2] = 120;
 
-	if(G.moving && (seq->flag & SELECT)) {
-		if(seq->flag & SEQ_OVERLAP) dark= light= 0x4040FF;
-		else {
-			if(seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL));
-			else dark= light= 0xFFFFFF;
+	if(seq->startofs) {
+		glEnable( GL_BLEND );
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		
+		get_seq_color3ubv(seq, col);
+		
+		if (seq->flag & SELECT) {
+			BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3, -40);
+			glColor4ub(col[0], col[1], col[2], 170);
+		} else {
+			BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6, 0);
+			glColor4ub(col[0], col[1], col[2], 110);
 		}
-	}
+		
+		glRectf((float)(seq->start), y1-SEQ_STRIP_OFSBOTTOM, x1, y1);
+		
+		if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
+		else glColor4ub(col[0], col[1], col[2], 160);
 
-	/* body */
-	if(seq->startstill) x1= seq->start;
-	else x1= seq->startdisp;
-	y1= seq->machine+0.2;
-	if(seq->endstill) x2= seq->start+seq->len;
-	else x2= seq->enddisp;
-	y2= seq->machine+0.8;
+		fdrawbox((float)(seq->start), y1-SEQ_STRIP_OFSBOTTOM, x1, y1);	//outline
+		
+		glDisable( GL_BLEND );
+	}
+	if(seq->endofs) {
+		glEnable( GL_BLEND );
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		
+		get_seq_color3ubv(seq, col);
+		
+		if (seq->flag & SELECT) {
+			BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.3, -40);
+			glColor4ub(col[0], col[1], col[2], 170);
+		} else {
+			BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.6, 0);
+			glColor4ub(col[0], col[1], col[2], 110);
+		}
+		
+		glRectf(x2, y2, (float)(seq->start+seq->len), y2+SEQ_STRIP_OFSBOTTOM);
+		
+		if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
+		else glColor4ub(col[0], col[1], col[2], 160);
 
-	cpack(body);
-	glRectf(x1,  y1,  x2,  y2);
-	if (seq->type == SEQ_RAM_SOUND) drawseqwave(seq, x1, y1, x2, y2, sa->winx);
-	EmbossBoxf(x1, y1, x2, y2, seq->flag & 1, dark, light);
+		fdrawbox(x2, y2, (float)(seq->start+seq->len), y2+SEQ_STRIP_OFSBOTTOM);	//outline
+		
+		glDisable( GL_BLEND );
+	}
+	if(seq->startstill) {
+		get_seq_color3ubv(seq, col);
+		BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
+		glColor3ubv(col);
+		
+		draw_shadedstrip(seq, col, x1, y1, (float)(seq->start), y2);
+		
+		/* feint pinstripes, helps see exactly which is extended and which isn't,
+		* especially when the extension is very small */ 
+		if (seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 24);
+		else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -16);
+		
+		glColor3ubv(col);
+		
+		for(a=y1; a< y2; a+= pixely*2.0 ) {
+			fdrawline(x1,  a,  (float)(seq->start),  a);
+		}
+	}
+	if(seq->endstill) {
+		get_seq_color3ubv(seq, col);
+		BIF_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
+		glColor3ubv(col);
+		
+		draw_shadedstrip(seq, col, (float)(seq->start+seq->len), y1, x2, y2);
+		
+		/* feint pinstripes, helps see exactly which is extended and which isn't,
+		* especially when the extension is very small */ 
+		if (seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 24);
+		else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -16);
+		
+		glColor3ubv(col);
+		
+		for(a=y1; a< y2; a+= pixely*2.0 ) {
+			fdrawline((float)(seq->start+seq->len),  a,  x2,  a);
+		}
+	}
+}
 
+/* draw info text on a sequence strip */
+static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2)
+{
+	float v1[2], v2[2];
+	int len, size;
+	char str[120], *strp;
+	short mval[2];
+	
 	v1[1]= y1;
 	v2[1]= y2;
-	if(seq->type < SEQ_EFFECT) {
-
-		/* decoration: the bars */
-		x1= seq->startdisp;
-		x2= seq->enddisp;
-
-		if(seq->startofs) {
-			cpack(0x707070);
-			glRectf((float)(seq->start),  y1-0.2,  x1,  y1);
-			EmbossBoxf((float)(seq->start), y1-0.2, x1, y1, seq->flag & 1, dark, light);
+	
+	v1[0]= x1;
+	ipoco_to_areaco_noclip(G.v2d, v1, mval);
+	x1= mval[0];
+	v2[0]= x2;
+	ipoco_to_areaco_noclip(G.v2d, v2, mval);
+	x2= mval[0];
+	size= x2-x1;
+	
+	if(seq->name[2]) {
+		sprintf(str, "%d | %s: %s", seq->len, give_seqname(seq), seq->name+2);
+	}else{
+		if(seq->type == SEQ_META) {
+			sprintf(str, "%d | %s", seq->len, give_seqname(seq));
 		}
-		if(seq->endofs) {
-			cpack(0x707070);
-			glRectf(x2,  y2,  (float)(seq->start+seq->len),  y2+0.2);
-			EmbossBoxf(x2, y2, (float)(seq->start+seq->len), y2+0.2, seq->flag & 1, dark, light);
+		else if(seq->type == SEQ_SCENE) {
+			if(seq->scene) sprintf(str, "%d | %s: %s", seq->len, give_seqname(seq), seq->scene->id.name+2);
+			else sprintf(str, "%d | %s", seq->len, give_seqname(seq));
+			
 		}
-
-		if(seq->startstill) {
-			cpack(body);
-			glRectf(x1,  y1+0.1,  (float)(seq->start),  y1+0.5);
-			no_rightbox= 1;
-			EmbossBoxf(x1, y1+0.1, (float)(seq->start), y1+0.5, seq->flag & 1, dark, light);
-			no_rightbox= 0;
+		else if(seq->type == SEQ_IMAGE) {
+			sprintf(str, "%d | %s%s", seq->len, seq->strip->dir, seq->strip->stripdata->name);
+		}
+		else if(seq->type & SEQ_EFFECT) {
+			if(seq->seq3!=seq->seq2 && seq->seq1!=seq->seq3)
+				sprintf(str, "%d | %s: %d>%d (use %d)", seq->len, give_seqname(seq), seq->seq1->machine, seq->seq2->machine, seq->seq3->machine);
+			else
+				sprintf(str, "%d | %s: %d>%d", seq->len, give_seqname(seq), seq->seq1->machine, seq->seq2->machine);
+		}
+		else if (seq->type == SEQ_RAM_SOUND) {
+			sprintf(str, "%d | %s", seq->len, seq->strip->stripdata->name);
 		}
-		if(seq->endstill) {
-			cpack(body);
-			glRectf((float)(seq->start+seq->len),  y1+0.1,  x2,  y1+0.5);
-			no_leftbox= 1;
-			EmbossBoxf((float)(seq->start+seq->len), y1+0.1, x2, y1+0.5, seq->flag & 1, dark, light);
-			no_leftbox= 0;
+		else if (seq->type == SEQ_HD_SOUND) {
+			sprintf(str, "%d | %s", seq->len, seq->strip->stripdata->name);
 		}
+		else if (seq->type == SEQ_MOVIE) {
+			sprintf(str, "%d | %s%s", seq->len, seq->strip->dir, seq->strip->stripdata->name);
+		}
+	}
+	
+	strp= str;
+	
+	while( (len= BMF_GetStringWidth(G.font, strp)) > size) {
+		if(len < 10) break;
+		if(strp[1]==0) break;
+		strp++;
+	}
+	
+	mval[0]= (x1+x2-len+1)/2;
+	mval[1]= 1;
+	areamouseco_to_ipoco(G.v2d, mval, &x1, &x2);
+	
+	if(seq->flag & SELECT) cpack(0xFFFFFF);
+	else cpack(0);
+	glRasterPos3f(x1,  y1+SEQ_STRIP_OFSBOTTOM, 0.0);
+	BMF_DrawString(G.font, strp);
+}
 
+/* draws a shaded strip, made from gradient + flat colour + gradient */
+static void draw_shadedstrip(Sequence *seq, char *col, float x1, float y1, float x2, float y2)
+{
+	float ymid1, ymid2;
+	
+	ymid1 = (y2-y1)*0.25 + y1;
+	ymid2 = (y2-y1)*0.65 + y1;
+	
+	glShadeModel(GL_SMOOTH);
+	glBegin(GL_QUADS);
+	
+	if(seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -50);
+	else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 0);
+	
+	glColor3ubv(col);
+	
+	glVertex2f(x1,y1);
+	glVertex2f(x2,y1);
+	
+	if(seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5);
+	else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -5);
+
+	glColor3ubv(col);
+	
+	glVertex2f(x2,ymid1);
+	glVertex2f(x1,ymid1);
+	
+	glEnd();
+	
+	glRectf(x1,  ymid1,  x2,  ymid2);
+	
+	glBegin(GL_QUADS);
+	
+	glVertex2f(x1,ymid2);
+	glVertex2f(x2,ymid2);
+	
+	if(seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -15);
+	else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 25);
+	
+	glColor3ubv(col);
+	
+	glVertex2f(x2,y2);
+	glVertex2f(x1,y2);
+	
+	glEnd();
+	
+}
+
+/*
+Draw a sequence strip, bounds check alredy made
+ScrArea is currently only used to get the windows width in pixels
+so wave file sample drawing precission is zoom adjusted
+*/
+static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq)
+{
+	float x1, x2, y1, y2;
+	char col[3];
+
+	/* body */
+	if(seq->startstill) x1= seq->start;
+	else x1= seq->startdisp;
+	y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
+	if(seq->endstill) x2= seq->start+seq->len;
+	else x2= seq->enddisp;
+	y2= seq->machine+SEQ_STRIP_OFSTOP;
+	
+	
+	/* get the correct colour per strip type*/
+	get_seq_color3ubv(seq, col);
+	
+	/* draw the main strip body */
+	draw_shadedstrip(seq, col, x1, y1, x2, y2);
+	
+	/* draw additional info and controls */
+	if (seq->type == SEQ_RAM_SOUND) drawseqwave(seq, x1, y1, x2, y2, sa->winx);
+	draw_seq_extensions(seq, sseq);
+	draw_seq_handle(seq, sseq, SEQ_LEFTHANDLE);
+	draw_seq_handle(seq, sseq, SEQ_RIGHTHANDLE);
+	
+	/* draw the strip outline */
+	x1= seq->startdisp;
+	x2= seq->enddisp;
+	
+	get_seq_color3ubv(seq, col);
+	if (G.moving && (seq->flag & SELECT)) {
+		if(seq->flag & SEQ_OVERLAP) {
+			col[0]= 255; col[1]= col[2]= 40;
+		} else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 120);
 	}
+	else if (seq->flag & SELECT) BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -150);
+	else BIF_GetColorPtrBlendShade3ubv(col, col, col, 0.0, -60);
 
+	glColor3ubv(col);
+	gl_round_box_shade(GL_LINE_LOOP, x1, y1, x2, y2, 0.0, 0.1, 0.0);
+
+	
 	/* calculate if seq is long enough to print a name */
 	x1= seq->startdisp+seq->handsize;
 	x2= seq->enddisp-seq->handsize;
@@ -376,171 +693,16 @@ void drawseq(Sequence *seq, ScrArea *sa)
 	/* but first the contents of a meta */
 	if(seq->type==SEQ_META) drawmeta_contents(seq, x1, y1+0.15, x2, y2-0.15);
 
+	/* info text on the strip */
 	if(x1<G.v2d->cur.xmin) x1= G.v2d->cur.xmin;
 	else if(x1>G.v2d->cur.xmax) x1= G.v2d->cur.xmax;
 	if(x2<G.v2d->cur.xmin) x2= G.v2d->cur.xmin;
 	else if(x2>G.v2d->cur.xmax) x2= G.v2d->cur.xmax;
 
 	if(x1 != x2) {
-		v1[0]= x1;
-		ipoco_to_areaco_noclip(G.v2d, v1, mval);
-		x1= mval[0];
-		v2[0]= x2;
-		ipoco_to_areaco_noclip(G.v2d, v2, mval);
-		x2= mval[0];
-		size= x2-x1;
-
-		if(seq->name[2]) {
-			sprintf(str, "%s: %s (%d)", give_seqname(seq), seq->name+2, seq->len);
-		}else{
-			if(seq->type == SEQ_META) {
-				sprintf(str, "%d %s", seq->len, give_seqname(seq));
-			}
-			else if(seq->type == SEQ_SCENE) {
-				if(seq->scene) sprintf(str, "%d %s %s", seq->len, give_seqname(seq), seq->scene->id.name+2);
-				else sprintf(str, "%d %s", seq->len, give_seqname(seq));
-
-			}
-			else if(seq->type == SEQ_IMAGE) {
-				sprintf(str, "%d %s%s", seq->len, seq->strip->dir, seq->strip->stripdata->name);
-			}
-			else if(seq->type & SEQ_EFFECT) {
-				if(seq->seq3!=seq->seq2 && seq->seq1!=seq->seq3)
-					sprintf(str, "%d %s: %d-%d (use %d)", seq->len, give_seqname(seq), seq->seq1->machine, seq->seq2->machine, seq->seq3->machine);
-				else
-					sprintf(str, "%d %s: %d-%d", seq->len, give_seqname(seq), seq->seq1->machine, seq->seq2->machine);
-			}
-			else if (seq->type == SEQ_RAM_SOUND) {
-				sprintf(str, "%d %s", seq->len, seq->strip->stripdata->name);
-			}
-			else if (seq->type == SEQ_HD_SOUND) {
-				sprintf(str, "%d %s", seq->len, seq->strip->stripdata->name);
-			}
-			else if (seq->type == SEQ_MOVIE) {
-				sprintf(str, "%d %s%s", seq->len, seq->strip->dir, seq->strip->stripdata->name);
-			}
-		}
-
-
-		strp= str;
-
-		while( (len= BMF_GetStringWidth(G.font, strp)) > size) {
-			if(len < 10) break;
-			if(strp[1]==0) break;
-			strp++;
-		}
-
-		mval[0]= (x1+x2-len+1)/2;
-		mval[1]= 1;
-		areamouseco_to_ipoco(G.v2d, mval, &x1, &x2);
-
-		if(seq->flag & SELECT) cpack(0xFFFFFF);
-		else cpack(0x0);
-		glRasterPos3f(x1,  y1+0.2, 0.0);
-		BMF_DrawString(G.font, strp);
+		draw_seq_text(seq, x1, x2, y1, y2);
 	}
-	
-
-	
-	if(seq->type < SEQ_EFFECT) {
-		/* decoration: triangles */
-		x1= seq->startdisp;
-		x2= seq->enddisp;
-
-		body+= 0x101010;
-		dark= 0x202020;
-		light= 0xB0B0B0;
-
-		/* left triangle */
-		if(seq->flag & SEQ_LEFTSEL) {
-			cpack(body+0x20);
-			if(G.moving) {
-				if(seq->flag & SEQ_OVERLAP) dark= light= 0x4040FF;
-				else dark= light= 0xFFFFFF;
-			}
-		} else {
-			cpack(body);
-		}
-	
-		/*Tint the color for wave display to show through */
-		if (seq->type == SEQ_RAM_SOUND) {
-			glEnable( GL_BLEND );
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glGetFloatv(GL_CURRENT_COLOR, color_tint);
-			glColor4f(color_tint[0], color_tint[1], color_tint[2], 0.7);
-		}
-		
-		glBegin(GL_TRIANGLES);
-			v1[0]= x1; glVertex2fv(v1);
-			v2[0]= x1; glVertex2fv(v2);
-			v2[0]+= seq->handsize; v2[1]= (y1+y2)/2.0; glVertex2fv(v2); v2[1]= y2;
-		glEnd();
-
-		cpack(light);
-		glBegin(GL_LINE_STRIP);
-			v1[0]= x1; glVertex2fv(v1);
-			v2[0]= x1; glVertex2fv(v2);
-			v2[0]+= seq->handsize; v2[1]= (y1+y2)/2.0; glVertex2fv(v2); v2[1]= y2;
-			cpack(dark);
-			glVertex2fv(v1);
-		glEnd();
-	}
-
-
-		/* right triangle */
-	if(seq->type < SEQ_EFFECT) {
-		dark= 0x202020;
-		light= 0xB0B0B0;
-
-		if(seq->flag & SEQ_RIGHTSEL) {
-			cpack(body+0x20);
-			if(G.moving) {
-				if(seq->flag & SEQ_OVERLAP) dark= light= 0x4040FF;
-				else dark= light= 0xFFFFFF;
-			}
-		}
-		else {
-			cpack(body);
-		}
-		/*Tint the color for wave display to show through */
-		if (seq->type == SEQ_RAM_SOUND) {
-			glGetFloatv(GL_CURRENT_COLOR, color_tint);
-			glColor4f(color_tint[0], color_tint[1], color_tint[2], 0.7);
-		}
-		
-		glBegin(GL_TRIANGLES);
-			v2[0]= x2; glVertex2fv(v2);
-			v1[0]= x2; glVertex2fv(v1);
-			v2[0]-= seq->handsize; v2[1]= (y1+y2)/2.0; glVertex2fv(v2); v2[1]= y2;
-		glEnd();
 		
-		if (seq->type == SEQ_RAM_SOUND)
-			glDisable( GL_BLEND );
-
-		cpack(dark);
-		glBegin(GL_LINE_STRIP);
-			v2[0]= x2; glVertex2fv(v2);
-			v1[0]= x2; glVertex2fv(v1);
-			v1[0]-= seq->handsize; v1[1]= (y1+y2)/2.0; glVertex2fv(v1); v1[1]= y2;
-			cpack(light);
-			glVertex2fv(v2);
-		glEnd();
-	}
-	
-	
-	if(G.moving || (seq->flag & SEQ_LEFTSEL)) {
-		cpack(0xFFFFFF);
-		glRasterPos3f(x1,  y1+0.2, 0.0);
-		sprintf(str, "%d", seq->startdisp);
-		BMF_DrawString(G.font, str);
-	}
-	
-	if(G.moving || (seq->flag & SEQ_RIGHTSEL)) {
-		cpack(0xFFFFFF);
-		glRasterPos3f(x2-seq->handsize/2,  y1+0.2, 0.0);
-		sprintf(str, "%d", seq->enddisp-1);
-		BMF_DrawString(G.font, str);
-	}
 }
 
 static Sequence *special_seq_update= 0;
@@ -612,8 +774,8 @@ static void draw_image_seq(ScrArea *sa)
 	}
 
 	/* calc location */
-	x1= (sa->winx-zoom*ibuf->x)/2;
-	y1= (sa->winy-zoom*ibuf->y)/2;
+	x1= (sa->winx-zoom*ibuf->x)/2 + sseq->xof;
+	y1= (sa->winy-zoom*ibuf->y)/2 + sseq->yof;
 
 	/* needed for gla draw */
 	glaDefine2DArea(&curarea->winrct);
@@ -674,7 +836,7 @@ static void draw_extra_seqinfo(void)
 		/* CURRENT */
 		se= (StripElem *)give_stripelem(last_seq,  (G.scene->r.cfra));
 		if(se) {
-			sprintf(str, "cur: %s", se->name);
+			sprintf(str, "Cur: %s", se->name);
 			glRasterPos3f(xco,  0.3, 0.0);
 			BMF_DrawString(G.font, str);
 			xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac;
@@ -688,7 +850,7 @@ static void draw_extra_seqinfo(void)
 			if(last_seq->startofs) se+= last_seq->startofs;
 			if(last_seq->endofs) last-= last_seq->endofs;
 
-			sprintf(str, "First: %s at %d     Last: %s at %d", se->name, last_seq->startdisp, last->name, last_seq->enddisp-1);
+			sprintf(str, "First: %s at %d   Last: %s at %d", se->name, last_seq->startdisp, last->name, last_seq->enddisp-1);
 			glRasterPos3f(xco,  0.3, 0.0);
 			BMF_DrawString(G.font, str);
 			xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac;
@@ -705,7 +867,7 @@ static void draw_extra_seqinfo(void)
 		sta= last_seq->startofs;
 		end= last_seq->len-1-last_seq->endofs;
 
-		sprintf(str, "%s   %s%s  First: %d at %d     Last: %d at %d     Cur: %d",
+		sprintf(str, "%s   %s%s  First: %d at %d   Last: %d at %d   Cur: %d",
 				last_seq->name+2, last_seq->strip->dir, last_seq->strip->stripdata->name,
 				sta, last_seq->startdisp, end, last_seq->enddisp-1,  (G.scene->r.cfra)-last_seq->startdisp);
 
@@ -718,7 +880,7 @@ static void draw_extra_seqinfo(void)
 		sta= last_seq->startofs;
 		end= last_seq->len-1-last_seq->endofs;
 
-		sprintf(str, "%s   %s%s  First: %d at %d     Last: %d at %d     Cur: %d     Gain: %.2f dB     Pan: %.2f",
+		sprintf(str, "%s   %s%s  First: %d at %d   Last: %d at %d   Cur: %d   Gain: %.2f dB   Pan: %.2f",
 				last_seq->name+2, last_seq->strip->dir, last_seq->strip->stripdata->name,
 				sta, last_seq->startdisp, end, last_seq->enddisp-1,  (G.scene->r.cfra)-last_seq->startdisp,
 				last_seq->level, last_seq->pan);
@@ -728,6 +890,52 @@ static void draw_extra_seqinfo(void)
 	}
 }
 
+void seq_reset_imageofs(SpaceSeq *sseq)
+{
+	sseq->xof = sseq->yof = sseq->zoom = 0;
+}
+
+void seq_viewmove(SpaceSeq *sseq)
+{	
+	ScrArea *sa;
+	short mval[2], mvalo[2];
+	short rectx, recty, xmin, xmax, ymin, ymax, pad;
+	
+	sa = sseq->area;
+	rectx= (G.scene->r.size*G.scene->r.xsch)/100;
+	recty= (G.scene->r.size*G.scene->r.ysch)/100;
+	
+	pad = 10;
+	xmin = -(sa->winx/2) - rectx/2 + pad;
+	xmax = sa->winx/2 + rectx/2 - pad;
+	ymin = -(sa->winy/2) - recty/2 + pad;
+	ymax = sa->winy/2 + recty/2 - pad;
+	
+	getmouseco_sc(mvalo);
+
+	while(get_mbut()&(L_MOUSE|M_MOUSE)) {
+		
+		getmouseco_sc(mval);
+		
+		if(mvalo[0]!=mval[0] || mvalo[1]!=mval[1]) {
+
+			sseq->xof -= (mvalo[0]-mval[0]);
+			sseq->yof -= (mvalo[1]-mval[1]);
+			
+			/* prevent dragging image outside of the window and losing it! */
+			CLAMP(sseq->xof, xmin, xmax);
+			CLAMP(sseq->yof, ymin, ymax);
+			
+			mvalo[0]= mval[0];
+			mvalo[1]= mval[1];
+			
+			scrarea_do_windraw(curarea);
+			screen_swapbuffers();
+		}
+		else BIF_wait_for_statechange();
+	}
+}
+
 #define SEQ_BUT_PLUGIN	1
 #define SEQ_BUT_RELOAD	2
 #define SEQ_BUT_EFFECT	3
@@ -929,6 +1137,7 @@ void drawseqspace(ScrArea *sa, void *spacedata)
 	Sequence *seq;
 	float col[3];
 	int ofsx, ofsy;
+	int i;
 
 	ed= G.scene->ed;
 
@@ -967,29 +1176,8 @@ void drawseqspace(ScrArea *sa, void *spacedata)
 	boundbox_seq();
 	calc_ipogrid();
 	
-	
-	/*Draw Track Gradients  Comment out for now do somthing more subtle
-	start drawing gradients at the bottom of the screen.*/
-	/*
-	i= MAX2(1, ((int)v2d->cur.ymin)-1); 
-	glShadeModel(GL_SMOOTH);
-	glBegin(GL_QUADS);
-	while (i<v2d->cur.ymax) {
-		BIF_ThemeColorShade(TH_BACK, 0);
-		glVertex2f(v2d->cur.xmax, i);
-		glVertex2f(v2d->cur.xmin, i);
-		BIF_ThemeColorShade(TH_BACK, 30);
-		glVertex2f(v2d->cur.xmin, i+1);
-		glVertex2f(v2d->cur.xmax, i+1);
-		i+=1.0;
-	}
-	glEnd();
-	glShadeModel(GL_FLAT);
-	*/ /* End Draw Track Gradients */
-	
-	
-	/* Quad Stripes ?*/
-	/*i= MAX2(1, ((int)v2d->cur.ymin)-1);
+	i= MAX2(1, ((int)G.v2d->cur.ymin)-1);
+
 	glBegin(GL_QUADS);
 	while (i<v2d->cur.ymax) {
 		if (((int)i) & 1)
@@ -1003,19 +1191,20 @@ void drawseqspace(ScrArea *sa, void *spacedata)
 		glVertex2f(v2d->cur.xmax, i+1);
 		i+=1.0;
 	}
-	glEnd();*/
+	glEnd();
 	
-	/* Force grid lines instead - Hangs on andys pc... will look at later */
-	/*
+	/* Force grid lines */
+	i= MAX2(1, ((int)G.v2d->cur.ymin)-1);
 	glBegin(GL_LINES);
-	while (i<v2d->cur.ymax) {
-		BIF_ThemeColorShade(TH_BACK, -40);
-		glVertex2f(v2d->cur.xmax, i);
-		glVertex2f(v2d->cur.xmin, i);
+
+	while (i<G.v2d->cur.ymax) {
+		BIF_ThemeColor(TH_GRID);
+		glVertex2f(G.v2d->cur.xmax, i);
+		glVertex2f(G.v2d->cur.xmin, i);
 		i+=1.0;
 	}
 	glEnd();
-	*/
+	
 	
 	draw_ipogrid();
 	draw_cfra_seq();
@@ -1033,7 +1222,7 @@ void drawseqspace(ScrArea *sa, void *spacedata)
 			{
 				/* dont draw */
 			} else {
-				drawseq(seq, sa);
+				draw_seq_strip(seq, sa, sseq);
 			}
 			seq= seq->next;
 		}
@@ -1050,7 +1239,7 @@ void drawseqspace(ScrArea *sa, void *spacedata)
 			{
 				/* dont draw */
 			} else {
-				drawseq(seq, sa);
+				draw_seq_strip(seq, sa, sseq);
 			}
 			seq= seq->next;
 		}
diff --git a/source/blender/src/header_seq.c b/source/blender/src/header_seq.c
index fe392d3a2da..5b11da9ba15 100644
--- a/source/blender/src/header_seq.c
+++ b/source/blender/src/header_seq.c
@@ -53,6 +53,7 @@
 #include "DNA_space_types.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BIF_drawseq.h"
 #include "BIF_interface.h"
 #include "BIF_resources.h"
 #include "BIF_screen.h"
@@ -436,15 +437,20 @@ static uiBlock *seq_editmenu(void *arg_unused)
 void do_seq_buttons(short event)
 {
 	Editing *ed;
-
+	SpaceSeq *sseq= curarea->spacedata.first;
+	
 	ed= G.scene->ed;
 	if(ed==0) return;
-
+	
 	switch(event) {
 	case B_SEQHOME:
-		G.v2d->cur= G.v2d->tot;
-		test_view2d(G.v2d, curarea->winx, curarea->winy);
-		view2d_do_locks(curarea, V2D_LOCK_COPY);
+		if(sseq->mainb)
+			seq_reset_imageofs(sseq);
+		else {
+			G.v2d->cur= G.v2d->tot;
+			test_view2d(G.v2d, curarea->winx, curarea->winy);
+			view2d_do_locks(curarea, V2D_LOCK_COPY);
+		}
 		scrarea_queue_winredraw(curarea);
 		break;
 	case B_SEQCLEAR:
@@ -514,15 +520,6 @@ void seq_buttons()
 		uiBlockSetEmboss(block, UI_EMBOSS);
 	}
 
-	/* CHANNEL shown in 3D preview */
-	uiDefButS(block, NUM, B_REDR, "C",
-		  xco += XIC, 0, 3.5 * XIC,YIC,
-		  &sseq->chanshown, 0, MAXSEQ, 0, 0,
-		  "Channel shown in 3D preview. Click to change.");
-
-	xco+= 8;
-	xco += 3.5*XIC;
-
 	/* IMAGE */
 	uiDefIconTextButS(block, ICONTEXTROW,B_REDR, ICON_SEQ_SEQUENCER, 
 			  "Image Preview: %t" 
@@ -533,11 +530,24 @@ void seq_buttons()
 			  xco,0,XIC+10,YIC, &sseq->mainb, 0.0, 3.0, 
 			  0, 0, 
 			  "Shows the sequence output image preview");
-	xco+=10;
+	
+	xco+= 8 + XIC+10;
+	
+	/* CHANNEL shown in 3D preview */
+	if(sseq->mainb) {
+		uiDefButS(block, NUM, B_REDR, "Chan:",
+		xco, 0, 3.5 * XIC,YIC,
+		&sseq->chanshown, 0, MAXSEQ, 0, 0,
+		"The channel number shown in the image preview. 0 is the result of all strips combined.");
+		
+		xco+= 8 + XIC*3.5;
+	}
+
+	
 	/* ZOOM and BORDER */
-	xco+= 16;
+	xco+= 8;
 	uiBlockBeginAlign(block);
-	uiDefIconButI(block, TOG, B_VIEW2DZOOM, ICON_VIEWZOOM,	xco+=XIC,0,XIC,YIC, &viewmovetemp, 0, 0, 0, 0, "Zooms view in and out (Ctrl MiddleMouse)");
+	uiDefIconButI(block, TOG, B_VIEW2DZOOM, ICON_VIEWZOOM,	xco,0,XIC,YIC, &viewmovetemp, 0, 0, 0, 0, "Zooms view in and out (Ctrl MiddleMouse)");
 	uiDefIconBut(block, BUT, B_IPOBORDER, ICON_BORDERMOVE,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Zooms view to fit area");
 	uiBlockEndAlign(block);
 
diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c
index 281c3abf78e..1df46f4e50b 100644
--- a/source/blender/src/interface_draw.c
+++ b/source/blender/src/interface_draw.c
@@ -188,10 +188,10 @@ static void ui_draw_icon(uiBut *but, BIFIconID icon)
 			xs= but->x1+1.0;
 		}
 		else if ((but->type==ICONROW) || (but->type==ICONTEXTROW)) {
-			xs= but->x1+4.0;
+			xs= but->x1+3.0;
 		}
 		else {
-			xs= but->x1+6.0;
+			xs= but->x1+4.0;
 		}
 		ys= (but->y1+but->y2- height)/2.0;
 	}
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c
index 443c4b62a41..6fc2f28f76b 100644
--- a/source/blender/src/resources.c
+++ b/source/blender/src/resources.c
@@ -290,6 +290,23 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
 			case TH_NODE_GROUP:
 				cp= ts->syntaxc; break;
 				
+			case TH_SEQ_MOVIE:
+				cp= ts->movie; break;
+			case TH_SEQ_IMAGE:
+				cp= ts->image; break;
+			case TH_SEQ_SCENE:
+				cp= ts->scene; break;
+			case TH_SEQ_AUDIO:
+				cp= ts->audio; break;
+			case TH_SEQ_EFFECT:
+				cp= ts->effect; break;
+			case TH_SEQ_PLUGIN:
+				cp= ts->plugin; break;
+			case TH_SEQ_TRANSITION:
+				cp= ts->transition; break;
+			case TH_SEQ_META:
+				cp= ts->meta; break;
+				
 			}
 
 		}
@@ -437,7 +454,16 @@ void BIF_InitTheme(void)
 	
 	/* space seq */
 	btheme->tseq= btheme->tv3d;
-	SETCOL(btheme->tnla.back, 	116, 116, 116, 255);
+	SETCOL(btheme->tseq.back, 	116, 116, 116, 255);
+	SETCOL(btheme->tseq.movie, 	81, 105, 135, 255);
+	SETCOL(btheme->tseq.image, 	109, 88, 129, 255);
+	SETCOL(btheme->tseq.scene, 	78, 152, 62, 255);
+	SETCOL(btheme->tseq.audio, 	46, 143, 143, 255);
+	SETCOL(btheme->tseq.effect, 	169, 84, 124, 255);
+	SETCOL(btheme->tseq.plugin, 	126, 126, 80, 255);
+	SETCOL(btheme->tseq.transition, 162, 95, 111, 255);
+	SETCOL(btheme->tseq.meta, 	109, 145, 131, 255);
+	
 
 	/* space image */
 	btheme->tima= btheme->tv3d;
@@ -598,6 +624,15 @@ char *BIF_ThemeColorsPup(int spacetype)
 		case SPACE_SEQ:
 			str += sprintf(str, "Grid %%x%d|", TH_GRID);
 			str += sprintf(str, "Window Sliders %%x%d|", TH_SHADE1);
+			str += sprintf(str, "%%l|");
+			str += sprintf(str, "Movie Strip %%x%d|", TH_SEQ_MOVIE);
+			str += sprintf(str, "Image Strip %%x%d|", TH_SEQ_IMAGE);
+			str += sprintf(str, "Scene Strip %%x%d|", TH_SEQ_SCENE);
+			str += sprintf(str, "Audio Strip %%x%d|", TH_SEQ_AUDIO);
+			str += sprintf(str, "Effect Strip %%x%d|", TH_SEQ_EFFECT);
+			str += sprintf(str, "Plugin Strip %%x%d|", TH_SEQ_PLUGIN);
+			str += sprintf(str, "Transition Strip %%x%d|", TH_SEQ_TRANSITION);
+			str += sprintf(str, "Meta Strip %%x%d|", TH_SEQ_META);
 			break;
 		case SPACE_SOUND:
 			str += sprintf(str, "Grid %%x%d|", TH_GRID);
@@ -743,7 +778,6 @@ void BIF_ThemeColorBlendShade(int colorid1, int colorid2, float fac, int offset)
 	glColor3ub(r, g, b);
 }
 
-
 // get individual values, not scaled
 float BIF_GetThemeValuef(int colorid)
 {
@@ -809,3 +843,39 @@ void BIF_GetThemeColorType4ubv(int colorid, int spacetype, char *col)
 	col[2]= cp[2];
 	col[3]= cp[3];
 }
+
+// blends and shades between two char color pointers
+void BIF_ColorPtrBlendShade3ubv(char *cp1, char *cp2, float fac, int offset)
+{
+	int r, g, b;
+	
+	if(fac<0.0) fac=0.0; else if(fac>1.0) fac= 1.0;
+	r= offset+floor((1.0-fac)*cp1[0] + fac*cp2[0]);
+	g= offset+floor((1.0-fac)*cp1[1] + fac*cp2[1]);
+	b= offset+floor((1.0-fac)*cp1[2] + fac*cp2[2]);
+	
+	r= r<0?0:(r>255?255:r);
+	g= g<0?0:(g>255?255:g);
+	b= b<0?0:(b>255?255:b);
+	
+	glColor3ub(r, g, b);
+}
+
+// get a 3 byte color, blended and shaded between two other char color pointers
+void BIF_GetColorPtrBlendShade3ubv(char *cp1, char *cp2, char *col, float fac, int offset)
+{
+	int r, g, b;
+	
+	if(fac<0.0) fac=0.0; else if(fac>1.0) fac= 1.0;
+	r= offset+floor((1.0-fac)*cp1[0] + fac*cp2[0]);
+	g= offset+floor((1.0-fac)*cp1[1] + fac*cp2[1]);
+	b= offset+floor((1.0-fac)*cp1[2] + fac*cp2[2]);
+	
+	r= r<0?0:(r>255?255:r);
+	g= g<0?0:(g>255?255:g);
+	b= b<0?0:(b>255?255:b);
+	
+	col[0] = r;
+	col[1] = g;
+	col[2] = b;
+}
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index d4bae7a6d65..a82cc2a11ee 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -887,6 +887,7 @@ static void do_build_seq_ibuf(Sequence * seq, int cfra)
 				}
 			}
 			else if(seq->type==SEQ_SCENE && se->ibuf==0 && seq->scene) {	// scene can be NULL after deletions
+				int oldcfra = CFRA;
 				Scene *sce= seq->scene, *oldsce= G.scene;
 				Render *re= RE_NewRender(sce->id.name);
 				RenderResult rres;
@@ -918,6 +919,7 @@ static void do_build_seq_ibuf(Sequence * seq, int cfra)
 				
 				if((G.f & G_PLAYANIM)==0) /* bad, is set on do_render_seq */
 					waitcursor(0);
+				CFRA = oldcfra;
 			}
 			
 			/* size test */
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 16412516a5f..c95c8403208 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -3656,8 +3656,8 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break;
 		case MIDDLEMOUSE:
-			if(sseq->mainb) break;
-			view2dmove(event);	/* in drawipo.c */
+			if(sseq->mainb) seq_viewmove(sseq);
+			else view2dmove(event);	/* in drawipo.c */
 			break;
 		case RIGHTMOUSE:
 			if(sseq->mainb) break;
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 13384c69a52..68a1e08fcce 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -291,6 +291,16 @@ static void init_userdef_file(void)
 				SETCOL(btheme->tv3d.group, 0x10, 0x40, 0x10, 255);
 				SETCOL(btheme->tv3d.group_active, 0x66, 0xFF, 0x66, 255);
 			}
+			if(btheme->tseq.movie[3]==0) {
+				SETCOL(btheme->tseq.movie, 	81, 105, 135, 255);
+				SETCOL(btheme->tseq.image, 	109, 88, 129, 255);
+				SETCOL(btheme->tseq.scene, 	78, 152, 62, 255);
+				SETCOL(btheme->tseq.audio, 	46, 143, 143, 255);
+				SETCOL(btheme->tseq.effect, 	169, 84, 124, 255);
+				SETCOL(btheme->tseq.plugin, 	126, 126, 80, 255);
+				SETCOL(btheme->tseq.transition, 162, 95, 111, 255);
+				SETCOL(btheme->tseq.meta, 	109, 145, 131, 255);
+			}
 		}
 		
 		/* set defaults for 3D View rotating axis indicator */