[longomatch/redesign3: 143/156] Several fixes after rebase

From: Andoni Morales Alastruey <amorales src gnome org>
To: commits-list gnome org
Cc:
Subject: [longomatch/redesign3: 143/156] Several fixes after rebase
Date: Wed, 17 Aug 2011 22:28:13 +0000 (UTC)
commit ea51e8c07c1f13b9825b23c460db1024f1d71cf4
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Aug 15 17:33:52 2011 +0200

    Several fixes after rebase

 CesarPlayer/CesarPlayer.mdp                        |    2 +-
 CesarPlayer/Makefile.am                            |   28 +++---
 LongoMatch/Gui/Component/TimeAdjustWidget.cs       |   66 ------------
 LongoMatch/Gui/Dialog/SubCategoryEditor.cs         |  108 --------------------
 LongoMatch/LongoMatch.mdp                          |   11 +-
 LongoMatch/Makefile.am                             |   78 ++++++--------
 .../LongoMatch.Gui.Component.PlayerProperties.cs   |    8 +-
 ...LongoMatch.Gui.Component.PlayersTaggerWidget.cs |   41 +++++---
 .../gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs  |   12 +--
 LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs    |    6 +-
 LongoMatch/gtk-gui/gui.stetic                      |   23 ++--
 LongoMatch/gtk-gui/objects.xml                     |   35 ++++---
 libcesarplayer/liblongomatch.mdp                   |   10 +-
 13 files changed, 125 insertions(+), 303 deletions(-)
---
diff --git a/CesarPlayer/CesarPlayer.mdp b/CesarPlayer/CesarPlayer.mdp
index 9d31d71..cb78c97 100644
--- a/CesarPlayer/CesarPlayer.mdp
+++ b/CesarPlayer/CesarPlayer.mdp
@@ -17,7 +17,7 @@
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="CesarPlayer.dll" assemblyKeyFile="." />
+      <Output directory="../bin" assembly="CesarPlayer.dll" assemblyKeyFile="." />
       <Build debugmode="True" target="Library" />
       <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
diff --git a/CesarPlayer/Makefile.am b/CesarPlayer/Makefile.am
index c1231dc..8c92ac2 100644
--- a/CesarPlayer/Makefile.am
+++ b/CesarPlayer/Makefile.am
@@ -4,14 +4,20 @@ TARGET = library
 LINK = $(REF_DEP_CESARPLAYER)
 
 SOURCES = \
-	AssemblyInfo.cs \
-	gtk-gui/generated.cs \
+	AssemblyInfo.cs\
+	Capturer/CaptureProperties.cs\
+	Capturer/FakeCapturer.cs\
+	Capturer/GstCameraCapturer.cs\
+	Capturer/ICapturer.cs\
+	Capturer/LiveSourceTimer.cs\
+	Capturer/ObjectManager.cs\
 	Common/Constants.cs\
 	Common/Enum.cs\
 	Common/Handlers.cs\
 	Player/GstPlayer.cs \
 	Player/IPlayer.cs \
 	Player/ObjectManager.cs \
+	gtk-gui/generated.cs \
 	gtk-gui/LongoMatch.Gui.CapturerBin.cs \
 	gtk-gui/LongoMatch.Gui.PlayerBin.cs \
 	gtk-gui/LongoMatch.Gui.VolumeWindow.cs \
@@ -19,25 +25,19 @@ SOURCES = \
 	Gui/PlayerBin.cs \
 	Gui/VolumeWindow.cs \
 	MultimediaFactory.cs \
-	Utils/IFramesCapturer.cs \
-	Utils/FramesCapturer.cs \
-	Utils/IMetadataReader.cs \
-	Utils/MpegRemuxer.cs \
-	Utils/TimeString.cs \
-	Capturer/CaptureProperties.cs \
-	Capturer/GstCameraCapturer.cs \
-	Capturer/FakeCapturer.cs \
-	Capturer/ICapturer.cs \
-	Capturer/LiveSourceTimer.cs \
-	Capturer/ObjectManager.cs \
 	Editor/GstVideoSplitter.cs \
 	Editor/IVideoEditor.cs \
 	Editor/IVideoSplitter.cs \
 	Editor/VideoSegment.cs \
 	Editor/EditorState.cs \
 	Utils/Device.cs \
