[longomatch] Fixes for previous commits

[Andoni Morales Alastruey <amorales src gnome org>]

commit b1f7126012043d02cf828d98ade88d40478ef198
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Nov 28 19:49:50 2011 +0100

    Fixes for previous commits

 LongoMatch.GUI/Gui/Base/TimelineWidgetBase.cs  |    4 +---
 LongoMatch.GUI/Gui/Component/TimeLineWidget.cs |    3 +--
 LongoMatch.GUI/Gui/MainWindow.cs               |    4 ++++
 LongoMatch.GUI/Makefile.am                     |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Base/TimelineWidgetBase.cs b/LongoMatch.GUI/Gui/Base/TimelineWidgetBase.cs
index 569d0aa..3c43b40 100644
--- a/LongoMatch.GUI/Gui/Base/TimelineWidgetBase.cs
+++ b/LongoMatch.GUI/Gui/Base/TimelineWidgetBase.cs
@@ -25,7 +25,6 @@ using Gtk;
 
 namespace LongoMatch.Gui.Base
 {
-	[System.ComponentModel.ToolboxItem(true)]
 	public partial class TimelineWidgetBase : Gtk.Bin
 	{
 		protected TimeReferenceWidget tr;
@@ -45,7 +44,7 @@ namespace LongoMatch.Gui.Base
 			tr.HeightRequest = 50 - leftbox.Spacing;
 			
 			categoriesbox.PackStart(cs, false, false, 0);
-			timelinebox.PackStart(tr,false,false,0);
+			timescalebox.PackStart(tr,false,false,0);
 			
 			zoomscale.CanFocus = false;
 			loaded = false;
@@ -116,7 +115,6 @@ namespace LongoMatch.Gui.Base
 		
 	}
 	
-	[System.ComponentModel.ToolboxItem(true)]
 	public partial class TimelineBase <W, Z> : TimelineWidgetBase where Z:ITimelineNode where W: TimeScaleBase<Z>
 	{
 		protected Dictionary<object, W> tsList;
diff --git a/LongoMatch.GUI/Gui/Component/TimeLineWidget.cs b/LongoMatch.GUI/Gui/Component/TimeLineWidget.cs
index cdfd28b..11b9a2b 100644
--- a/LongoMatch.GUI/Gui/Component/TimeLineWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/TimeLineWidget.cs
@@ -52,7 +52,6 @@ namespace LongoMatch.Gui.Component {
 				if(value == null) {
 					categories = null;
 					tsList.Clear();
-					tsList=null;
 					loaded = false;
 					return;
 				}
@@ -61,7 +60,7 @@ namespace LongoMatch.Gui.Component {
 				tsList.Clear(); 
 				frames = value.Description.File.GetFrames();
 
-				cs.Labels = categories.Select(c => c.Name).ToList();
+				cs.Categories = categories;
 				cs.Show();
 
 				tr.Frames = frames;
diff --git a/LongoMatch.GUI/Gui/MainWindow.cs b/LongoMatch.GUI/Gui/MainWindow.cs
index 6081c11..b0a389b 100644
--- a/LongoMatch.GUI/Gui/MainWindow.cs
+++ b/LongoMatch.GUI/Gui/MainWindow.cs
@@ -87,6 +87,7 @@ namespace LongoMatch.Gui
 		private static Project openedProject;
 		private ProjectType projectType;
 		private TimeNode selectedTimeNode;
+		TimeLineWidget timeline;
 
 		#region Constructors
 		public MainWindow() :
@@ -96,6 +97,9 @@ namespace LongoMatch.Gui
 
 			projectType = ProjectType.None;
 
+			timeline = new TimeLineWidget();
+			downbox.PackStart(timeline, true, true, 0);
+			
 			player.SetLogo(System.IO.Path.Combine(Config.ImagesDir(),"background.png"));
 			player.LogoMode = true;
 			player.Tick += OnTick;
diff --git a/LongoMatch.GUI/Makefile.am b/LongoMatch.GUI/Makefile.am
index cc3a394..003107a 100644
--- a/LongoMatch.GUI/Makefile.am
+++ b/LongoMatch.GUI/Makefile.am
@@ -56,7 +56,7 @@ SOURCES = \
 	Gui/Base/TimelineWidgetBase.cs \
 	Gui/Base/TimeScaleBase.cs \
 	Gui/Component/ButtonsWidget.cs \
-	Gui/Component/CategoriesScale.cs \
+	Gui/Component/TimelineLabelsWidget.cs \
 	Gui/Component/CategoriesTemplateEditor.cs \
 	Gui/Component/CategoryProperties.cs \
 	Gui/Component/DrawingToolBox.cs \