8 files changed, 107 insertions, 34 deletions
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index a922bea1b19..cbaf66379bf 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -49,13 +49,13 @@ typedef enum {
 	ICON_ACTION,
 	ICON_NLA,
 	ICON_SCRIPTWIN,
-	ICON_VIEWMOVE,
-	ICON_HOME,
-	ICON_CLIPUV_DEHLT,
-	ICON_CLIPUV_HLT,
-	ICON_SOME_WACKY_VERTS_AND_LINES,
-	ICON_A_WACKY_VERT_AND_SOME_LINES,
-	ICON_VPAINT_COL,
+	ICON_TIME,
+	ICON_SPACE1,
+	ICON_SPACE2,
+	ICON_SPACE3,
+	ICON_SPACE4,
+	ICON_SPACE5,
+	ICON_SPACE6,
 
 	ICON_ORTHO,
 	ICON_PERSP,
@@ -66,7 +66,7 @@ typedef enum {
 	ICON_SOLID,
 	ICON_SMOOTH,
 	ICON_POTATO,
-	ICON_BLANK2,
+	ICON_MARKER_HLT,
 	ICON_NORMALVIEW,
 	ICON_LOCALVIEW,
 	ICON_UNUSEDVIEW,
@@ -96,14 +96,13 @@ typedef enum {
 	ICON_ROTATECOLLECTION,
 	ICON_ROTATECENTER,
 	ICON_ALIGN,
-	ICON_BLANK8,
-	ICON_BLANK9,
-	ICON_BLANK10,
-	ICON_BLANK11,
+	ICON_REC,
+	ICON_PLAY,
+	ICON_FF,
+	ICON_REW,
 	ICON_PYTHON,
-	
-
 
+	
 	ICON_DOTSUP,
 	ICON_DOTSDOWN,
 	ICON_MENU_PANEL,
@@ -113,8 +112,8 @@ typedef enum {
 	ICON_DRAW_UVFACES,
 	ICON_STICKY_UVS,
 	ICON_STICKY2_UVS,
-	ICON_BLANK17,
-	ICON_BLANK18,
+	ICON_PREV_KEYFRAME,
+	ICON_NEXT_KEYFRAME,
 	ICON_ENVMAP,
 	ICON_TRANSP_HLT,
 	ICON_TRANSP_DEHLT,
@@ -124,7 +123,7 @@ typedef enum {
 	ICON_TPAINT_HLT,
 	ICON_WPAINT_DEHLT,
 	ICON_WPAINT_HLT,
-	ICON_BLANK21,
+	ICON_MARKER,
 	
 	ICON_X,
 	ICON_GO_LEFT,
@@ -272,14 +271,14 @@ typedef enum {
 	ICON_BLANK52,
 	ICON_BLANK53,
 	ICON_BLANK54,
-	ICON_BLANK55,
-	ICON_BLANK56,
-	ICON_BLANK57,
-	ICON_BLANK58,
-	ICON_BLANK59,
-	ICON_BLANK60,
-	ICON_BLANK61,
-
+	ICON_VIEWMOVE,
+	ICON_HOME,
+	ICON_CLIPUV_DEHLT,
+	ICON_CLIPUV_HLT,
+	ICON_SOME_WACKY_VERTS_AND_LINES,
+	ICON_A_WACKY_VERT_AND_SOME_LINES,
+	ICON_VPAINT_COL,
+	
 	ICON_MAN_TRANS,
 	ICON_MAN_ROT,
 	ICON_MAN_SCALE,
diff --git a/source/blender/include/BIF_spacetypes.h b/source/blender/include/BIF_spacetypes.h
index 393bcca928b..0b07be60129 100644
--- a/source/blender/include/BIF_spacetypes.h
+++ b/source/blender/include/BIF_spacetypes.h
@@ -61,4 +61,5 @@ SpaceType *spacesound_get_type		(void);
 SpaceType *spacetext_get_type		(void);
 SpaceType *spacescript_get_type		(void);
 SpaceType *spaceview3d_get_type		(void);
+SpaceType *spacetime_get_type		(void);
 
diff --git a/source/blender/include/BSE_drawipo.h b/source/blender/include/BSE_drawipo.h
index 656f05a7b43..cd72a147741 100644
--- a/source/blender/include/BSE_drawipo.h
+++ b/source/blender/include/BSE_drawipo.h
@@ -58,6 +58,7 @@ void test_view2d			(struct View2D *v2d, int winx, int winy);
 void calc_scrollrcts		(struct ScrArea *sa, struct View2D *v2d, int winx, int winy);
 
 int in_ipo_buttons(void);
+void draw_view2d_numbers_horiz(int drawframes);
 void drawscroll(int disptype);
 void drawipospace(struct ScrArea *sa, void *spacedata);
 
diff --git a/source/blender/include/BSE_headerbuttons.h b/source/blender/include/BSE_headerbuttons.h
index 562f17609ae..c37349ccd31 100644
--- a/source/blender/include/BSE_headerbuttons.h
+++ b/source/blender/include/BSE_headerbuttons.h
@@ -34,6 +34,7 @@
 #define BSE_HEADERBUTTONS_H
 
 struct uiBlock;
+struct ScrArea;
 struct ID;
 
 /* these used to be in blender/src/headerbuttons.c: */
@@ -85,6 +86,7 @@ void seq_buttons(void);
 void sound_buttons(void);
 void text_buttons(void);
 void script_buttons(void);
+void time_buttons(struct ScrArea *sa);
 void view3d_buttons(void);
 
 void do_global_buttons(unsigned short event);
@@ -103,6 +105,7 @@ void do_oops_buttons(short event);
 void do_seq_buttons(short event);
 void do_sound_buttons(unsigned short event);
 void do_text_buttons(unsigned short event);
+void do_time_buttons(struct ScrArea *sa, unsigned short event);
 void do_script_buttons(unsigned short event);
 void do_view3d_buttons(short event); 
 
diff --git a/source/blender/include/BSE_time.h b/source/blender/include/BSE_time.h
new file mode 100644
index 00000000000..d5acbc728bf
--- /dev/null
+++ b/source/blender/include/BSE_time.h
@@ -0,0 +1,47 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL/BL DUAL 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. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
+
+#ifndef BSE_TIME_H
+#define BSE_TIME_H
+
+
+/* ******** Markers ********* */
+void add_timeline_marker(int frame);
+void remove_timeline_marker(void);
+void rename_timeline_marker(void);
+void select_timeline_markers(void);
+
+void nextprev_timeline_key(short dir);
+
+
+#endif
+
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 5a3e8006e35..6702e49f489 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -37,6 +37,9 @@
 #define MAXFRAME	30000
 #define MAXFRAMEF	30000.0f
 
+#define MINFRAME	1
+#define MINFRAMEF	1.0
+
 #define MAXLAMP		32765
 /* max length material array, 16 because of bits in matfrom */
 #define MAXPICKBUF      10000
@@ -151,6 +154,8 @@
 #define B_TEXALONE		47
 #define B_MESHALONE		48
 #define B_CURVEALONE		49
+#define B_HEMESHALONE	50
+
 /* EVENT < 50: alones en locals */
 
 #define B_KEEPDATA		60
@@ -159,6 +164,7 @@
 #define B_REDRCURW3D		63
 #define B_FLIPINFOMENU		64
 #define B_FLIPFULLSCREEN	65
+#define B_EASYTOOLBOX		66
 
 
 #define B_SHOWSPLASH		70
@@ -223,6 +229,8 @@
 #define B_MAN_TRANS		161
 #define B_MAN_ROT		162
 #define B_MAN_SCALE		163
+#define B_HEMESHBROWSE	164
+#define B_HEMESHLOCAL 165
 
 /* IPO: 200 */
 #define B_IPOHOME		201
@@ -320,7 +328,8 @@
 #define B_TEXTFONT		505
 #define B_TEXTSTORE		506
 #define B_TEXTLINENUM		507
-#define B_TAB_NUMBERS       508
+#define B_TAB_NUMBERS		508
+#define B_SYNTAX		509
 
 /* SCRIPT: 525 */
 #define B_SCRIPTBROWSE 526
@@ -340,7 +349,7 @@
 #define B_SOUNDHOME		653
 #define B_PACKSOUND		654
 
-/* ACTION: 701 - 800 */
+/* ACTION: 701 - 750 */
 #define B_ACTHOME		701
 #define	B_ACTCOPY		702
 #define B_ACTPASTE		703
@@ -351,19 +360,30 @@
 #define	B_ACTPIN		708
 #define B_ACTBAKE		709
 
-#define B_NOTHING		-1
-#define B_NOP			-1
+/* TIME: 751 - 800 */
+#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
 
 /* NLA: 801-900 */
 #define B_NLAHOME		801
 
+/* FREE 900 - 999 */
+
+
+#define B_NOTHING		-1
+#define B_NOP			-1
+
+
 /* editbutflag */
 #define B_CLOCKWISE		1
 #define B_KEEPORIG		2
 #define B_BEAUTY		4
 #define B_SMOOTH		8
 #define B_KNIFE			0x80
-#define B_PERCENTSUBD		0x40
+#define B_PERCENTSUBD	0x40
 
 
 /* DISPLAYMODE */
diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h
index 18c3784ae08..3adde25d70e 100644
--- a/source/blender/include/mydevice.h
+++ b/source/blender/include/mydevice.h
@@ -242,9 +242,10 @@
 #define REDRAWTEXT	        0x402E
 #define REDRAWSOUND			0x402F
 #define REDRAWACTION		0x4030
-#define REDRAWBUTSCONSTRAINT	0x4034
 #define REDRAWNLA			0x4031
-#define REDRAWSCRIPT	0x4032
+#define REDRAWSCRIPT		0x4032
+#define REDRAWTIME			0x4033
+#define REDRAWBUTSCONSTRAINT	0x4034
 
 #define ONLOAD_SCRIPT 0x4035
 
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index f87d4768dcd..7aaf1a70641 100755
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -237,11 +237,12 @@ int Crease(TransInfo *t, short mval[2]);
 struct ListBase;
 void count_bone_select(TransInfo *t, struct ListBase *lb, int *counter);
 
-/* exported from transform_manipulator.c */
+/*********************** exported from transform_manipulator.c ********** */
 struct ScrArea;
 void draw_manipulator_ext(struct ScrArea *sa, int type, char axis, int col, float vec[3], float mat[][3]);
+int calc_manipulator_stats(struct ScrArea *sa);
 
-/*********************** TransData Creation and General Handling */
+/*********************** TransData Creation and General Handling *********** */
 void createTransData(TransInfo *t);
 void sort_trans_data_dist(TransInfo *t);
 void clear_trans_object_base_flags(void);