+	Utils/FramesCapturer.cs \
+	Utils/IFramesCapturer.cs \
+	Utils/IMetadataReader.cs \
 	Utils/MediaFile.cs \
-	Utils/PreviewMediaFile.cs
+	Utils/MpegRemuxer.cs \
+	Utils/PreviewMediaFile.cs \
+	Utils/TimeString.cs
 
 RESOURCES = \
 	gtk-gui/objects.xml \
diff --git a/LongoMatch/LongoMatch.mdp b/LongoMatch/LongoMatch.mdp
index ff2ab02..38409af 100644
--- a/LongoMatch/LongoMatch.mdp
+++ b/LongoMatch/LongoMatch.mdp
@@ -11,13 +11,13 @@
   </MonoDevelop.Autotools.MakefileInfo>
   <Configurations active="Release">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Debug" assembly="LongoMatch.exe" assemblyKeyFile="/home/andoni/Proyectos/longomatch/LongoMatch/." />
+      <Output directory="../bin" assembly="LongoMatch.exe" assemblyKeyFile="/home/andoni/Proyectos/longomatch/LongoMatch/." />
       <Build debugmode="True" target="WinExe" />
       <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="bin/Release" assembly="LongoMatch.exe" assemblyKeyFile="/home/andoni/Proyectos/LongoMatch/LongoMatch/." />
+      <Output directory="../bin" assembly="LongoMatch.exe" assemblyKeyFile="/home/andoni/Proyectos/LongoMatch/LongoMatch/." />
       <Build debugmode="True" target="WinExe" />
       <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="3" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" additionalargs="-win32icon:images/minilogo.ico" ctype="CSharpCompilerParameters" />
@@ -131,7 +131,6 @@
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.UpdateDialog.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.HotKeySelectorDialog.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs" />
-    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.TemplatesManager.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.PlayersSelectionDialog.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.Win32CalendarDialog.cs" />
@@ -150,8 +149,6 @@
     <File subtype="Code" buildaction="Compile" name="Gui/TreeView/ListTreeViewBase.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/Component/CategoriesScale.cs" />
     <File subtype="Code" buildaction="Compile" name="Common/Cairo.cs" />
-    <File subtype="Code" buildaction="Compile" name="Common/GStreamer.cs" />
-    <File subtype="Directory" buildaction="Compile" name="Compat" />
     <File subtype="Code" buildaction="Compile" name="IO/XMLReader.cs" />
     <File subtype="Directory" buildaction="Compile" name="Store" />
     <File subtype="Directory" buildaction="Compile" name="DB" />
@@ -197,6 +194,8 @@
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.PlayersTaggerWidget.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/Component/StringTaggerWidget.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.StringTaggerWidget.cs" />
+    <File subtype="Code" buildaction="Compile" name="Common/GStreamer.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Dialog.TemplatesManager.cs" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
@@ -213,4 +212,4 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   </References>
   <LanguageParameters StartupObject="LongoMatch.MainClass" ApplicationIcon="." CodePage="65001" ctype="CSharpProjectParameters" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/LongoMatch/Makefile.am b/LongoMatch/Makefile.am
index 2b731ab..35095e6 100644
--- a/LongoMatch/Makefile.am
+++ b/LongoMatch/Makefile.am
@@ -4,47 +4,33 @@ LINK = $(REF_DEP_LONGOMATCH)
 
 SOURCES = \
 	AssemblyInfo.cs \
-	Common/Enums.cs \
 	Common/Cairo.cs \
+	Common/Cloner.cs \
+	Common/ConsoleCrayon.cs \
 	Common/Constants.cs \
+	Common/Enums.cs \
 	Common/GStreamer.cs \
-	Compat/0.0/DatabaseMigrator.cs \
-	Compat/0.0/DB/DataBase.cs \
-	Compat/0.0/DB/MediaFile.cs \
-	Compat/0.0/DB/Project.cs \
-	Compat/0.0/DB/Sections.cs \
-	Compat/0.0/IO/SectionsReader.cs \
-	Compat/0.0/Playlist/IPlayList.cs \
-	Compat/0.0/PlayListMigrator.cs \
-	Compat/0.0/Playlist/PlayList.cs \
-	Compat/0.0/TemplatesMigrator.cs \
-	Compat/0.0/Time/MediaTimeNode.cs \
-	Compat/0.0/Time/PixbufTimeNode.cs \
-	Compat/0.0/Time/PlayListTimeNode.cs \
-	Compat/0.0/Time/SectionsTimeNode.cs \
-	Compat/0.0/Time/Time.cs \
-	Compat/0.0/Time/TimeNode.cs \
-	Common/ConsoleCrayon.cs \
 	Common/Log.cs \
+	Common/ProjectUtils.cs \
 	Common/SerializableObject.cs \
 	DB/DataBase.cs \
 	gtk-gui/generated.cs \
 	gtk-gui/LongoMatch.Gui.Component.ButtonsWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.CategoryProperties.cs \
-	gtk-gui/LongoMatch.Gui.Component.DrawingWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.DrawingToolBox.cs \
+	gtk-gui/LongoMatch.Gui.Component.DrawingWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs \
 	gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.PlayersTaggerWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.PlayListWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.PlaysListTreeWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.ProjectDetailsWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.ProjectListWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.ProjectTemplateWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.StringTaggerWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.TaggerWidget.cs \
 	gtk-gui/LongoMatch.Gui.Component.TagsTreeWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.TeamTemplateWidget.cs \
-	gtk-gui/LongoMatch.Gui.Component.TimeAdjustWidget.cs \
+	gtk-gui/LongoMatch.Gui.Component.TemplatesEditorBase.cs \
 	gtk-gui/LongoMatch.Gui.Component.TimeLineWidget.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.BusyDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.DrawingTool.cs \
@@ -57,12 +43,12 @@ SOURCES = \
 	gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.OpenProjectDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.PlayersSelectionDialog.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.ProjectTemplateEditorDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.SnapshotsDialog.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.SubCategoryTagsEditor.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs \
-	gtk-gui/LongoMatch.Gui.Dialog.TeamTemplateEditor.cs \
+	gtk-gui/LongoMatch.Gui.Dialog.TemplateEditorDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.TemplatesManager.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.UpdateDialog.cs \
 	gtk-gui/LongoMatch.Gui.Dialog.VideoEditionProperties.cs \
@@ -73,20 +59,20 @@ SOURCES = \
 	Gui/Component/ButtonsWidget.cs \
 	Gui/Component/CategoriesScale.cs \
 	Gui/Component/CategoryProperties.cs \
-	Gui/Component/DrawingWidget.cs \
 	Gui/Component/DrawingToolBox.cs \
+	Gui/Component/DrawingWidget.cs \
 	Gui/Component/NotesWidget.cs \
 	Gui/Component/PlayerProperties.cs \
 	Gui/Component/PlayersListTreeWidget.cs \
+	Gui/Component/PlayersTaggerWidget.cs \
 	Gui/Component/PlayListWidget.cs \
 	Gui/Component/PlaysListTreeWidget.cs \
 	Gui/Component/ProjectDetailsWidget.cs \
 	Gui/Component/ProjectListWidget.cs \
-	Gui/Component/ProjectTemplateWidget.cs \
-	Gui/Component/TaggerWidget.cs\
-	Gui/Component/TagsTreeWidget.cs\
-	Gui/Component/TeamTemplateWidget.cs\
-	Gui/Component/TimeAdjustWidget.cs \
+	Gui/Component/StringTaggerWidget.cs \
+	Gui/Component/TaggerWidget.cs \
+	Gui/Component/TagsTreeWidget.cs \
+	Gui/Component/TemplatesEditorBase.cs \
 	Gui/Component/TimeLineWidget.cs \
 	Gui/Component/TimeReferenceWidget.cs \
 	Gui/Component/TimeScale.cs \
@@ -101,13 +87,13 @@ SOURCES = \
 	Gui/Dialog/NewProjectDialog.cs \
 	Gui/Dialog/OpenProjectDialog.cs \
 	Gui/Dialog/PlayersSelectionDialog.cs \
-	Gui/Dialog/ProjectsManager.cs \
-	Gui/Dialog/ProjectTemplateEditorDialog.cs \
 	Gui/Dialog/ProjectSelectionDialog.cs \
+	Gui/Dialog/ProjectsManager.cs \
 	Gui/Dialog/SnapshotsDialog.cs \
+	Gui/Dialog/SubCategoryTagsEditor.cs \
 	Gui/Dialog/TaggerDialog.cs \
-	Gui/Dialog/TemplatesEditor.cs \
-	Gui/Dialog/TeamTemplateEditor.cs\
+	Gui/Dialog/TemplateEditorDialog.cs \
+	Gui/Dialog/TemplatesManager.cs \
 	Gui/Dialog/UpdateDialog.cs \
 	Gui/Dialog/VideoEditionProperties.cs \
 	Gui/Dialog/Win32CalendarDialog.cs \
@@ -116,42 +102,46 @@ SOURCES = \
 	Gui/Popup/MessagePopup.cs \
 	Gui/TransparentDrawingArea.cs \
 	Gui/TreeView/CategoriesTreeView.cs \
+	Gui/TreeView/ListTreeViewBase.cs \
 	Gui/TreeView/PlayerPropertiesTreeView.cs \
 	Gui/TreeView/PlayersTreeView.cs \
-	Gui/TreeView/ListTreeViewBase.cs \
 	Gui/TreeView/PlayListTreeView.cs \
 	Gui/TreeView/PlaysTreeView.cs \
+	Gui/TreeView/SubCategoriesTreeView.cs \
 	Gui/TreeView/TagsTreeView.cs \
 	Handlers/DrawingManager.cs \
 	Handlers/EventsManager.cs \
 	Handlers/Handlers.cs \
 	Handlers/HotKeysManager.cs \
-	Handlers/VideoDrawingsManager.cs\
+	Handlers/VideoDrawingsManager.cs \
+	Interfaces/ISubCategory.cs \
+	Interfaces/ITemplates.cs \
 	IO/CSVExport.cs \
 	IO/XMLReader.cs \
 	Main.cs \
 	Playlist/IPlayList.cs \
 	Playlist/PlayList.cs \
+	Services/TemplatesService.cs \
 	Store/Category.cs \
-	Store/SubCategory.cs \
 	Store/Drawing.cs \
 	Store/DrawingsList.cs \
 	Store/HotKey.cs \
 	Store/PixbufTimeNode.cs \
 	Store/Play.cs \
-	Store/PlayListPlay.cs \
 	Store/Player.cs \
+	Store/PlayListPlay.cs \
 	Store/Project.cs \
 	Store/ProjectDescription.cs \
+	Store/SubCategory.cs \
 	Store/Tag.cs \
-	Store/Time.cs \
-	Store/TimeNode.cs \
 	Store/Templates/CategoriesTemplate.cs \
-	Store/Templates/SubCategoriesTemplate.cs \
+	Store/Templates/SubCategoryTemplate.cs \
 	Store/Templates/TeamTemplate.cs \
+	Store/Templates/Template.cs \
+	Store/Time.cs \
+	Store/TimeNode.cs \
 	Updates/Updater.cs \
-	Updates/XmlUpdateParser.cs \
-	Utils/ProjectUtils.cs
+	Updates/XmlUpdateParser.cs
 
 IMAGES = images/longomatch.png \
          images/background.png
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs
index 57fcdb1..33aa7ec 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayerProperties.cs
@@ -121,14 +121,14 @@ namespace LongoMatch.Gui.Component
 			w6.XOptions = ((global::Gtk.AttachOptions)(4));
 			w6.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.heightspinbutton = new global::Gtk.SpinButton (0, 10, 1);
+			this.heightspinbutton = new global::Gtk.SpinButton (0, 100, 1);
 			this.heightspinbutton.CanFocus = true;
 			this.heightspinbutton.Name = "heightspinbutton";
-			this.heightspinbutton.Adjustment.PageIncrement = 1;
+			this.heightspinbutton.Adjustment.PageIncrement = 10;
 			this.heightspinbutton.ClimbRate = 1;
 			this.heightspinbutton.Digits = ((uint)(2));
 			this.heightspinbutton.Numeric = true;
-			this.heightspinbutton.Value = 10;
+			this.heightspinbutton.Value = 18;
 			this.table1.Add (this.heightspinbutton);
 			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.heightspinbutton]));
 			w7.TopAttach = ((uint)(4));
@@ -294,7 +294,7 @@ namespace LongoMatch.Gui.Component
 			w21.XOptions = ((global::Gtk.AttachOptions)(4));
 			w21.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.weightspinbutton = new global::Gtk.SpinButton (0, 400, 1);
+			this.weightspinbutton = new global::Gtk.SpinButton (0, 100, 1);
 			this.weightspinbutton.CanFocus = true;
 			this.weightspinbutton.Name = "weightspinbutton";
 			this.weightspinbutton.Adjustment.PageIncrement = 10;
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersTaggerWidget.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersTaggerWidget.cs
index 12e4364..3f4946d 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersTaggerWidget.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersTaggerWidget.cs
@@ -10,9 +10,11 @@ namespace LongoMatch.Gui.Component
 
 		private global::Gtk.HBox hbox1;
 
+		private global::Gtk.Label label2;
+
 		private global::Gtk.Label playerslabel;
 
-		private global::Gtk.Button editbutton;
+		private global::Gtk.Button button5;
 
 		private global::Gtk.Label CategoryLabel;
 
@@ -35,25 +37,35 @@ namespace LongoMatch.Gui.Component
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
+			this.label2 = new global::Gtk.Label ();
+			this.label2.Name = "label2";
+			this.label2.Xalign = 0f;
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Players:");
+			this.hbox1.Add (this.label2);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label2]));
+			w1.Position = 0;
+			w1.Expand = false;
+			w1.Fill = false;
+			// Container child hbox1.Gtk.Box+BoxChild
 			this.playerslabel = new global::Gtk.Label ();
 			this.playerslabel.Name = "playerslabel";
 			this.playerslabel.Xalign = 0f;
 			this.playerslabel.LabelProp = global::Mono.Unix.Catalog.GetString ("None");
 			this.hbox1.Add (this.playerslabel);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.playerslabel]));
-			w1.Position = 0;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.editbutton = new global::Gtk.Button ();
-			this.editbutton.CanFocus = true;
-			this.editbutton.Name = "editbutton";
-			this.editbutton.UseStock = true;
-			this.editbutton.UseUnderline = true;
-			this.editbutton.Label = "gtk-edit";
-			this.hbox1.Add (this.editbutton);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.editbutton]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.playerslabel]));
 			w2.Position = 1;
-			w2.Expand = false;
-			w2.Fill = false;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.button5 = new global::Gtk.Button ();
+			this.button5.CanFocus = true;
+			this.button5.Name = "button5";
+			this.button5.UseStock = true;
+			this.button5.UseUnderline = true;
+			this.button5.Label = "gtk-edit";
+			this.hbox1.Add (this.button5);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.button5]));
+			w3.Position = 2;
+			w3.Expand = false;
+			w3.Fill = false;
 			this.GtkAlignment.Add (this.hbox1);
 			this.frame1.Add (this.GtkAlignment);
 			this.CategoryLabel = new global::Gtk.Label ();
@@ -66,7 +78,6 @@ namespace LongoMatch.Gui.Component
 				this.Child.ShowAll ();
 			}
 			this.Hide ();
-			this.editbutton.Clicked += new global::System.EventHandler (this.OnEditClicked);
 		}
 	}
 }
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs
index 6b3d936..810614e 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.TaggerDialog.cs
@@ -28,10 +28,6 @@ namespace LongoMatch.Gui.Dialog
 			this.Title = global::Mono.Unix.Catalog.GetString ("Tag play");
 			this.Icon = global::Stetic.IconLoader.LoadIcon (this, "longomatch", global::Gtk.IconSize.Menu);
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
-			this.AllowShrink = true;
-			this.Gravity = ((global::Gdk.Gravity)(5));
-			this.SkipPagerHint = true;
-			this.SkipTaskbarHint = true;
 			// Internal child LongoMatch.Gui.Dialog.TaggerDialog.VBox
 			global::Gtk.VBox w1 = this.VBox;
 			w1.Name = "dialog1_VBox";
@@ -53,7 +49,7 @@ namespace LongoMatch.Gui.Dialog
 			// Notebook tab
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Tags");
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
 			this.tagsnotebook.SetTabLabel (this.taggerwidget1, this.label1);
 			this.label1.ShowAll ();
 			this.hbox1.Add (this.tagsnotebook);
@@ -72,7 +68,7 @@ namespace LongoMatch.Gui.Dialog
 			// Notebook tab
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Players");
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("page1");
 			this.playersnotebook.SetTabLabel (this.playersbox, this.label2);
 			this.label2.ShowAll ();
 			this.hbox1.Add (this.playersnotebook);
@@ -102,10 +98,8 @@ namespace LongoMatch.Gui.Dialog
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
-			this.DefaultWidth = 511;
+			this.DefaultWidth = 620;
 			this.DefaultHeight = 267;
-			this.tagsnotebook.Hide ();
-			this.playersnotebook.Hide ();
 			this.Show ();
 		}
 	}
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
index 443d56c..942f928 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
@@ -233,7 +233,7 @@ namespace LongoMatch.Gui
 			this.notebook1 = new global::Gtk.Notebook ();
 			this.notebook1.CanFocus = true;
 			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 1;
+			this.notebook1.CurrentPage = 0;
 			this.notebook1.TabPos = ((global::Gtk.PositionType)(3));
 			// Container child notebook1.Gtk.Notebook+NotebookChild
 			this.treewidget1 = new global::LongoMatch.Gui.Component.PlaysListTreeWidget ();
@@ -295,7 +295,7 @@ namespace LongoMatch.Gui
 			this.hpaned1 = new global::Gtk.HPaned ();
 			this.hpaned1.CanFocus = true;
 			this.hpaned1.Name = "hpaned1";
-			this.hpaned1.Position = 930;
+			this.hpaned1.Position = 881;
 			// Container child hpaned1.Gtk.Paned+PanedChild
 			this.vbox5 = new global::Gtk.VBox ();
 			this.vbox5.Name = "vbox5";
@@ -407,7 +407,7 @@ namespace LongoMatch.Gui
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
-			this.DefaultWidth = 1445;
+			this.DefaultWidth = 1259;
 			this.DefaultHeight = 853;
 			this.leftbox.Hide ();
 			this.drawingtoolbox1.Hide ();
diff --git a/LongoMatch/gtk-gui/gui.stetic b/LongoMatch/gtk-gui/gui.stetic
index 3656023..aebd8f0 100644
--- a/LongoMatch/gtk-gui/gui.stetic
+++ b/LongoMatch/gtk-gui/gui.stetic
@@ -5,8 +5,8 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../CesarPlayer/bin/Release/CesarPlayer.dll" />
-    <widget-library name="../bin/Release/LongoMatch.exe" internal="true" />
+    <widget-library name="../../bin/CesarPlayer.dll" />
+    <widget-library name="../../bin/LongoMatch.exe" internal="true" />
   </import>
   <icon-factory>
     <icon-set id="longomatch">
@@ -1604,7 +1604,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Window" id="LongoMatch.Gui.MainWindow" design-size="1445 853">
+  <widget class="Gtk.Window" id="LongoMatch.Gui.MainWindow" design-size="1259 853">
     <action-group name="Default">
       <action id="FileAction">
         <property name="Type">Action</property>
@@ -1949,7 +1949,7 @@
               <widget class="Gtk.HPaned" id="hpaned1">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Position">930</property>
+                <property name="Position">881</property>
                 <child>
                   <widget class="Gtk.VBox" id="vbox5">
                     <property name="MemberName" />
@@ -4085,13 +4085,13 @@ Hotkeys with a single key are also allowed with Ctrl+key.</property>
           <widget class="Gtk.SpinButton" id="heightspinbutton">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Upper">10</property>
-            <property name="PageIncrement">1</property>
+            <property name="Upper">100</property>
+            <property name="PageIncrement">10</property>
             <property name="StepIncrement">1</property>
             <property name="ClimbRate">1</property>
             <property name="Digits">2</property>
             <property name="Numeric">True</property>
-            <property name="Value">10</property>
+            <property name="Value">18</property>
             <signal name="ValueChanged" handler="OnHeightspinbuttonValueChanged" />
           </widget>
           <packing>
@@ -4405,7 +4405,7 @@ No</property>
           <widget class="Gtk.SpinButton" id="weightspinbutton">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Upper">400</property>
+            <property name="Upper">100</property>
             <property name="PageIncrement">10</property>
             <property name="StepIncrement">1</property>
             <property name="ClimbRate">1</property>
@@ -4809,7 +4809,6 @@ No</property>
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="Label" translatable="yes" />
-                <property name="Active">True</property>
                 <property name="DrawIndicator">False</property>
                 <property name="HasLabel">False</property>
                 <property name="UseUnderline">True</property>
@@ -5460,7 +5459,7 @@ Show-&gt;&lt;b&gt; S&lt;/b&gt;
             <property name="MemberName" />
             <property name="Spacing">6</property>
             <child>
-              <widget class="Gtk.Notebook" id="notebook1">
+              <widget class="Gtk.Notebook" id="tagsnotebook">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="CurrentPage">0</property>
@@ -5486,7 +5485,7 @@ Show-&gt;&lt;b&gt; S&lt;/b&gt;
               </packing>
             </child>
             <child>
-              <widget class="Gtk.Notebook" id="notebook2">
+              <widget class="Gtk.Notebook" id="playersnotebook">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="CurrentPage">0</property>
@@ -6428,4 +6427,4 @@ You can continue with the current capture, cancel it or save your project.
       </widget>
     </child>
   </widget>
-</stetic-interface>
+</stetic-interface>
\ No newline at end of file
diff --git a/LongoMatch/gtk-gui/objects.xml b/LongoMatch/gtk-gui/objects.xml
index e8d2c4e..c50f57c 100644
--- a/LongoMatch/gtk-gui/objects.xml
+++ b/LongoMatch/gtk-gui/objects.xml
@@ -102,17 +102,6 @@
       </itemgroup>
     </signals>
   </object>
-  <object type="LongoMatch.Gui.Component.TagsTreeWidget" palette-category="LongoMatch" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals>
-      <itemgroup label="TagsTreeWidget Signals">
-        <signal name="TimeNodeSelected" />
-        <signal name="TimeNodeChanged" />
-        <signal name="PlayListNodeAdded" />
-        <signal name="SnapshotSeriesEvent" />
-      </itemgroup>
-    </signals>
-  </object>
   <object type="LongoMatch.Gui.Component.DrawingWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
     <itemgroups />
     <signals />
@@ -130,7 +119,6 @@
         <signal name="TimeNodeDeleted" />
         <signal name="PlayListNodeAdded" />
         <signal name="SnapshotSeriesEvent" />
-        <signal name="PlayersTagged" />
         <signal name="TagPlay" />
       </itemgroup>
     </signals>
@@ -148,7 +136,6 @@
         <signal name="TimeNodeDeleted" />
         <signal name="PlayListNodeAdded" />
         <signal name="SnapshotSeriesEvent" />
-        <signal name="PlayersTagged" />
         <signal name="TagPlay" />
       </itemgroup>
     </signals>
@@ -166,7 +153,6 @@
         <signal name="TimeNodeDeleted" />
         <signal name="PlayListNodeAdded" />
         <signal name="SnapshotSeriesEvent" />
-        <signal name="PlayersTagged" />
         <signal name="TagPlay" />
       </itemgroup>
     </signals>
@@ -206,7 +192,6 @@
         <signal name="TimeNodeDeleted" />
         <signal name="PlayListNodeAdded" />
         <signal name="SnapshotSeriesEvent" />
-        <signal name="PlayersTagged" />
         <signal name="TagPlay" />
       </itemgroup>
     </signals>
@@ -257,4 +242,24 @@
       </itemgroup>
     </signals>
   </object>
+  <object type="LongoMatch.Gui.Component.TagsTreeWidget" palette-category="LongoMatch" allow-children="false" base-type="Gtk.Bin">
+    <itemgroups />
+    <signals>
+      <itemgroup label="TagsTreeWidget Signals">
+        <signal name="TimeNodeSelected" />
+        <signal name="TimeNodeChanged" />
+        <signal name="PlayListNodeAdded" />
+        <signal name="SnapshotSeriesEvent" />
+      </itemgroup>
+    </signals>
+  </object>
+  <object type="LongoMatch.Gui.SubCategoriesTreeView" palette-category="LongoMatch" allow-children="false" base-type="Gtk.TreeView">
+    <itemgroups />
+    <signals>
+      <itemgroup label="SubCategoriesTreeView Signals">
+        <signal name="SubCategoriesDeleted" />
+        <signal name="SubCategorySelected" />
+      </itemgroup>
+    </signals>
+  </object>
 </objects>
\ No newline at end of file
diff --git a/libcesarplayer/liblongomatch.mdp b/libcesarplayer/liblongomatch.mdp
index d4b7ba8..f870573 100644
--- a/libcesarplayer/liblongomatch.mdp
+++ b/libcesarplayer/liblongomatch.mdp
@@ -16,7 +16,7 @@
       <CodeGeneration WarningLevel="Normal" WarningsAsErrors="False" OptimizationLevel="0" ExtraCompilerArguments="" ExtraLinkerArguments="" DefineSymbols="DEBUG MONODEVELOP" ctype="CCompilationParameters" />
     </Configuration>
     <Configuration name="Release" SourceDirectory="." ctype="CProjectConfiguration">
-      <Output directory="../LongoMatch/bin/Release/" output="libcesarplayer.dll" />
+      <Output directory="../bin" output="libcesarplayer.dll" />
       <Build debugmode="True" target="SharedLibrary" />
       <Execution consolepause="True" runwithwarnings="True" />
       <CodeGeneration WarningLevel="All" WarningsAsErrors="True" OptimizationLevel="3" ExtraCompilerArguments="" ExtraLinkerArguments="" DefineSymbols="MONODEVELOP" ctype="CCompilationParameters" />
@@ -44,15 +44,13 @@
     <File subtype="Code" buildaction="Nothing" name="video-utils.h" />
   </Contents>
   <Packages>
+    <Package file="/usr/lib/pkgconfig/gdk-2.0.pc" name="GDK" IsProject="False" />
     <Package file="/usr/lib/pkgconfig/gstreamer-0.10.pc" name="GStreamer" IsProject="False" />
     <Package file="/usr/lib/pkgconfig/gstreamer-audio-0.10.pc" name="GStreamer Audio library" IsProject="False" />
-    <Package file="/usr/lib/pkgconfig/gstreamer-interfaces-0.10.pc" name="GStreamer Interfaces Library" IsProject="False" />
     <Package file="/usr/lib/pkgconfig/gstreamer-video-0.10.pc" name="GStreamer Video Library" IsProject="False" />
-    <Package file="/usr/lib/pkgconfig/glib-2.0.pc" name="GLib" IsProject="False" />
-    <Package file="/usr/lib/pkgconfig/gobject-2.0.pc" name="GObject" IsProject="False" />
-    <Package file="/usr/lib/pkgconfig/gdk-2.0.pc" name="GDK" IsProject="False" />
     <Package file="/usr/lib/pkgconfig/gtk+-2.0.pc" name="GTK+" IsProject="False" />
-    <Package file="/usr/lib/pkgconfig/gstreamer-pbutils-0.10.pc" name="GStreamer Base Utils Library" IsProject="False" />
+    <Package file="/usr/lib/pkgconfig/gstreamer-interfaces-0.10.pc" name="GStreamer Interfaces Library" IsProject="False" />
+    <Package file="/usr/lib/pkgconfig/glib-2.0.pc" name="GLib" IsProject="False" />
   </Packages>
   <compiler ctype="GccCompiler" />
 </Project>
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]