[longomatch] Start using the new team tagger



commit dbcab3a584681f3c8841a22363c7d51f5a34be56
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed May 28 16:59:50 2014 +0200

    Start using the new team tagger

 LongoMatch.GUI/Gui/Component/TaggerWidget.cs       |   10 +-
 .../Gui/Component/TeamPlayersSelection.cs          |   53 +--
 LongoMatch.GUI/Gui/Component/TeamTaggerWidget.cs   |   77 ---
 LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs |  185 ++++----
 LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs        |   79 +++-
 LongoMatch.GUI/LongoMatch.GUI.mdp                  |   24 +-
 .../LongoMatch.Gui.Component.CodingWidget.cs       |   12 +-
 ...ongoMatch.Gui.Component.TeamPlayersSelection.cs |   76 ---
 .../LongoMatch.Gui.Component.TeamTaggerWidget.cs   |   43 --
 .../LongoMatch.Gui.Component.TeamTemplateEditor.cs |  526 +++++++++++++-------
 .../LongoMatch.Gui.Panel.NewProjectPanel.cs        |  475 ++++++++++--------
 LongoMatch.GUI/gtk-gui/gui.stetic                  |  461 ++++++++++--------
 LongoMatch.GUI/gtk-gui/objects.xml                 |    8 -
 13 files changed, 1042 insertions(+), 987 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Component/TaggerWidget.cs b/LongoMatch.GUI/Gui/Component/TaggerWidget.cs
index ed93548..e482b3b 100644
--- a/LongoMatch.GUI/Gui/Component/TaggerWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/TaggerWidget.cs
@@ -57,11 +57,11 @@ namespace LongoMatch.Gui.Component
                
                public void AddTeamSubCategory(TeamSubCategory subcat, TeamsTagStore tags,
                                               string localTeam, string visitorTeam){
-                       TeamTaggerWidget tagger = new TeamTaggerWidget(subcat, tags,
-                                                                      localTeam, visitorTeam);
-                       table1.Attach(tagger,0, 1, table1.NRows-1, table1.NRows);
-                       table1.NRows ++;
-                       tagger.Show();
+//                     TeamTaggerWidget tagger = new TeamTaggerWidget(subcat, tags,
+//                                                                    localTeam, visitorTeam);
+//                     table1.Attach(tagger,0, 1, table1.NRows-1, table1.NRows);
+//                     table1.NRows ++;
+//                     tagger.Show();
                }
                
                void SetTeams (Play play, string localTeam, string visitorTeam) {
diff --git a/LongoMatch.GUI/Gui/Component/TeamPlayersSelection.cs 
b/LongoMatch.GUI/Gui/Component/TeamPlayersSelection.cs
index 2681b4a..6c04678 100644
--- a/LongoMatch.GUI/Gui/Component/TeamPlayersSelection.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamPlayersSelection.cs
@@ -21,6 +21,8 @@ using LongoMatch.Interfaces;
 using LongoMatch.Store.Templates;
 using LongoMatch.Store;
 using Gdk;
+using LongoMatch.Drawing.Widgets;
+using LongoMatch.Drawing.Cairo;
 
 namespace LongoMatch.Gui.Component
 {
@@ -32,39 +34,12 @@ namespace LongoMatch.Gui.Component
                TeamTemplate template;
                ListStore teams, players;
                
-               enum Columns {
-                       Desc,
-                       Number,
-                       Playing,
-                       Photo,
-                       Player,
-                       NumCols,
-               }
-               
                public TeamPlayersSelection ()
                {
-                       CellRendererToggle togglerenderer;
-                       CellRendererText textrenderer;
-                       
                        this.Build ();
                        teams = new ListStore (typeof(string));
-                       players = new ListStore (typeof(string), typeof(string), typeof(bool), 
typeof(Pixbuf), typeof(Player));
                        teamscombobox.Model = teams;
-                       playersiconview.Model = players;
                        teamscombobox.Changed += HandleChanged;
-                       
-                       togglerenderer = new CellRendererToggle ();
-                       togglerenderer.Radio = false;
-                       togglerenderer.Toggled += HandleToggled;
-                       textrenderer = new CellRendererText ();
-                       playersiconview.PixbufColumn = (int) Columns.Photo;
-                       playersiconview.TooltipColumn = (int) Columns.Desc;
-                       playersiconview.PackEnd (textrenderer, false);
-                       playersiconview.PackEnd (togglerenderer, false);
-                       playersiconview.SetAttributes (togglerenderer, "active", Columns.Playing);
-                       playersiconview.SetAttributes (textrenderer, "text", Columns.Number);
-                       playersiconview.Orientation = Orientation.Horizontal;
-                       playersiconview.SelectionMode = SelectionMode.None;
                }
 
                public ITeamTemplatesProvider TemplatesProvider {
@@ -91,18 +66,7 @@ namespace LongoMatch.Gui.Component
                                        shieldimage.Pixbuf = template.Shield.Value;
                                }
                                namelabel.Text = template.TeamName;
-                               players.Clear ();
-                               foreach (Player p in template) {
-                                       Pixbuf playerImage;
-                                       
-                                       if (p.Photo != null) {
-                                               playerImage = p.Photo.Value;
-                                       } else {
-                                               playerImage = Stetic.IconLoader.LoadIcon (this, 
"stock_person", IconSize.Dialog);
-                                       }
-                                       players.AppendValues (String.Format("{0} {1}", p.Name, p.Number),
-                                                             p.Number.ToString(), p.Playing, playerImage, p);
-                               }
+                               //teamtaggerwidget.Team = template;     
                        }
                }
                
@@ -110,17 +74,6 @@ namespace LongoMatch.Gui.Component
                {
                        Load (teamscombobox.ActiveText);
                }
-               
-               void HandleToggled (object o, ToggledArgs args)
-               {
-                       Player player;
-                       TreeIter iter;
-                       
-                       playersiconview.Model.GetIterFromString (out iter, args.Path);
-                       player = playersiconview.Model.GetValue (iter, (int) Columns.Player) as Player;
-                       player.Playing = !(o as CellRendererToggle).Active;
-                       playersiconview.Model.SetValue (iter, (int) Columns.Playing, player.Playing);
-               }
        }
 }
 
diff --git a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs 
b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
index 2a678de..e5b8551 100644
--- a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
@@ -16,6 +16,7 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using Gtk;
 using Gdk;
@@ -24,9 +25,12 @@ using LongoMatch.Store;
 using Mono.Unix;
 
 using Image = LongoMatch.Common.Image;
+using Color = LongoMatch.Common.Color;
 using LongoMatch.Common;
 using LongoMatch.Gui.Popup;
 using LongoMatch.Gui.Dialog;
+using LongoMatch.Drawing.Widgets;
+using LongoMatch.Drawing.Cairo;
 
 namespace LongoMatch.Gui.Component
 {
@@ -35,37 +39,48 @@ namespace LongoMatch.Gui.Component
        {
                public event EventHandler TemplateSaved;
        
-               enum Columns {
-                       Desc,
-                       Photo,
-                       Tooltip,
-                       Player,
-                       NumCols,
-               }
-       
-               ListStore players;
                Player loadedPlayer;
-               List<Player> selectedPlayers;
-               TreeIter loadedPlayerIter;
                TeamTemplate template;
-               bool edited;
+               bool edited, ignoreChanges;
+               List<Player> selectedPlayers;
+               TeamTagger teamtagger;
+               bool inSubs;
                
                public TeamTemplateEditor ()
                {
                        this.Build ();
-                       
-                       players = new ListStore (typeof(string), typeof(Pixbuf), typeof(string), 
typeof(Player));
-
-                       playersiconview.Model = players;
-                       playersiconview.Reorderable = true;
-                       playersiconview.TextColumn = (int) Columns.Desc;
-                       playersiconview.PixbufColumn = (int) Columns.Photo;
-                       playersiconview.SelectionMode = SelectionMode.Multiple;
-                       playersiconview.SelectionChanged += HandlePlayersSelectionChanged;;
-                       playersiconview.KeyPressEvent += HandleKeyPressEvent;
-                       
+                       teamtagger = new TeamTagger (new WidgetWrapper (drawingarea));
+                       teamtagger.PlayersSelectionChangedEvent += HandlePlayersSelectionChangedEvent;
                        ConnectSignals ();
                }
+
+               public bool Edited {
+                       get {
+                               return edited;
+                       }
+                       protected set {
+                               edited = value;
+                               savebutton.Sensitive = edited;
+                       }
+               }
+               
+               public TeamTemplate  Team {
+                       set {
+                               template = value;
+                               subsbutton.Active = false;
+                               ignoreChanges = true;
+                               if (template.Shield != null) {
+                                       shieldimage.Pixbuf = template.Shield.Value;
+                               } else {
+                                       shieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource ("logo.svg");
+                               }
+                               teamnameentry.Text = template.TeamName;
+                               FillFormation ();
+                               teamtagger.LoadTeams (template, null, null);
+                               ignoreChanges = false;
+                               Edited = false;
+                       }
+               }
                
                void ConnectSignals () {
                        newplayerbutton.Clicked += HandleNewPlayerClicked;
@@ -84,13 +99,21 @@ namespace LongoMatch.Gui.Component
                        nationalityentry.Changed += HandleEntryChanged;
                        mailentry.Changed += HandleEntryChanged;
                        
+                       applybutton.Clicked += (s,e) => {ParseTactics();}; 
+                       tacticsentry.Activated += (s, e) => {ParseTactics();};
+                       
                        datebutton.Clicked += HandleCalendarbuttonClicked; 
                        
+                       subsbutton.Clicked += HandleSubsClicked;
+                       
                        Edited = false;
                }
 
                void HandleEntryChanged (object sender, EventArgs e)
                {
+                       if (ignoreChanges == true)
+                               return;
+
                        if (sender == teamnameentry) {
                                template.TeamName = (sender as Entry).Text;
                        } else if (sender == nameentry) {
@@ -109,34 +132,12 @@ namespace LongoMatch.Gui.Component
                                loadedPlayer.Mail = (sender as Entry).Text;
                        }
                        Edited = true;
+                       drawingarea.QueueDraw ();
                }
 
-               public TeamTemplate  Team {
-                       set {
-                               template = value;
-                               
-                               players.Clear ();
-                               foreach (Player p in value) {
-                                       AddPlayer (p);
-                               }
-                               if (template.Shield != null) {
-                                       shieldimage.Pixbuf = template.Shield.Value;
-                               } else {
-                                       shieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource ("logo.svg");
-                               }
-                               teamnameentry.Text = template.TeamName;
-                               Edited = false;
-                       }
-               }
-               
-               public bool Edited {
-                       get {
-                               return edited;
-                       }
-                       protected set {
-                               edited = value;
-                               savebutton.Sensitive = edited;
-                       }
+               void FillFormation () {
+                       tacticsentry.Text = template.FormationStr;
+                       nplayerslabel.Text = template.PlayingPlayers.ToString();
                }
                
                void LoadPlayer (Player p) {
@@ -151,6 +152,18 @@ namespace LongoMatch.Gui.Component
                        playerimage.Pixbuf = PlayerPhoto (p);
                }
                
+               void ParseTactics () {
+                       try {
+                               template.FormationStr = tacticsentry.Text;
+                               teamtagger.Reload ();
+                               Edited = true;
+                       } catch {
+                               Config.GUIToolkit.ErrorMessage (
+                                       Catalog.GetString ("Could not parse tactics string"));
+                       }
+                       FillFormation ();
+               }
+               
                Pixbuf PlayerPhoto (Player p) {
                        Pixbuf playerImage;
                                
@@ -162,21 +175,26 @@ namespace LongoMatch.Gui.Component
                        return playerImage;
                }
                
-               TreeIter AddPlayer (Player p) {
-                       return players.AppendValues (String.Format("{0} #{1}", p.Name, p.Number),
-                                                    PlayerPhoto (p), p.Number.ToString(), p);
-               }
-               
                void PlayersSelected (List<Player> players) {
-                       playerframe.Sensitive = players.Count == 1;
-                       
-                       selectedPlayers = players;
-                       deletebutton.Sensitive = players.Count != 0;
-                       playerframe.Sensitive = players.Count != 0;
-                       if (players.Count == 1) {
-                               LoadPlayer (players[0]);
+                       if (inSubs) {
+                               if (players.Count == 2) {
+                                       ExtensionMethods.Swap (template, template.IndexOf (players[0]),
+                                                              template.IndexOf (players[1]));
+                                       teamtagger.ClearSelection ();
+                                       teamtagger.Reload ();
+                                       Edited = true;
+                               }
+                               return;
                        } else {
-                               loadedPlayer = null;
+                               playerframe.Sensitive = players.Count == 1;
+                               selectedPlayers = players;
+                               deletebutton.Sensitive = players.Count != 0;
+                               playerframe.Sensitive = players.Count != 0;
+                               if (players.Count == 1) {
+                                       LoadPlayer (players[0]);
+                               } else {
+                                       loadedPlayer = null;
+                               }
                        }
                }
                
@@ -195,26 +213,21 @@ namespace LongoMatch.Gui.Component
                        Team = template;
                }
                
-               void HandlePlayersSelectionChanged (object sender, EventArgs e)
+               void HandleSubsClicked (object sender, EventArgs e)
                {
-                       TreeIter iter;
-                       List<Player> list;
-                       TreePath[] pathArray;
-                       
-                       list = new List<Player>();
-                       pathArray = playersiconview.SelectedItems;
-                               
-                       for(int i=0; i< pathArray.Length; i++) {
-                               Player player;
-                               
-                               playersiconview.Model.GetIterFromString (out iter, pathArray[i].ToString());
-                               player = playersiconview.Model.GetValue (iter, (int)Columns.Player) as 
Player; 
-                               list.Add (player);
-                               if (i== 0) {
-                                       loadedPlayerIter = iter;
-                               }
+                       inSubs = subsbutton.Active;
+                       teamtagger.ClearSelection ();
+                       if (inSubs) {
+                               teamtagger.SelectionMode = MultiSelectionMode.Multiple;
+                       } else {
+                               teamtagger.SelectionMode = MultiSelectionMode.MultipleWithModifier;
                        }
-                       PlayersSelected (list);
+                       warninglabel.Visible = inSubs;
+               }
+
+               void HandlePlayersSelectionChangedEvent (List<Player> players)
+               {
+                       PlayersSelected (players);
                }
                
                void HandleSaveTemplateClicked (object sender, EventArgs e)
@@ -229,12 +242,9 @@ namespace LongoMatch.Gui.Component
 
                void HandleNewPlayerClicked (object sender, EventArgs e)
                {
-                       TreeIter iter;
-                       Player p;
-                       
-                       p = template.AddDefaultItem (template.Count);
-                       iter = AddPlayer (p);
-                       playersiconview.SelectPath (playersiconview.Model.GetPath (iter));
+                       Player p = template.AddDefaultItem (template.Count);
+                       teamtagger.Reload ();
+                       teamtagger.Select (p);
                        Edited = true;
                }
 
@@ -264,8 +274,7 @@ namespace LongoMatch.Gui.Component
                        if (player != null && loadedPlayer != null) {
                                playerimage.Pixbuf = player.Value;
                                loadedPlayer.Photo = player;
-                               playersiconview.Model.SetValue (loadedPlayerIter, (int) Columns.Photo,
-                                                               playerimage.Pixbuf);
+                               teamtagger.Reload ();
                                Edited = true;
                        }
                }
diff --git a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
index 744123d..c8658c8 100644
--- a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
@@ -37,6 +37,8 @@ using LongoMatch.Interfaces.GUI;
 
 using Device = LongoMatch.Common.Device;
 using Color = Gdk.Color;
+using LongoMatch.Drawing.Widgets;
+using LongoMatch.Drawing.Cairo;
 
 namespace LongoMatch.Gui.Panel
 {
@@ -52,11 +54,14 @@ namespace LongoMatch.Gui.Panel
                Project project;
                ProjectType projectType;
                List<Device> videoDevices;
-               ListStore videoStandardList, encProfileList, qualList;
+               ListStore teams, videoStandardList, encProfileList, qualList;
                MediaFile mediaFile;
                IMultimediaToolkit mtoolkit;
                IGUIToolkit gtoolkit;
                Color red;
+               TeamTemplate hometemplate, awaytemplate;
+               Categories analysisTemplate;
+               TeamTagger teamtagger;
                
                public NewProjectPanel (Project project)
                {
@@ -77,13 +82,13 @@ namespace LongoMatch.Gui.Panel
                                notebook1.Page = 1;
                                this.project = project;
                        }
-                       localteamplayersselection.TemplatesProvider = Config.TeamTemplatesProvider;
-                       awayteamplayersselection.TemplatesProvider = Config.TeamTemplatesProvider;
+                       
                        ConnectSignals ();
                        FillProjectDetails ();
                        FillCategories ();
                        FillFormats ();
                        FillDevices (mtoolkit.VideoDevices);
+                       LoadTeams ();
                        Color.Parse ("red", ref red);
                        outputfilelabel.ModifyFg (StateType.Normal, red);
                        Color.Parse ("red", ref red);
@@ -92,6 +97,27 @@ namespace LongoMatch.Gui.Panel
                        filelabel.ModifyFg (StateType.Normal, red);
                }
                
+               void LoadTeams () {
+                       drawingarea1.HeightRequest = 200;
+                       teamtagger = new TeamTagger (new WidgetWrapper (drawingarea1));
+                       teams = new ListStore (typeof(string));
+
+                       teamtagger.HomeColor = Constants.HOME_COLOR;
+                       teamtagger.AwayColor = Constants.AWAY_COLOR;
+
+                       foreach (string name in Config.TeamTemplatesProvider.TemplatesNames) {
+                               teams.AppendValues (name);
+                       }
+                       hometeamscombobox.Model = teams;
+                       hometeamscombobox.Changed += (sender, e) => {
+                               LoadTemplate (hometeamscombobox.ActiveText, Team.LOCAL);};
+                       awayteamscombobox.Model = teams;
+                       awayteamscombobox.Changed += (sender, e) => {
+                               LoadTemplate (awayteamscombobox.ActiveText, Team.VISITOR);};
+                       hometeamscombobox.Active = 0;
+                       awayteamscombobox.Active = 0;
+               }
+               
                void ConnectSignals () {
                        calendarbutton.Clicked += HandleCalendarbuttonClicked; 
                        openbutton.Clicked += HandleOpenbuttonClicked;
@@ -100,12 +126,13 @@ namespace LongoMatch.Gui.Panel
                        fileEntry.Changed += HandleEntryChanged;
                        outfileEntry.Changed += HandleEntryChanged;
                        createbutton.Clicked += HandleCreateProject;
+                       tagscombobox.Changed += HandleSportsTemplateChanged;
                }
 
                void FillProjectDetails () {
                        seasonentry.Text = project.Description.Season;
                        competitionentry.Text = project.Description.Competition;
-                       dateEntry.Text = project.Description.MatchDate.ToShortDateString();
+                       datelabel.Text = project.Description.MatchDate.ToShortDateString();
                        localSpinButton.Value = project.Description.LocalGoals;
                        visitorSpinButton.Value = project.Description.VisitorGoals;
                }
@@ -176,10 +203,37 @@ namespace LongoMatch.Gui.Panel
                                devicecombobox.Active = 0;
                        }
                }
-
+               
+               
+               public void LoadTemplate (string name, Team team) {
+                       TeamTemplate template;
+                       if (name != null) {
+                               template = Config.TeamTemplatesProvider.Load (name);
+                               if (team == Team.LOCAL) {
+                                       if (template.Shield != null) {
+                                               homeshieldimage.Pixbuf = template.Shield.Value;
+                                       } else {
+                                               homeshieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource 
("logo.svg");                                              
+                                       }
+                                       homelabel.Text = template.TeamName;
+                                       hometemplate = template;
+                               } else {
+                                       if (template.Shield != null) {
+                                               awayshieldimage.Pixbuf = template.Shield.Value;
+                                       } else {
+                                               awayshieldimage.Pixbuf = Gdk.Pixbuf.LoadFromResource 
("logo.svg");                                              
+                                       }
+                                       awaylabel.Text = template.TeamName;
+                                       awaytemplate = template;
+                               }
+                               teamtagger.LoadTeams (hometemplate, awaytemplate,
+                                                     analysisTemplate.FieldBackground);
+                       }
+               }
+               
                void HandleCalendarbuttonClicked(object sender, System.EventArgs e)
                {
-                       dateEntry.Text = Config.GUIToolkit.SelectDate (project.Description.MatchDate, 
this).ToShortDateString ();
+                       datelabel.Text = Config.GUIToolkit.SelectDate (project.Description.MatchDate, 
this).ToShortDateString ();
                }
 
                void HandleSavebuttonClicked(object sender, System.EventArgs e)
@@ -222,6 +276,11 @@ namespace LongoMatch.Gui.Panel
                        QueueDraw ();
                }
 
+               void HandleSportsTemplateChanged (object sender, EventArgs e)
+               {
+                       analysisTemplate = Config.CategoriesTemplatesProvider.Load(tagscombobox.ActiveText);
+               }
+
                void HandleCreateProject (object sender, EventArgs e)
                {
                        CaptureSettings captureSettings;
@@ -249,15 +308,15 @@ namespace LongoMatch.Gui.Panel
                                }
                        }
                        p = new Project ();
-                       p.Categories = Config.CategoriesTemplatesProvider.Load(tagscombobox.ActiveText);
-                       p.LocalTeamTemplate = localteamplayersselection.Template;
-                       p.VisitorTeamTemplate = awayteamplayersselection.Template;
+                       p.Categories = analysisTemplate;
+                       p.LocalTeamTemplate = hometemplate;
+                       p.VisitorTeamTemplate = awaytemplate;
                        p.Description = new ProjectDescription ();
                        p.Description.Competition = competitionentry.Text;
                        p.Description.File = mediaFile;
                        p.Description.LocalGoals = (int) localSpinButton.Value;
                        p.Description.VisitorGoals = (int) visitorSpinButton.Value;
-                       p.Description.MatchDate = DateTime.Parse (dateEntry.Text);
+                       p.Description.MatchDate = DateTime.Parse (datelabel.Text);
                        p.Description.Season = seasonentry.Text;
                        p.Description.LocalName = p.LocalTeamTemplate.TeamName;
                        p.Description.VisitorName = p.VisitorTeamTemplate.TeamName;
diff --git a/LongoMatch.GUI/LongoMatch.GUI.mdp b/LongoMatch.GUI/LongoMatch.GUI.mdp
index 179a176..f01a39b 100644
--- a/LongoMatch.GUI/LongoMatch.GUI.mdp
+++ b/LongoMatch.GUI/LongoMatch.GUI.mdp
@@ -80,8 +80,6 @@
     <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="gtk-gui/LongoMatch.Gui.Component.TeamTaggerWidget.cs" />
-    <File subtype="Code" buildaction="Compile" name="Gui/Component/TeamTaggerWidget.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/Component/RenderingStateBar.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.RenderingStateBar.cs" 
/>
     <File subtype="Code" buildaction="Compile" name="Gui/TreeView/RenderingJobsTreeView.cs" />
@@ -170,8 +168,6 @@
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Panel.OpenProjectPanel.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/Panel/NewProjectPanel.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs" />
-    <File subtype="Code" buildaction="Compile" name="Gui/Component/TeamPlayersSelection.cs" />
-    <File subtype="Code" buildaction="Compile" 
name="gtk-gui/LongoMatch.Gui.Component.TeamPlayersSelection.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/Panel/TeamsTemplatesPanel.cs" />
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Panel.TeamsTemplatesPanel.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/Component/TeamTemplateEditor.cs" />
@@ -192,19 +188,19 @@
     <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Package" localcopy="True" refto="atk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Package" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Package" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Package" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Package" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, 
PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="True" refto="LongoMatch.GUI.Multimedia" />
     <ProjectReference type="Project" localcopy="True" refto="LongoMatch.Multimedia" />
     <ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=b03f5f7f11d50a3a" />
+    <ProjectReference type="Package" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Package" localcopy="True" refto="Mono.Cairo, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Package" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Package" localcopy="True" refto="System.Core, Version=4.0.0.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089" />
+    <ProjectReference type="Package" localcopy="True" refto="System.Drawing, Version=4.0.0.0, 
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Project" localcopy="True" refto="OxyPlotMono" />
     <ProjectReference type="Project" localcopy="True" refto="LongoMatch.GUI.Helpers" />
     <ProjectReference type="Project" localcopy="True" refto="LongoMatch.Drawing" />
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs
index f728e5e..9f53d82 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.CodingWidget.cs
@@ -21,17 +21,17 @@ namespace LongoMatch.Gui.Component
                        // Widget LongoMatch.Gui.Component.CodingWidget
                        Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this);
                        this.UIManager = new global::Gtk.UIManager ();
-                       global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Timeline");
-                       this.UIManager.InsertActionGroup (w2, 0);
-                       global::Gtk.ActionGroup w3 = new global::Gtk.ActionGroup ("Default");
+                       global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default");
                        this.timelineMode = new global::Gtk.RadioAction ("timelineMode", null, 
global::Mono.Unix.Catalog.GetString ("Timeline view"), "gtk-justify-fill", 0);
                        this.timelineMode.Group = new global::GLib.SList (global::System.IntPtr.Zero);
-                       w3.Add (this.timelineMode, null);
+                       w2.Add (this.timelineMode, null);
                        this.autoTaggingMode = new global::Gtk.RadioAction ("autoTaggingMode", null, 
global::Mono.Unix.Catalog.GetString ("Automatic tagging view"), "gtk-select-color", 0);
                        this.autoTaggingMode.Group = this.timelineMode.Group;
-                       w3.Add (this.autoTaggingMode, null);
+                       w2.Add (this.autoTaggingMode, null);
                        this.zoomFitAction = new global::Gtk.Action ("zoomFitAction", null, null, 
"gtk-zoom-fit");
-                       w3.Add (this.zoomFitAction, null);
+                       w2.Add (this.zoomFitAction, null);
+                       this.UIManager.InsertActionGroup (w2, 0);
+                       global::Gtk.ActionGroup w3 = new global::Gtk.ActionGroup ("Timeline");
                        this.UIManager.InsertActionGroup (w3, 1);
                        this.Name = "LongoMatch.Gui.Component.CodingWidget";
                        // Container child LongoMatch.Gui.Component.CodingWidget.Gtk.Container+ContainerChild
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
index 8a55ae2..004cd02 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
@@ -17,8 +17,21 @@ namespace LongoMatch.Gui.Component
                private global::Gtk.Alignment GtkAlignment3;
                private global::Gtk.Entry teamnameentry;
                private global::Gtk.Label GtkLabel4;
-               private global::Gtk.ScrolledWindow GtkScrolledWindow;
-               private global::Gtk.IconView playersiconview;
+               private global::Gtk.Frame frame2;
+               private global::Gtk.Alignment GtkAlignment6;
+               private global::Gtk.VBox vbox1;
+               private global::Gtk.HBox hbox5;
+               private global::Gtk.Label label1;
+               private global::Gtk.Label nplayerslabel;
+               private global::Gtk.HBox hbox6;
+               private global::Gtk.Label label2;
+               private global::Gtk.Entry tacticsentry;
+               private global::Gtk.Button applybutton;
+               private global::Gtk.Label GtkLabel6;
+               private global::Gtk.DrawingArea drawingarea;
+               private global::Gtk.HBox hbox7;
+               private global::Gtk.ToggleButton subsbutton;
+               private global::Gtk.Label warninglabel;
                private global::Gtk.VSeparator vseparator1;
                private global::Gtk.Frame playerframe;
                private global::Gtk.Alignment GtkAlignment5;
@@ -71,7 +84,7 @@ namespace LongoMatch.Gui.Component
                        // Container child vbox5.Gtk.Box+BoxChild
                        this.hbox2 = new global::Gtk.HBox ();
                        this.hbox2.Name = "hbox2";
-                       this.hbox2.Spacing = 50;
+                       this.hbox2.Spacing = 30;
                        // Container child hbox2.Gtk.Box+BoxChild
                        this.frame1 = new global::Gtk.Frame ();
                        this.frame1.Name = "frame1";
@@ -108,6 +121,7 @@ namespace LongoMatch.Gui.Component
                        this.GtkAlignment3.LeftPadding = ((uint)(12));
                        // Container child GtkAlignment3.Gtk.Container+ContainerChild
                        this.teamnameentry = new global::Gtk.Entry ();
+                       this.teamnameentry.WidthRequest = 100;
                        this.teamnameentry.CanFocus = true;
                        this.teamnameentry.Name = "teamnameentry";
                        this.teamnameentry.IsEditable = true;
@@ -124,34 +138,169 @@ namespace LongoMatch.Gui.Component
                        w7.Position = 1;
                        w7.Expand = false;
                        w7.Fill = false;
-                       this.vbox5.Add (this.hbox2);
-                       global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+                       // Container child hbox2.Gtk.Box+BoxChild
+                       this.frame2 = new global::Gtk.Frame ();
+                       this.frame2.Name = "frame2";
+                       this.frame2.ShadowType = ((global::Gtk.ShadowType)(0));
+                       // Container child frame2.Gtk.Container+ContainerChild
+                       this.GtkAlignment6 = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+                       this.GtkAlignment6.Name = "GtkAlignment6";
+                       this.GtkAlignment6.LeftPadding = ((uint)(12));
+                       // Container child GtkAlignment6.Gtk.Container+ContainerChild
+                       this.vbox1 = new global::Gtk.VBox ();
+                       this.vbox1.Name = "vbox1";
+                       this.vbox1.Spacing = 6;
+                       // Container child vbox1.Gtk.Box+BoxChild
+                       this.hbox5 = new global::Gtk.HBox ();
+                       this.hbox5.Name = "hbox5";
+                       this.hbox5.Spacing = 6;
+                       // Container child hbox5.Gtk.Box+BoxChild
+                       this.label1 = new global::Gtk.Label ();
+                       this.label1.Name = "label1";
+                       this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Number of players");
+                       this.hbox5.Add (this.label1);
+                       global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.label1]));
                        w8.Position = 0;
                        w8.Expand = false;
                        w8.Fill = false;
+                       // Container child hbox5.Gtk.Box+BoxChild
+                       this.nplayerslabel = new global::Gtk.Label ();
+                       this.nplayerslabel.Name = "nplayerslabel";
+                       this.hbox5.Add (this.nplayerslabel);
+                       global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox5 
[this.nplayerslabel]));
+                       w9.Position = 1;
+                       w9.Expand = false;
+                       w9.Fill = false;
+                       this.vbox1.Add (this.hbox5);
+                       global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox5]));
+                       w10.Position = 0;
+                       w10.Expand = false;
+                       w10.Fill = false;
+                       // Container child vbox1.Gtk.Box+BoxChild
+                       this.hbox6 = new global::Gtk.HBox ();
+                       this.hbox6.Name = "hbox6";
+                       this.hbox6.Spacing = 6;
+                       // Container child hbox6.Gtk.Box+BoxChild
+                       this.label2 = new global::Gtk.Label ();
+                       this.label2.Name = "label2";
+                       this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Tactics");
+                       this.hbox6.Add (this.label2);
+                       global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.label2]));
+                       w11.Position = 0;
+                       w11.Expand = false;
+                       w11.Fill = false;
+                       // Container child hbox6.Gtk.Box+BoxChild
+                       this.tacticsentry = new global::Gtk.Entry ();
+                       this.tacticsentry.WidthRequest = 30;
+                       this.tacticsentry.CanFocus = true;
+                       this.tacticsentry.Name = "tacticsentry";
+                       this.tacticsentry.IsEditable = true;
+                       this.tacticsentry.InvisibleChar = '•';
+                       this.hbox6.Add (this.tacticsentry);
+                       global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox6 
[this.tacticsentry]));
+                       w12.Position = 1;
+                       // Container child hbox6.Gtk.Box+BoxChild
+                       this.applybutton = new global::Gtk.Button ();
+                       this.applybutton.CanFocus = true;
+                       this.applybutton.Name = "applybutton";
+                       this.applybutton.UseUnderline = true;
+                       // Container child applybutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w13 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w14 = new global::Gtk.HBox ();
+                       w14.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w15 = new global::Gtk.Image ();
+                       w15.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-apply", 
global::Gtk.IconSize.Menu);
+                       w14.Add (w15);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w17 = new global::Gtk.Label ();
+                       w14.Add (w17);
+                       w13.Add (w14);
+                       this.applybutton.Add (w13);
+                       this.hbox6.Add (this.applybutton);
+                       global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox6 
[this.applybutton]));
+                       w21.Position = 2;
+                       w21.Expand = false;
+                       w21.Fill = false;
+                       this.vbox1.Add (this.hbox6);
+                       global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox6]));
+                       w22.Position = 1;
+                       w22.Expand = false;
+                       w22.Fill = false;
+                       this.GtkAlignment6.Add (this.vbox1);
+                       this.frame2.Add (this.GtkAlignment6);
+                       this.GtkLabel6 = new global::Gtk.Label ();
+                       this.GtkLabel6.Name = "GtkLabel6";
+                       this.GtkLabel6.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Formation</b>");
+                       this.GtkLabel6.UseMarkup = true;
+                       this.frame2.LabelWidget = this.GtkLabel6;
+                       this.hbox2.Add (this.frame2);
+                       global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.frame2]));
+                       w25.Position = 2;
+                       w25.Expand = false;
+                       w25.Fill = false;
+                       this.vbox5.Add (this.hbox2);
+                       global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+                       w26.Position = 0;
+                       w26.Expand = false;
+                       w26.Fill = false;
                        // Container child vbox5.Gtk.Box+BoxChild
-                       this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
-                       this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-                       this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-                       // Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-                       this.playersiconview = new global::Gtk.IconView ();
-                       this.playersiconview.CanFocus = true;
-                       this.playersiconview.Name = "playersiconview";
-                       this.GtkScrolledWindow.Add (this.playersiconview);
-                       this.vbox5.Add (this.GtkScrolledWindow);
-                       global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox5 
[this.GtkScrolledWindow]));
-                       w10.Position = 1;
+                       this.drawingarea = new global::Gtk.DrawingArea ();
+                       this.drawingarea.Name = "drawingarea";
+                       this.vbox5.Add (this.drawingarea);
+                       global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox5 
[this.drawingarea]));
+                       w27.Position = 1;
+                       // Container child vbox5.Gtk.Box+BoxChild
+                       this.hbox7 = new global::Gtk.HBox ();
+                       this.hbox7.Name = "hbox7";
+                       this.hbox7.Spacing = 6;
+                       // Container child hbox7.Gtk.Box+BoxChild
+                       this.subsbutton = new global::Gtk.ToggleButton ();
+                       this.subsbutton.Name = "subsbutton";
+                       this.subsbutton.UseUnderline = true;
+                       this.subsbutton.FocusOnClick = false;
+                       this.subsbutton.Active = true;
+                       // Container child subsbutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w28 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w29 = new global::Gtk.HBox ();
+                       w29.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w30 = new global::Gtk.Image ();
+                       w30.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-refresh", 
global::Gtk.IconSize.Dialog);
+                       w29.Add (w30);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w32 = new global::Gtk.Label ();
+                       w29.Add (w32);
+                       w28.Add (w29);
+                       this.subsbutton.Add (w28);
+                       this.hbox7.Add (this.subsbutton);
+                       global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.subsbutton]));
+                       w36.Position = 0;
+                       // Container child hbox7.Gtk.Box+BoxChild
+                       this.warninglabel = new global::Gtk.Label ();
+                       this.warninglabel.Name = "warninglabel";
+                       this.warninglabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Substitutions 
activated.\nClick 2 players to swap them");
+                       this.hbox7.Add (this.warninglabel);
+                       global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.warninglabel]));
+                       w37.Position = 1;
+                       this.vbox5.Add (this.hbox7);
+                       global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox7]));
+                       w38.Position = 2;
+                       w38.Expand = false;
+                       w38.Fill = false;
                        this.hbox4.Add (this.vbox5);
-                       global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.vbox5]));
-                       w11.Position = 0;
+                       global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.vbox5]));
+                       w39.Position = 0;
                        // Container child hbox4.Gtk.Box+BoxChild
                        this.vseparator1 = new global::Gtk.VSeparator ();
                        this.vseparator1.Name = "vseparator1";
                        this.hbox4.Add (this.vseparator1);
-                       global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.vseparator1]));
-                       w12.Position = 1;
-                       w12.Expand = false;
-                       w12.Fill = false;
+                       global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.vseparator1]));
+                       w40.Position = 1;
+                       w40.Expand = false;
+                       w40.Fill = false;
                        // Container child hbox4.Gtk.Box+BoxChild
                        this.playerframe = new global::Gtk.Frame ();
                        this.playerframe.Name = "playerframe";
@@ -172,10 +321,10 @@ namespace LongoMatch.Gui.Component
                        this.playerimage.Name = "playerimage";
                        this.playereventbox.Add (this.playerimage);
                        this.vbox6.Add (this.playereventbox);
-                       global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.playereventbox]));
-                       w14.Position = 0;
-                       w14.Expand = false;
-                       w14.Fill = false;
+                       global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.vbox6 
[this.playereventbox]));
+                       w42.Position = 0;
+                       w42.Expand = false;
+                       w42.Fill = false;
                        // Container child vbox6.Gtk.Box+BoxChild
                        this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(4)), false);
                        this.table1.Name = "table1";
@@ -189,8 +338,8 @@ namespace LongoMatch.Gui.Component
                        this.bdaylabel = new global::Gtk.Label ();
                        this.bdaylabel.Name = "bdaylabel";
                        this.hbox3.Add (this.bdaylabel);
-                       global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.bdaylabel]));
-                       w15.Position = 0;
+                       global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.bdaylabel]));
+                       w43.Position = 0;
                        // Container child hbox3.Gtk.Box+BoxChild
                        this.datebutton = new global::Gtk.Button ();
                        this.datebutton.CanFocus = true;
@@ -198,18 +347,18 @@ namespace LongoMatch.Gui.Component
                        this.datebutton.UseUnderline = true;
                        this.datebutton.Label = global::Mono.Unix.Catalog.GetString ("_Calendar");
                        this.hbox3.Add (this.datebutton);
-                       global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.datebutton]));
-                       w16.Position = 1;
-                       w16.Expand = false;
-                       w16.Fill = false;
+                       global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.datebutton]));
+                       w44.Position = 1;
+                       w44.Expand = false;
+                       w44.Fill = false;
                        this.table1.Add (this.hbox3);
-                       global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 
[this.hbox3]));
-                       w17.TopAttach = ((uint)(3));
-                       w17.BottomAttach = ((uint)(4));
-                       w17.LeftAttach = ((uint)(1));
-                       w17.RightAttach = ((uint)(2));
-                       w17.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w17.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.table1 
[this.hbox3]));
+                       w45.TopAttach = ((uint)(3));
+                       w45.BottomAttach = ((uint)(4));
+                       w45.LeftAttach = ((uint)(1));
+                       w45.RightAttach = ((uint)(2));
+                       w45.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w45.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.heightspinbutton = new global::Gtk.SpinButton (0, 100, 1);
                        this.heightspinbutton.CanFocus = true;
@@ -220,84 +369,84 @@ namespace LongoMatch.Gui.Component
                        this.heightspinbutton.Numeric = true;
                        this.heightspinbutton.Value = 18;
                        this.table1.Add (this.heightspinbutton);
-                       global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1 
[this.heightspinbutton]));
-                       w18.TopAttach = ((uint)(1));
-                       w18.BottomAttach = ((uint)(2));
-                       w18.LeftAttach = ((uint)(3));
-                       w18.RightAttach = ((uint)(4));
-                       w18.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w18.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.table1 
[this.heightspinbutton]));
+                       w46.TopAttach = ((uint)(1));
+                       w46.BottomAttach = ((uint)(2));
+                       w46.LeftAttach = ((uint)(3));
+                       w46.RightAttach = ((uint)(4));
+                       w46.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w46.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label11 = new global::Gtk.Label ();
                        this.label11.Name = "label11";
                        this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("Position:");
                        this.table1.Add (this.label11);
-                       global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label11]));
-                       w19.LeftAttach = ((uint)(2));
-                       w19.RightAttach = ((uint)(3));
-                       w19.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w19.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label11]));
+                       w47.LeftAttach = ((uint)(2));
+                       w47.RightAttach = ((uint)(3));
+                       w47.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w47.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label12 = new global::Gtk.Label ();
                        this.label12.Name = "label12";
                        this.label12.LabelProp = global::Mono.Unix.Catalog.GetString ("Name:");
                        this.table1.Add (this.label12);
-                       global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label12]));
-                       w20.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label12]));
+                       w48.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label3 = new global::Gtk.Label ();
                        this.label3.Name = "label3";
                        this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Number:");
                        this.table1.Add (this.label3);
-                       global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label3]));
-                       w21.TopAttach = ((uint)(1));
-                       w21.BottomAttach = ((uint)(2));
-                       w21.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w21.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label3]));
+                       w49.TopAttach = ((uint)(1));
+                       w49.BottomAttach = ((uint)(2));
+                       w49.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w49.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label5 = new global::Gtk.Label ();
                        this.label5.Name = "label5";
                        this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Height");
                        this.table1.Add (this.label5);
-                       global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label5]));
-                       w22.TopAttach = ((uint)(1));
-                       w22.BottomAttach = ((uint)(2));
-                       w22.LeftAttach = ((uint)(2));
-                       w22.RightAttach = ((uint)(3));
-                       w22.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w22.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label5]));
+                       w50.TopAttach = ((uint)(1));
+                       w50.BottomAttach = ((uint)(2));
+                       w50.LeftAttach = ((uint)(2));
+                       w50.RightAttach = ((uint)(3));
+                       w50.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w50.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label6 = new global::Gtk.Label ();
                        this.label6.Name = "label6";
                        this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("Weight");
                        this.table1.Add (this.label6);
-                       global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label6]));
-                       w23.TopAttach = ((uint)(2));
-                       w23.BottomAttach = ((uint)(3));
-                       w23.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w23.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w51 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label6]));
+                       w51.TopAttach = ((uint)(2));
+                       w51.BottomAttach = ((uint)(3));
+                       w51.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w51.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label7 = new global::Gtk.Label ();
                        this.label7.Name = "label7";
                        this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Birth day");
                        this.table1.Add (this.label7);
-                       global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label7]));
-                       w24.TopAttach = ((uint)(3));
-                       w24.BottomAttach = ((uint)(4));
-                       w24.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w24.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w52 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label7]));
+                       w52.TopAttach = ((uint)(3));
+                       w52.BottomAttach = ((uint)(4));
+                       w52.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w52.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.label8 = new global::Gtk.Label ();
                        this.label8.Name = "label8";
                        this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Nationality");
                        this.table1.Add (this.label8);
-                       global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label8]));
-                       w25.TopAttach = ((uint)(2));
-                       w25.BottomAttach = ((uint)(3));
-                       w25.LeftAttach = ((uint)(2));
-                       w25.RightAttach = ((uint)(3));
-                       w25.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w25.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table1 
[this.label8]));
+                       w53.TopAttach = ((uint)(2));
+                       w53.BottomAttach = ((uint)(3));
+                       w53.LeftAttach = ((uint)(2));
+                       w53.RightAttach = ((uint)(3));
+                       w53.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w53.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.mailentry = new global::Gtk.Entry ();
                        this.mailentry.CanFocus = true;
@@ -305,25 +454,25 @@ namespace LongoMatch.Gui.Component
                        this.mailentry.IsEditable = true;
                        this.mailentry.InvisibleChar = '•';
                        this.table1.Add (this.mailentry);
-                       global::Gtk.Table.TableChild w26 = ((global::Gtk.Table.TableChild)(this.table1 
[this.mailentry]));
-                       w26.TopAttach = ((uint)(3));
-                       w26.BottomAttach = ((uint)(4));
-                       w26.LeftAttach = ((uint)(3));
-                       w26.RightAttach = ((uint)(4));
-                       w26.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w26.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.table1 
[this.mailentry]));
+                       w54.TopAttach = ((uint)(3));
+                       w54.BottomAttach = ((uint)(4));
+                       w54.LeftAttach = ((uint)(3));
+                       w54.RightAttach = ((uint)(4));
+                       w54.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w54.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.maillabel = new global::Gtk.Label ();
                        this.maillabel.Name = "maillabel";
                        this.maillabel.LabelProp = global::Mono.Unix.Catalog.GetString ("E-mail:");
                        this.table1.Add (this.maillabel);
-                       global::Gtk.Table.TableChild w27 = ((global::Gtk.Table.TableChild)(this.table1 
[this.maillabel]));
-                       w27.TopAttach = ((uint)(3));
-                       w27.BottomAttach = ((uint)(4));
-                       w27.LeftAttach = ((uint)(2));
-                       w27.RightAttach = ((uint)(3));
-                       w27.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w27.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w55 = ((global::Gtk.Table.TableChild)(this.table1 
[this.maillabel]));
+                       w55.TopAttach = ((uint)(3));
+                       w55.BottomAttach = ((uint)(4));
+                       w55.LeftAttach = ((uint)(2));
+                       w55.RightAttach = ((uint)(3));
+                       w55.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w55.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.nameentry = new global::Gtk.Entry ();
                        this.nameentry.CanFocus = true;
@@ -331,11 +480,11 @@ namespace LongoMatch.Gui.Component
                        this.nameentry.IsEditable = true;
                        this.nameentry.InvisibleChar = '●';
                        this.table1.Add (this.nameentry);
-                       global::Gtk.Table.TableChild w28 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nameentry]));
-                       w28.LeftAttach = ((uint)(1));
-                       w28.RightAttach = ((uint)(2));
-                       w28.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w28.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w56 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nameentry]));
+                       w56.LeftAttach = ((uint)(1));
+                       w56.RightAttach = ((uint)(2));
+                       w56.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w56.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.nationalityentry = new global::Gtk.Entry ();
                        this.nationalityentry.CanFocus = true;
@@ -343,13 +492,13 @@ namespace LongoMatch.Gui.Component
                        this.nationalityentry.IsEditable = true;
                        this.nationalityentry.InvisibleChar = '●';
                        this.table1.Add (this.nationalityentry);
-                       global::Gtk.Table.TableChild w29 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nationalityentry]));
-                       w29.TopAttach = ((uint)(2));
-                       w29.BottomAttach = ((uint)(3));
-                       w29.LeftAttach = ((uint)(3));
-                       w29.RightAttach = ((uint)(4));
-                       w29.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w29.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w57 = ((global::Gtk.Table.TableChild)(this.table1 
[this.nationalityentry]));
+                       w57.TopAttach = ((uint)(2));
+                       w57.BottomAttach = ((uint)(3));
+                       w57.LeftAttach = ((uint)(3));
+                       w57.RightAttach = ((uint)(4));
+                       w57.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w57.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.numberspinbutton = new global::Gtk.SpinButton (0, 100, 1);
                        this.numberspinbutton.CanFocus = true;
@@ -358,13 +507,13 @@ namespace LongoMatch.Gui.Component
                        this.numberspinbutton.ClimbRate = 1;
                        this.numberspinbutton.Numeric = true;
                        this.table1.Add (this.numberspinbutton);
-                       global::Gtk.Table.TableChild w30 = ((global::Gtk.Table.TableChild)(this.table1 
[this.numberspinbutton]));
-                       w30.TopAttach = ((uint)(1));
-                       w30.BottomAttach = ((uint)(2));
-                       w30.LeftAttach = ((uint)(1));
-                       w30.RightAttach = ((uint)(2));
-                       w30.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w30.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w58 = ((global::Gtk.Table.TableChild)(this.table1 
[this.numberspinbutton]));
+                       w58.TopAttach = ((uint)(1));
+                       w58.BottomAttach = ((uint)(2));
+                       w58.LeftAttach = ((uint)(1));
+                       w58.RightAttach = ((uint)(2));
+                       w58.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w58.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.positionentry = new global::Gtk.Entry ();
                        this.positionentry.CanFocus = true;
@@ -372,11 +521,11 @@ namespace LongoMatch.Gui.Component
                        this.positionentry.IsEditable = true;
                        this.positionentry.InvisibleChar = '●';
                        this.table1.Add (this.positionentry);
-                       global::Gtk.Table.TableChild w31 = ((global::Gtk.Table.TableChild)(this.table1 
[this.positionentry]));
-                       w31.LeftAttach = ((uint)(3));
-                       w31.RightAttach = ((uint)(4));
-                       w31.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w31.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w59 = ((global::Gtk.Table.TableChild)(this.table1 
[this.positionentry]));
+                       w59.LeftAttach = ((uint)(3));
+                       w59.RightAttach = ((uint)(4));
+                       w59.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w59.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.weightspinbutton = new global::Gtk.SpinButton (0, 1000, 1);
                        this.weightspinbutton.CanFocus = true;
@@ -386,18 +535,18 @@ namespace LongoMatch.Gui.Component
                        this.weightspinbutton.Numeric = true;
                        this.weightspinbutton.Value = 80;
                        this.table1.Add (this.weightspinbutton);
-                       global::Gtk.Table.TableChild w32 = ((global::Gtk.Table.TableChild)(this.table1 
[this.weightspinbutton]));
-                       w32.TopAttach = ((uint)(2));
-                       w32.BottomAttach = ((uint)(3));
-                       w32.LeftAttach = ((uint)(1));
-                       w32.RightAttach = ((uint)(2));
-                       w32.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w32.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w60 = ((global::Gtk.Table.TableChild)(this.table1 
[this.weightspinbutton]));
+                       w60.TopAttach = ((uint)(2));
+                       w60.BottomAttach = ((uint)(3));
+                       w60.LeftAttach = ((uint)(1));
+                       w60.RightAttach = ((uint)(2));
+                       w60.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w60.YOptions = ((global::Gtk.AttachOptions)(4));
                        this.vbox6.Add (this.table1);
-                       global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.table1]));
-                       w33.Position = 1;
-                       w33.Expand = false;
-                       w33.Fill = false;
+                       global::Gtk.Box.BoxChild w61 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.table1]));
+                       w61.Position = 1;
+                       w61.Expand = false;
+                       w61.Fill = false;
                        this.GtkAlignment5.Add (this.vbox6);
                        this.playerframe.Add (this.GtkAlignment5);
                        this.GtkLabel3 = new global::Gtk.Label ();
@@ -406,13 +555,13 @@ namespace LongoMatch.Gui.Component
                        this.GtkLabel3.UseMarkup = true;
                        this.playerframe.LabelWidget = this.GtkLabel3;
                        this.hbox4.Add (this.playerframe);
-                       global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.playerframe]));
-                       w36.Position = 2;
-                       w36.Expand = false;
-                       w36.Fill = false;
+                       global::Gtk.Box.BoxChild w64 = ((global::Gtk.Box.BoxChild)(this.hbox4 
[this.playerframe]));
+                       w64.Position = 2;
+                       w64.Expand = false;
+                       w64.Fill = false;
                        this.vbox3.Add (this.hbox4);
-                       global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox4]));
-                       w37.Position = 0;
+                       global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox4]));
+                       w65.Position = 0;
                        // Container child vbox3.Gtk.Box+BoxChild
                        this.hbuttonbox2 = new global::Gtk.HButtonBox ();
                        this.hbuttonbox2.Name = "hbuttonbox2";
@@ -423,86 +572,87 @@ namespace LongoMatch.Gui.Component
                        this.savebutton.Name = "savebutton";
                        this.savebutton.UseUnderline = true;
                        // Container child savebutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w38 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w66 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w39 = new global::Gtk.HBox ();
-                       w39.Spacing = 2;
+                       global::Gtk.HBox w67 = new global::Gtk.HBox ();
+                       w67.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w40 = new global::Gtk.Image ();
-                       w40.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save", 
global::Gtk.IconSize.Dialog);
-                       w39.Add (w40);
+                       global::Gtk.Image w68 = new global::Gtk.Image ();
+                       w68.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save", 
global::Gtk.IconSize.Dialog);
+                       w67.Add (w68);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w42 = new global::Gtk.Label ();
-                       w42.LabelProp = global::Mono.Unix.Catalog.GetString ("Save template");
-                       w42.UseUnderline = true;
-                       w39.Add (w42);
-                       w38.Add (w39);
-                       this.savebutton.Add (w38);
+                       global::Gtk.Label w70 = new global::Gtk.Label ();
+                       w70.LabelProp = global::Mono.Unix.Catalog.GetString ("Save template");
+                       w70.UseUnderline = true;
+                       w67.Add (w70);
+                       w66.Add (w67);
+                       this.savebutton.Add (w66);
                        this.hbuttonbox2.Add (this.savebutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w46 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.savebutton]));
-                       w46.Expand = false;
-                       w46.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w74 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.savebutton]));
+                       w74.Expand = false;
+                       w74.Fill = false;
                        // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
                        this.newplayerbutton = new global::Gtk.Button ();
                        this.newplayerbutton.CanFocus = true;
                        this.newplayerbutton.Name = "newplayerbutton";
                        this.newplayerbutton.UseUnderline = true;
                        // Container child newplayerbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w47 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w75 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w48 = new global::Gtk.HBox ();
-                       w48.Spacing = 2;
+                       global::Gtk.HBox w76 = new global::Gtk.HBox ();
+                       w76.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w49 = new global::Gtk.Image ();
-                       w49.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
-                       w48.Add (w49);
+                       global::Gtk.Image w77 = new global::Gtk.Image ();
+                       w77.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
+                       w76.Add (w77);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w51 = new global::Gtk.Label ();
-                       w51.LabelProp = global::Mono.Unix.Catalog.GetString ("New player");
-                       w51.UseUnderline = true;
-                       w48.Add (w51);
-                       w47.Add (w48);
-                       this.newplayerbutton.Add (w47);
+                       global::Gtk.Label w79 = new global::Gtk.Label ();
+                       w79.LabelProp = global::Mono.Unix.Catalog.GetString ("New player");
+                       w79.UseUnderline = true;
+                       w76.Add (w79);
+                       w75.Add (w76);
+                       this.newplayerbutton.Add (w75);
                        this.hbuttonbox2.Add (this.newplayerbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w55 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.newplayerbutton]));
-                       w55.Position = 1;
-                       w55.Expand = false;
-                       w55.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w83 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.newplayerbutton]));
+                       w83.Position = 1;
+                       w83.Expand = false;
+                       w83.Fill = false;
                        // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
                        this.deletebutton = new global::Gtk.Button ();
                        this.deletebutton.CanFocus = true;
                        this.deletebutton.Name = "deletebutton";
                        this.deletebutton.UseUnderline = true;
                        // Container child deletebutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w56 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w84 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w57 = new global::Gtk.HBox ();
-                       w57.Spacing = 2;
+                       global::Gtk.HBox w85 = new global::Gtk.HBox ();
+                       w85.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w58 = new global::Gtk.Image ();
-                       w58.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", 
global::Gtk.IconSize.Dialog);
-                       w57.Add (w58);
+                       global::Gtk.Image w86 = new global::Gtk.Image ();
+                       w86.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", 
global::Gtk.IconSize.Dialog);
+                       w85.Add (w86);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w60 = new global::Gtk.Label ();
-                       w60.LabelProp = global::Mono.Unix.Catalog.GetString ("Delete player");
-                       w60.UseUnderline = true;
-                       w57.Add (w60);
-                       w56.Add (w57);
-                       this.deletebutton.Add (w56);
+                       global::Gtk.Label w88 = new global::Gtk.Label ();
+                       w88.LabelProp = global::Mono.Unix.Catalog.GetString ("Delete player");
+                       w88.UseUnderline = true;
+                       w85.Add (w88);
+                       w84.Add (w85);
+                       this.deletebutton.Add (w84);
                        this.hbuttonbox2.Add (this.deletebutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w64 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.deletebutton]));
-                       w64.Position = 2;
-                       w64.Expand = false;
-                       w64.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w92 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.deletebutton]));
+                       w92.Position = 2;
+                       w92.Expand = false;
+                       w92.Fill = false;
                        this.vbox3.Add (this.hbuttonbox2);
-                       global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.hbuttonbox2]));
-                       w65.Position = 1;
-                       w65.Expand = false;
-                       w65.Fill = false;
+                       global::Gtk.Box.BoxChild w93 = ((global::Gtk.Box.BoxChild)(this.vbox3 
[this.hbuttonbox2]));
+                       w93.Position = 1;
+                       w93.Expand = false;
+                       w93.Fill = false;
                        this.Add (this.vbox3);
                        if ((this.Child != null)) {
                                this.Child.ShowAll ();
                        }
+                       this.warninglabel.Hide ();
                        this.Hide ();
                }
        }
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs 
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
index eb071b0..886d035 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
@@ -31,7 +31,7 @@ namespace LongoMatch.Gui.Panel
                private global::Gtk.Entry competitionentry;
                private global::Gtk.Label Competitionlabel;
                private global::Gtk.HBox hbox5;
-               private global::Gtk.Entry dateEntry;
+               private global::Gtk.Label datelabel;
                private global::Gtk.Button calendarbutton;
                private global::Gtk.HBox hbox9;
                private global::Gtk.SpinButton localSpinButton;
@@ -67,15 +67,15 @@ namespace LongoMatch.Gui.Panel
                private global::Gtk.Label qualitylabel;
                private global::Gtk.Label sizelabel;
                private global::Gtk.Label videoformatlabel;
-               private global::Gtk.HBox hbox8;
-               private global::Gtk.Frame frame1;
-               private global::Gtk.Alignment GtkAlignment6;
-               private global::LongoMatch.Gui.Component.TeamPlayersSelection localteamplayersselection;
-               private global::Gtk.Label GtkLabel10;
-               private global::Gtk.Frame frame2;
-               private global::Gtk.Alignment GtkAlignment7;
-               private global::LongoMatch.Gui.Component.TeamPlayersSelection awayteamplayersselection;
-               private global::Gtk.Label GtkLabel11;
+               private global::Gtk.VBox vbox5;
+               private global::Gtk.HBox hbox10;
+               private global::Gtk.Image homeshieldimage;
+               private global::Gtk.Label homelabel;
+               private global::Gtk.ComboBox hometeamscombobox;
+               private global::Gtk.ComboBox awayteamscombobox;
+               private global::Gtk.Label awaylabel;
+               private global::Gtk.Image awayshieldimage;
+               private global::Gtk.DrawingArea drawingarea1;
                private global::Gtk.Label label3;
                private global::Gtk.HButtonBox hbuttonbox2;
                private global::Gtk.Button backbutton;
@@ -143,7 +143,6 @@ namespace LongoMatch.Gui.Panel
                        this.fromfileradiobutton = new global::Gtk.RadioButton 
(global::Mono.Unix.Catalog.GetString ("New project using a video file"));
                        this.fromfileradiobutton.CanFocus = true;
                        this.fromfileradiobutton.Name = "fromfileradiobutton";
-                       this.fromfileradiobutton.Active = true;
                        this.fromfileradiobutton.DrawIndicator = true;
                        this.fromfileradiobutton.UseUnderline = true;
                        this.fromfileradiobutton.FocusOnClick = false;
@@ -278,6 +277,7 @@ namespace LongoMatch.Gui.Panel
                        global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1 
[this.competitionentry]));
                        w19.LeftAttach = ((uint)(3));
                        w19.RightAttach = ((uint)(4));
+                       w19.XOptions = ((global::Gtk.AttachOptions)(4));
                        w19.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.Competitionlabel = new global::Gtk.Label ();
@@ -293,14 +293,12 @@ namespace LongoMatch.Gui.Panel
                        this.hbox5 = new global::Gtk.HBox ();
                        this.hbox5.Name = "hbox5";
                        // Container child hbox5.Gtk.Box+BoxChild
-                       this.dateEntry = new global::Gtk.Entry ();
-                       this.dateEntry.CanFocus = true;
-                       this.dateEntry.Name = "dateEntry";
-                       this.dateEntry.IsEditable = false;
-                       this.dateEntry.InvisibleChar = '●';
-                       this.hbox5.Add (this.dateEntry);
-                       global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox5 
[this.dateEntry]));
+                       this.datelabel = new global::Gtk.Label ();
+                       this.datelabel.Name = "datelabel";
+                       this.hbox5.Add (this.datelabel);
+                       global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox5 
[this.datelabel]));
                        w21.Position = 0;
+                       w21.Fill = false;
                        // Container child hbox5.Gtk.Box+BoxChild
                        this.calendarbutton = new global::Gtk.Button ();
                        this.calendarbutton.CanFocus = true;
@@ -317,8 +315,6 @@ namespace LongoMatch.Gui.Panel
                        w23.Add (w24);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
                        global::Gtk.Label w26 = new global::Gtk.Label ();
-                       w26.LabelProp = global::Mono.Unix.Catalog.GetString ("_Calendar");
-                       w26.UseUnderline = true;
                        w23.Add (w26);
                        w22.Add (w23);
                        this.calendarbutton.Add (w22);
@@ -333,6 +329,7 @@ namespace LongoMatch.Gui.Panel
                        w31.BottomAttach = ((uint)(2));
                        w31.LeftAttach = ((uint)(3));
                        w31.RightAttach = ((uint)(4));
+                       w31.XOptions = ((global::Gtk.AttachOptions)(4));
                        w31.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.hbox9 = new global::Gtk.HBox ();
@@ -427,7 +424,6 @@ namespace LongoMatch.Gui.Panel
                        this.seasonlabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Season:");
                        this.table1.Add (this.seasonlabel);
                        global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table1 
[this.seasonlabel]));
-                       w40.XOptions = ((global::Gtk.AttachOptions)(4));
                        w40.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child table1.Gtk.Table+TableChild
                        this.tagscombobox = global::Gtk.ComboBox.NewText ();
@@ -444,7 +440,6 @@ namespace LongoMatch.Gui.Panel
                        global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.table1]));
                        w42.Position = 2;
                        w42.Expand = false;
-                       w42.Fill = false;
                        // Container child vbox4.Gtk.Box+BoxChild
                        this.hseparator3 = new global::Gtk.HSeparator ();
                        this.hseparator3.Name = "hseparator3";
@@ -476,31 +471,43 @@ namespace LongoMatch.Gui.Panel
                        this.openbutton = new global::Gtk.Button ();
                        this.openbutton.CanFocus = true;
                        this.openbutton.Name = "openbutton";
-                       this.openbutton.UseStock = true;
                        this.openbutton.UseUnderline = true;
-                       this.openbutton.Label = "gtk-open";
+                       // Container child openbutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w45 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w46 = new global::Gtk.HBox ();
+                       w46.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w47 = new global::Gtk.Image ();
+                       w47.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-open", 
global::Gtk.IconSize.Menu);
+                       w46.Add (w47);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w49 = new global::Gtk.Label ();
+                       w46.Add (w49);
+                       w45.Add (w46);
+                       this.openbutton.Add (w45);
                        this.filehbox.Add (this.openbutton);
-                       global::Gtk.Box.BoxChild w45 = ((global::Gtk.Box.BoxChild)(this.filehbox 
[this.openbutton]));
-                       w45.Position = 1;
-                       w45.Expand = false;
+                       global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.filehbox 
[this.openbutton]));
+                       w53.Position = 1;
+                       w53.Expand = false;
                        this.filetable.Add (this.filehbox);
-                       global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.filehbox]));
-                       w46.LeftAttach = ((uint)(1));
-                       w46.RightAttach = ((uint)(2));
-                       w46.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.filehbox]));
+                       w54.LeftAttach = ((uint)(1));
+                       w54.RightAttach = ((uint)(2));
+                       w54.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child filetable.Gtk.Table+TableChild
                        this.filelabel = new global::Gtk.Label ();
                        this.filelabel.Name = "filelabel";
                        this.filelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("File:");
                        this.filetable.Add (this.filelabel);
-                       global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.filelabel]));
-                       w47.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w47.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w55 = ((global::Gtk.Table.TableChild)(this.filetable 
[this.filelabel]));
+                       w55.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w55.YOptions = ((global::Gtk.AttachOptions)(4));
                        this.vbox4.Add (this.filetable);
-                       global::Gtk.Box.BoxChild w48 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.filetable]));
-                       w48.Position = 4;
-                       w48.Expand = false;
-                       w48.Fill = false;
+                       global::Gtk.Box.BoxChild w56 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.filetable]));
+                       w56.Position = 4;
+                       w56.Expand = false;
+                       w56.Fill = false;
                        // Container child vbox4.Gtk.Box+BoxChild
                        this.outputfiletable = new global::Gtk.Table (((uint)(1)), ((uint)(4)), true);
                        this.outputfiletable.Name = "outputfiletable";
@@ -518,37 +525,49 @@ namespace LongoMatch.Gui.Panel
                        this.outfileEntry.HasFrame = false;
                        this.outfileEntry.InvisibleChar = '●';
                        this.outputfilehbox1.Add (this.outfileEntry);
-                       global::Gtk.Box.BoxChild w49 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.outfileEntry]));
-                       w49.Position = 0;
+                       global::Gtk.Box.BoxChild w57 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.outfileEntry]));
+                       w57.Position = 0;
                        // Container child outputfilehbox1.Gtk.Box+BoxChild
                        this.savebutton = new global::Gtk.Button ();
                        this.savebutton.CanFocus = true;
                        this.savebutton.Name = "savebutton";
-                       this.savebutton.UseStock = true;
                        this.savebutton.UseUnderline = true;
-                       this.savebutton.Label = "gtk-save-as";
+                       // Container child savebutton.Gtk.Container+ContainerChild
+                       global::Gtk.Alignment w58 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       // Container child GtkAlignment.Gtk.Container+ContainerChild
+                       global::Gtk.HBox w59 = new global::Gtk.HBox ();
+                       w59.Spacing = 2;
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Image w60 = new global::Gtk.Image ();
+                       w60.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save-as", 
global::Gtk.IconSize.Menu);
+                       w59.Add (w60);
+                       // Container child GtkHBox.Gtk.Container+ContainerChild
+                       global::Gtk.Label w62 = new global::Gtk.Label ();
+                       w59.Add (w62);
+                       w58.Add (w59);
+                       this.savebutton.Add (w58);
                        this.outputfilehbox1.Add (this.savebutton);
-                       global::Gtk.Box.BoxChild w50 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.savebutton]));
-                       w50.Position = 1;
-                       w50.Expand = false;
+                       global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.outputfilehbox1 
[this.savebutton]));
+                       w66.Position = 1;
+                       w66.Expand = false;
                        this.outputfiletable.Add (this.outputfilehbox1);
-                       global::Gtk.Table.TableChild w51 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilehbox1]));
-                       w51.LeftAttach = ((uint)(1));
-                       w51.RightAttach = ((uint)(2));
-                       w51.YOptions = ((global::Gtk.AttachOptions)(0));
+                       global::Gtk.Table.TableChild w67 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilehbox1]));
+                       w67.LeftAttach = ((uint)(1));
+                       w67.RightAttach = ((uint)(2));
+                       w67.YOptions = ((global::Gtk.AttachOptions)(0));
                        // Container child outputfiletable.Gtk.Table+TableChild
                        this.outputfilelabel = new global::Gtk.Label ();
                        this.outputfilelabel.Name = "outputfilelabel";
                        this.outputfilelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Output file:");
                        this.outputfiletable.Add (this.outputfilelabel);
-                       global::Gtk.Table.TableChild w52 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilelabel]));
-                       w52.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w52.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w68 = 
((global::Gtk.Table.TableChild)(this.outputfiletable [this.outputfilelabel]));
+                       w68.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w68.YOptions = ((global::Gtk.AttachOptions)(4));
                        this.vbox4.Add (this.outputfiletable);
-                       global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.outputfiletable]));
-                       w53.Position = 5;
-                       w53.Expand = false;
-                       w53.Fill = false;
+                       global::Gtk.Box.BoxChild w69 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.outputfiletable]));
+                       w69.Position = 5;
+                       w69.Expand = false;
+                       w69.Fill = false;
                        // Container child vbox4.Gtk.Box+BoxChild
                        this.capturetable = new global::Gtk.Table (((uint)(2)), ((uint)(4)), true);
                        this.capturetable.Name = "capturetable";
@@ -558,11 +577,11 @@ namespace LongoMatch.Gui.Panel
                        this.encodingcombobox = global::Gtk.ComboBox.NewText ();
                        this.encodingcombobox.Name = "encodingcombobox";
                        this.capturetable.Add (this.encodingcombobox);
-                       global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.encodingcombobox]));
-                       w54.LeftAttach = ((uint)(3));
-                       w54.RightAttach = ((uint)(4));
-                       w54.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w54.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w70 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.encodingcombobox]));
+                       w70.LeftAttach = ((uint)(3));
+                       w70.RightAttach = ((uint)(4));
+                       w70.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w70.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.hbox6 = new global::Gtk.HBox ();
                        this.hbox6.Name = "hbox6";
@@ -572,19 +591,19 @@ namespace LongoMatch.Gui.Panel
                        this.device.Name = "device";
                        this.device.LabelProp = global::Mono.Unix.Catalog.GetString ("Device:");
                        this.hbox6.Add (this.device);
-                       global::Gtk.Box.BoxChild w55 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.device]));
-                       w55.Position = 0;
+                       global::Gtk.Box.BoxChild w71 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.device]));
+                       w71.Position = 0;
                        // Container child hbox6.Gtk.Box+BoxChild
                        this.urilabel = new global::Gtk.Label ();
                        this.urilabel.Name = "urilabel";
                        this.urilabel.LabelProp = global::Mono.Unix.Catalog.GetString ("URL:");
                        this.hbox6.Add (this.urilabel);
-                       global::Gtk.Box.BoxChild w56 = ((global::Gtk.Box.BoxChild)(this.hbox6 
[this.urilabel]));
-                       w56.Position = 1;
+                       global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox6 
[this.urilabel]));
+                       w72.Position = 1;
                        this.capturetable.Add (this.hbox6);
-                       global::Gtk.Table.TableChild w57 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox6]));
-                       w57.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w57.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w73 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox6]));
+                       w73.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w73.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.hbox7 = new global::Gtk.HBox ();
                        this.hbox7.Name = "hbox7";
@@ -593,8 +612,8 @@ namespace LongoMatch.Gui.Panel
                        this.devicecombobox = global::Gtk.ComboBox.NewText ();
                        this.devicecombobox.Name = "devicecombobox";
                        this.hbox7.Add (this.devicecombobox);
-                       global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.devicecombobox]));
-                       w58.Position = 0;
+                       global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.devicecombobox]));
+                       w74.Position = 0;
                        // Container child hbox7.Gtk.Box+BoxChild
                        this.urientry = new global::Gtk.Entry ();
                        this.urientry.CanFocus = true;
@@ -602,129 +621,145 @@ namespace LongoMatch.Gui.Panel
                        this.urientry.IsEditable = true;
                        this.urientry.InvisibleChar = '•';
                        this.hbox7.Add (this.urientry);
-                       global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.urientry]));
-                       w59.Position = 1;
+                       global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox7 
[this.urientry]));
+                       w75.Position = 1;
                        this.capturetable.Add (this.hbox7);
-                       global::Gtk.Table.TableChild w60 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox7]));
-                       w60.LeftAttach = ((uint)(1));
-                       w60.RightAttach = ((uint)(2));
-                       w60.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w60.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w76 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.hbox7]));
+                       w76.LeftAttach = ((uint)(1));
+                       w76.RightAttach = ((uint)(2));
+                       w76.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w76.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.imagecombobox = global::Gtk.ComboBox.NewText ();
                        this.imagecombobox.Name = "imagecombobox";
                        this.capturetable.Add (this.imagecombobox);
-                       global::Gtk.Table.TableChild w61 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.imagecombobox]));
-                       w61.TopAttach = ((uint)(1));
-                       w61.BottomAttach = ((uint)(2));
-                       w61.LeftAttach = ((uint)(1));
-                       w61.RightAttach = ((uint)(2));
-                       w61.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w61.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w77 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.imagecombobox]));
+                       w77.TopAttach = ((uint)(1));
+                       w77.BottomAttach = ((uint)(2));
+                       w77.LeftAttach = ((uint)(1));
+                       w77.RightAttach = ((uint)(2));
+                       w77.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w77.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.qualitycombobox = global::Gtk.ComboBox.NewText ();
                        this.qualitycombobox.Name = "qualitycombobox";
                        this.capturetable.Add (this.qualitycombobox);
-                       global::Gtk.Table.TableChild w62 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitycombobox]));
-                       w62.TopAttach = ((uint)(1));
-                       w62.BottomAttach = ((uint)(2));
-                       w62.LeftAttach = ((uint)(3));
-                       w62.RightAttach = ((uint)(4));
-                       w62.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w62.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w78 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitycombobox]));
+                       w78.TopAttach = ((uint)(1));
+                       w78.BottomAttach = ((uint)(2));
+                       w78.LeftAttach = ((uint)(3));
+                       w78.RightAttach = ((uint)(4));
+                       w78.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w78.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.qualitylabel = new global::Gtk.Label ();
                        this.qualitylabel.Name = "qualitylabel";
                        this.qualitylabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Quality:");
                        this.capturetable.Add (this.qualitylabel);
-                       global::Gtk.Table.TableChild w63 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitylabel]));
-                       w63.TopAttach = ((uint)(1));
-                       w63.BottomAttach = ((uint)(2));
-                       w63.LeftAttach = ((uint)(2));
-                       w63.RightAttach = ((uint)(3));
-                       w63.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w63.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w79 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.qualitylabel]));
+                       w79.TopAttach = ((uint)(1));
+                       w79.BottomAttach = ((uint)(2));
+                       w79.LeftAttach = ((uint)(2));
+                       w79.RightAttach = ((uint)(3));
+                       w79.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w79.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.sizelabel = new global::Gtk.Label ();
                        this.sizelabel.Name = "sizelabel";
                        this.sizelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Image format:");
                        this.capturetable.Add (this.sizelabel);
-                       global::Gtk.Table.TableChild w64 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.sizelabel]));
-                       w64.TopAttach = ((uint)(1));
-                       w64.BottomAttach = ((uint)(2));
-                       w64.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w80 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.sizelabel]));
+                       w80.TopAttach = ((uint)(1));
+                       w80.BottomAttach = ((uint)(2));
+                       w80.YOptions = ((global::Gtk.AttachOptions)(4));
                        // Container child capturetable.Gtk.Table+TableChild
                        this.videoformatlabel = new global::Gtk.Label ();
                        this.videoformatlabel.Name = "videoformatlabel";
                        this.videoformatlabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Encoding 
format:");
                        this.capturetable.Add (this.videoformatlabel);
-                       global::Gtk.Table.TableChild w65 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.videoformatlabel]));
-                       w65.LeftAttach = ((uint)(2));
-                       w65.RightAttach = ((uint)(3));
-                       w65.XOptions = ((global::Gtk.AttachOptions)(4));
-                       w65.YOptions = ((global::Gtk.AttachOptions)(4));
+                       global::Gtk.Table.TableChild w81 = ((global::Gtk.Table.TableChild)(this.capturetable 
[this.videoformatlabel]));
+                       w81.LeftAttach = ((uint)(2));
+                       w81.RightAttach = ((uint)(3));
+                       w81.XOptions = ((global::Gtk.AttachOptions)(4));
+                       w81.YOptions = ((global::Gtk.AttachOptions)(4));
                        this.vbox4.Add (this.capturetable);
-                       global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.capturetable]));
-                       w66.Position = 6;
-                       w66.Expand = false;
-                       w66.Fill = false;
+                       global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox4 
[this.capturetable]));
+                       w82.Position = 6;
+                       w82.Expand = false;
+                       w82.Fill = false;
                        // Container child vbox4.Gtk.Box+BoxChild
-                       this.hbox8 = new global::Gtk.HBox ();
-                       this.hbox8.Name = "hbox8";
-                       this.hbox8.Homogeneous = true;
-                       this.hbox8.Spacing = 6;
-                       // Container child hbox8.Gtk.Box+BoxChild
-                       this.frame1 = new global::Gtk.Frame ();
-                       this.frame1.Name = "frame1";
-                       this.frame1.ShadowType = ((global::Gtk.ShadowType)(0));
-                       // Container child frame1.Gtk.Container+ContainerChild
-                       this.GtkAlignment6 = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
-                       this.GtkAlignment6.Name = "GtkAlignment6";
-                       this.GtkAlignment6.LeftPadding = ((uint)(12));
-                       // Container child GtkAlignment6.Gtk.Container+ContainerChild
-                       this.localteamplayersselection = new 
global::LongoMatch.Gui.Component.TeamPlayersSelection ();
-                       this.localteamplayersselection.Events = ((global::Gdk.EventMask)(256));
-                       this.localteamplayersselection.Name = "localteamplayersselection";
-                       this.GtkAlignment6.Add (this.localteamplayersselection);
-                       this.frame1.Add (this.GtkAlignment6);
-                       this.GtkLabel10 = new global::Gtk.Label ();
-                       this.GtkLabel10.Name = "GtkLabel10";
-                       this.GtkLabel10.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Home team</b>");
-                       this.GtkLabel10.UseMarkup = true;
-                       this.frame1.LabelWidget = this.GtkLabel10;
-                       this.hbox8.Add (this.frame1);
-                       global::Gtk.Box.BoxChild w69 = ((global::Gtk.Box.BoxChild)(this.hbox8 [this.frame1]));
-                       w69.Position = 0;
-                       // Container child hbox8.Gtk.Box+BoxChild
-                       this.frame2 = new global::Gtk.Frame ();
-                       this.frame2.Name = "frame2";
-                       this.frame2.ShadowType = ((global::Gtk.ShadowType)(0));
-                       // Container child frame2.Gtk.Container+ContainerChild
-                       this.GtkAlignment7 = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
-                       this.GtkAlignment7.Name = "GtkAlignment7";
-                       this.GtkAlignment7.LeftPadding = ((uint)(12));
-                       // Container child GtkAlignment7.Gtk.Container+ContainerChild
-                       this.awayteamplayersselection = new 
global::LongoMatch.Gui.Component.TeamPlayersSelection ();
-                       this.awayteamplayersselection.Events = ((global::Gdk.EventMask)(256));
-                       this.awayteamplayersselection.Name = "awayteamplayersselection";
-                       this.GtkAlignment7.Add (this.awayteamplayersselection);
-                       this.frame2.Add (this.GtkAlignment7);
-                       this.GtkLabel11 = new global::Gtk.Label ();
-                       this.GtkLabel11.Name = "GtkLabel11";
-                       this.GtkLabel11.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Away team</b>");
-                       this.GtkLabel11.UseMarkup = true;
-                       this.frame2.LabelWidget = this.GtkLabel11;
-                       this.hbox8.Add (this.frame2);
-                       global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox8 [this.frame2]));
-                       w72.Position = 1;
-                       this.vbox4.Add (this.hbox8);
-                       global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox8]));
-                       w73.Position = 7;
+                       this.vbox5 = new global::Gtk.VBox ();
+                       this.vbox5.Name = "vbox5";
+                       this.vbox5.Spacing = 6;
+                       // Container child vbox5.Gtk.Box+BoxChild
+                       this.hbox10 = new global::Gtk.HBox ();
+                       this.hbox10.Name = "hbox10";
+                       this.hbox10.Spacing = 6;
+                       // Container child hbox10.Gtk.Box+BoxChild
+                       this.homeshieldimage = new global::Gtk.Image ();
+                       this.homeshieldimage.Name = "homeshieldimage";
+                       this.hbox10.Add (this.homeshieldimage);
+                       global::Gtk.Box.BoxChild w83 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.homeshieldimage]));
+                       w83.Position = 0;
+                       w83.Expand = false;
+                       w83.Fill = false;
+                       // Container child hbox10.Gtk.Box+BoxChild
+                       this.homelabel = new global::Gtk.Label ();
+                       this.homelabel.Name = "homelabel";
+                       this.hbox10.Add (this.homelabel);
+                       global::Gtk.Box.BoxChild w84 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.homelabel]));
+                       w84.Position = 1;
+                       w84.Expand = false;
+                       w84.Fill = false;
+                       // Container child hbox10.Gtk.Box+BoxChild
+                       this.hometeamscombobox = global::Gtk.ComboBox.NewText ();
+                       this.hometeamscombobox.Name = "hometeamscombobox";
+                       this.hbox10.Add (this.hometeamscombobox);
+                       global::Gtk.Box.BoxChild w85 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.hometeamscombobox]));
+                       w85.Position = 2;
+                       w85.Fill = false;
+                       // Container child hbox10.Gtk.Box+BoxChild
+                       this.awayteamscombobox = global::Gtk.ComboBox.NewText ();
+                       this.awayteamscombobox.Name = "awayteamscombobox";
+                       this.hbox10.Add (this.awayteamscombobox);
+                       global::Gtk.Box.BoxChild w86 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.awayteamscombobox]));
+                       w86.Position = 3;
+                       w86.Fill = false;
+                       // Container child hbox10.Gtk.Box+BoxChild
+                       this.awaylabel = new global::Gtk.Label ();
+                       this.awaylabel.Name = "awaylabel";
+                       this.hbox10.Add (this.awaylabel);
+                       global::Gtk.Box.BoxChild w87 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.awaylabel]));
+                       w87.Position = 4;
+                       w87.Expand = false;
+                       w87.Fill = false;
+                       // Container child hbox10.Gtk.Box+BoxChild
+                       this.awayshieldimage = new global::Gtk.Image ();
+                       this.awayshieldimage.Name = "awayshieldimage";
+                       this.hbox10.Add (this.awayshieldimage);
+                       global::Gtk.Box.BoxChild w88 = ((global::Gtk.Box.BoxChild)(this.hbox10 
[this.awayshieldimage]));
+                       w88.Position = 5;
+                       w88.Expand = false;
+                       w88.Fill = false;
+                       this.vbox5.Add (this.hbox10);
+                       global::Gtk.Box.BoxChild w89 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox10]));
+                       w89.Position = 0;
+                       w89.Expand = false;
+                       w89.Fill = false;
+                       // Container child vbox5.Gtk.Box+BoxChild
+                       this.drawingarea1 = new global::Gtk.DrawingArea ();
+                       this.drawingarea1.Name = "drawingarea1";
+                       this.vbox5.Add (this.drawingarea1);
+                       global::Gtk.Box.BoxChild w90 = ((global::Gtk.Box.BoxChild)(this.vbox5 
[this.drawingarea1]));
+                       w90.Position = 1;
+                       this.vbox4.Add (this.vbox5);
+                       global::Gtk.Box.BoxChild w91 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.vbox5]));
+                       w91.Position = 7;
                        this.notebook1.Add (this.vbox4);
-                       global::Gtk.Notebook.NotebookChild w74 = 
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox4]));
-                       w74.Position = 1;
-                       w74.TabFill = false;
-                       w74.MenuLabel = "";
+                       global::Gtk.Notebook.NotebookChild w92 = 
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox4]));
+                       w92.Position = 1;
+                       w92.TabFill = false;
+                       w92.MenuLabel = "";
                        // Notebook tab
                        this.label3 = new global::Gtk.Label ();
                        this.label3.Name = "label3";
@@ -732,11 +767,11 @@ namespace LongoMatch.Gui.Panel
                        this.notebook1.SetTabLabel (this.vbox4, this.label3);
                        this.label3.ShowAll ();
                        this.hbox3.Add (this.notebook1);
-                       global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.notebook1]));
-                       w75.Position = 1;
+                       global::Gtk.Box.BoxChild w93 = ((global::Gtk.Box.BoxChild)(this.hbox3 
[this.notebook1]));
+                       w93.Position = 1;
                        this.vbox2.Add (this.hbox3);
-                       global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox3]));
-                       w76.Position = 0;
+                       global::Gtk.Box.BoxChild w94 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox3]));
+                       w94.Position = 0;
                        // Container child vbox2.Gtk.Box+BoxChild
                        this.hbuttonbox2 = new global::Gtk.HButtonBox ();
                        this.hbuttonbox2.Name = "hbuttonbox2";
@@ -747,81 +782,81 @@ namespace LongoMatch.Gui.Panel
                        this.backbutton.Name = "backbutton";
                        this.backbutton.UseUnderline = true;
                        // Container child backbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w77 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w95 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w78 = new global::Gtk.HBox ();
-                       w78.Spacing = 2;
+                       global::Gtk.HBox w96 = new global::Gtk.HBox ();
+                       w96.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w79 = new global::Gtk.Image ();
-                       w79.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-back", 
global::Gtk.IconSize.Dialog);
-                       w78.Add (w79);
+                       global::Gtk.Image w97 = new global::Gtk.Image ();
+                       w97.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-back", 
global::Gtk.IconSize.Dialog);
+                       w96.Add (w97);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w81 = new global::Gtk.Label ();
-                       w81.LabelProp = global::Mono.Unix.Catalog.GetString ("_Back");
-                       w81.UseUnderline = true;
-                       w78.Add (w81);
-                       w77.Add (w78);
-                       this.backbutton.Add (w77);
+                       global::Gtk.Label w99 = new global::Gtk.Label ();
+                       w99.LabelProp = global::Mono.Unix.Catalog.GetString ("_Back");
+                       w99.UseUnderline = true;
+                       w96.Add (w99);
+                       w95.Add (w96);
+                       this.backbutton.Add (w95);
                        this.hbuttonbox2.Add (this.backbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w85 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.backbutton]));
-                       w85.Expand = false;
-                       w85.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w103 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.backbutton]));
+                       w103.Expand = false;
+                       w103.Fill = false;
                        // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
                        this.nextbutton = new global::Gtk.Button ();
                        this.nextbutton.CanFocus = true;
                        this.nextbutton.Name = "nextbutton";
                        this.nextbutton.UseUnderline = true;
                        // Container child nextbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w86 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w104 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w87 = new global::Gtk.HBox ();
-                       w87.Spacing = 2;
+                       global::Gtk.HBox w105 = new global::Gtk.HBox ();
+                       w105.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w88 = new global::Gtk.Image ();
-                       w88.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", 
global::Gtk.IconSize.Dialog);
-                       w87.Add (w88);
+                       global::Gtk.Image w106 = new global::Gtk.Image ();
+                       w106.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", 
global::Gtk.IconSize.Dialog);
+                       w105.Add (w106);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w90 = new global::Gtk.Label ();
-                       w90.LabelProp = global::Mono.Unix.Catalog.GetString ("_Next");
-                       w90.UseUnderline = true;
-                       w87.Add (w90);
-                       w86.Add (w87);
-                       this.nextbutton.Add (w86);
+                       global::Gtk.Label w108 = new global::Gtk.Label ();
+                       w108.LabelProp = global::Mono.Unix.Catalog.GetString ("_Next");
+                       w108.UseUnderline = true;
+                       w105.Add (w108);
+                       w104.Add (w105);
+                       this.nextbutton.Add (w104);
                        this.hbuttonbox2.Add (this.nextbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w94 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.nextbutton]));
-                       w94.Position = 1;
-                       w94.Expand = false;
-                       w94.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w112 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.nextbutton]));
+                       w112.Position = 1;
+                       w112.Expand = false;
+                       w112.Fill = false;
                        // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
                        this.createbutton = new global::Gtk.Button ();
                        this.createbutton.CanFocus = true;
                        this.createbutton.Name = "createbutton";
                        this.createbutton.UseUnderline = true;
                        // Container child createbutton.Gtk.Container+ContainerChild
-                       global::Gtk.Alignment w95 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+                       global::Gtk.Alignment w113 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
                        // Container child GtkAlignment.Gtk.Container+ContainerChild
-                       global::Gtk.HBox w96 = new global::Gtk.HBox ();
-                       w96.Spacing = 2;
+                       global::Gtk.HBox w114 = new global::Gtk.HBox ();
+                       w114.Spacing = 2;
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Image w97 = new global::Gtk.Image ();
-                       w97.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
-                       w96.Add (w97);
+                       global::Gtk.Image w115 = new global::Gtk.Image ();
+                       w115.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", 
global::Gtk.IconSize.Dialog);
+                       w114.Add (w115);
                        // Container child GtkHBox.Gtk.Container+ContainerChild
-                       global::Gtk.Label w99 = new global::Gtk.Label ();
-                       w99.LabelProp = global::Mono.Unix.Catalog.GetString ("Create project");
-                       w99.UseUnderline = true;
-                       w96.Add (w99);
-                       w95.Add (w96);
-                       this.createbutton.Add (w95);
+                       global::Gtk.Label w117 = new global::Gtk.Label ();
+                       w117.LabelProp = global::Mono.Unix.Catalog.GetString ("Create project");
+                       w117.UseUnderline = true;
+                       w114.Add (w117);
+                       w113.Add (w114);
+                       this.createbutton.Add (w113);
                        this.hbuttonbox2.Add (this.createbutton);
-                       global::Gtk.ButtonBox.ButtonBoxChild w103 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.createbutton]));
-                       w103.Position = 2;
-                       w103.Expand = false;
-                       w103.Fill = false;
+                       global::Gtk.ButtonBox.ButtonBoxChild w121 = 
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.createbutton]));
+                       w121.Position = 2;
+                       w121.Expand = false;
+                       w121.Fill = false;
                        this.vbox2.Add (this.hbuttonbox2);
-                       global::Gtk.Box.BoxChild w104 = ((global::Gtk.Box.BoxChild)(this.vbox2 
[this.hbuttonbox2]));
-                       w104.Position = 1;
-                       w104.Expand = false;
+                       global::Gtk.Box.BoxChild w122 = ((global::Gtk.Box.BoxChild)(this.vbox2 
[this.hbuttonbox2]));
+                       w122.Position = 1;
+                       w122.Expand = false;
                        this.Add (this.vbox2);
                        if ((this.Child != null)) {
                                this.Child.ShowAll ();
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index 395ecfc..430d546 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -4023,48 +4023,6 @@ You can continue with the current capture, cancel it or save your project.
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.TeamTaggerWidget" design-size="300 29">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <child>
-      <widget class="Gtk.Frame" id="frame">
-        <property name="MemberName" />
-        <property name="ShadowType">Out</property>
-        <child>
-          <widget class="Gtk.Alignment" id="GtkAlignment">
-            <property name="MemberName" />
-            <property name="Xalign">0</property>
-            <property name="Yalign">0</property>
-            <property name="LeftPadding">12</property>
-            <child>
-              <widget class="Gtk.HBox" id="buttonsbox">
-                <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-            </child>
-          </widget>
-        </child>
-        <child>
-          <widget class="Gtk.Label" id="titlelabel">
-            <property name="MemberName" />
-            <property name="UseMarkup">True</property>
-          </widget>
-          <packing>
-            <property name="type">label_item</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
   <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.RenderingStateBar" design-size="204 28">
     <property name="MemberName" />
     <property name="Visible">False</property>
@@ -6061,7 +6019,6 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="Label" translatable="yes">Histogram</property>
-                <property name="Active">True</property>
                 <property name="DrawIndicator">True</property>
                 <property name="HasLabel">True</property>
                 <property name="UseUnderline">True</property>
@@ -7035,7 +6992,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.NewProjectPanel" design-size="1336 647">
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.NewProjectPanel" design-size="824 647">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -7103,7 +7060,6 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                             <property name="MemberName" />
                             <property name="CanFocus">True</property>
                             <property name="Label" translatable="yes">New project using a video 
file</property>
-                            <property name="Active">True</property>
                             <property name="DrawIndicator">True</property>
                             <property name="HasLabel">True</property>
                             <property name="UseUnderline">True</property>
@@ -7300,9 +7256,10 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                           <packing>
                             <property name="LeftAttach">3</property>
                             <property name="RightAttach">4</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
+                            <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
-                            <property name="XExpand">True</property>
+                            <property name="XExpand">False</property>
                             <property name="XFill">True</property>
                             <property name="XShrink">False</property>
                             <property name="YExpand">False</property>
@@ -7318,7 +7275,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                           <packing>
                             <property name="LeftAttach">2</property>
                             <property name="RightAttach">3</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
                             <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
                             <property name="XExpand">False</property>
@@ -7333,15 +7290,13 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                           <widget class="Gtk.HBox" id="hbox5">
                             <property name="MemberName" />
                             <child>
-                              <widget class="Gtk.Entry" id="dateEntry">
-                                <property name="MemberName">dateEntry</property>
-                                <property name="CanFocus">True</property>
-                                <property name="IsEditable">False</property>
-                                <property name="InvisibleChar">●</property>
+                              <widget class="Gtk.Label" id="datelabel">
+                                <property name="MemberName" />
                               </widget>
                               <packing>
                                 <property name="Position">0</property>
-                                <property name="AutoSize">True</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
                             <child>
@@ -7350,7 +7305,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                                 <property name="CanFocus">True</property>
                                 <property name="Type">TextAndIcon</property>
                                 <property name="Icon">stock:stock_calendar Button</property>
-                                <property name="Label" translatable="yes">_Calendar</property>
+                                <property name="Label" translatable="yes" />
                                 <property name="UseUnderline">True</property>
                               </widget>
                               <packing>
@@ -7367,8 +7322,9 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                             <property name="LeftAttach">3</property>
                             <property name="RightAttach">4</property>
                             <property name="AutoSize">True</property>
+                            <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
-                            <property name="XExpand">True</property>
+                            <property name="XExpand">False</property>
                             <property name="XFill">True</property>
                             <property name="XShrink">False</property>
                             <property name="YExpand">False</property>
@@ -7449,7 +7405,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                           <packing>
                             <property name="TopAttach">1</property>
                             <property name="BottomAttach">2</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
                             <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
                             <property name="XExpand">False</property>
@@ -7470,7 +7426,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                             <property name="BottomAttach">2</property>
                             <property name="LeftAttach">2</property>
                             <property name="RightAttach">3</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
                             <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
                             <property name="XExpand">False</property>
@@ -7489,7 +7445,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                           <packing>
                             <property name="TopAttach">2</property>
                             <property name="BottomAttach">3</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
                             <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
                             <property name="XExpand">False</property>
@@ -7510,7 +7466,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                           <packing>
                             <property name="LeftAttach">1</property>
                             <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
                             <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
                             <property name="XExpand">False</property>
@@ -7527,10 +7483,9 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                             <property name="LabelProp" translatable="yes">Season:</property>
                           </widget>
                           <packing>
-                            <property name="AutoSize">True</property>
-                            <property name="XOptions">Fill</property>
+                            <property name="AutoSize">False</property>
                             <property name="YOptions">Fill</property>
-                            <property name="XExpand">False</property>
+                            <property name="XExpand">True</property>
                             <property name="XFill">True</property>
                             <property name="XShrink">False</property>
                             <property name="YExpand">False</property>
@@ -7549,7 +7504,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                             <property name="BottomAttach">3</property>
                             <property name="LeftAttach">1</property>
                             <property name="RightAttach">2</property>
-                            <property name="AutoSize">True</property>
+                            <property name="AutoSize">False</property>
                             <property name="XOptions">Fill</property>
                             <property name="YOptions">Fill</property>
                             <property name="XExpand">False</property>
@@ -7563,9 +7518,8 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                       </widget>
                       <packing>
                         <property name="Position">2</property>
-                        <property name="AutoSize">True</property>
+                        <property name="AutoSize">False</property>
                         <property name="Expand">False</property>
-                        <property name="Fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -7607,17 +7561,17 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                               </widget>
                               <packing>
                                 <property name="Position">0</property>
-                                <property name="AutoSize">True</property>
+                                <property name="AutoSize">False</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="Gtk.Button" id="openbutton">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
-                                <property name="UseStock">True</property>
-                                <property name="Type">StockItem</property>
-                                <property name="StockId">gtk-open</property>
-                                <property name="label">gtk-open</property>
+                                <property name="Type">TextAndIcon</property>
+                                <property name="Icon">stock:gtk-open Menu</property>
+                                <property name="Label" translatable="yes" />
+                                <property name="UseUnderline">True</property>
                               </widget>
                               <packing>
                                 <property name="Position">1</property>
@@ -7692,17 +7646,17 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                               </widget>
                               <packing>
                                 <property name="Position">0</property>
-                                <property name="AutoSize">True</property>
+                                <property name="AutoSize">False</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="Gtk.Button" id="savebutton">
                                 <property name="MemberName" />
                                 <property name="CanFocus">True</property>
-                                <property name="UseStock">True</property>
-                                <property name="Type">StockItem</property>
-                                <property name="StockId">gtk-save-as</property>
-                                <property name="label">gtk-save-as</property>
+                                <property name="Type">TextAndIcon</property>
+                                <property name="Icon">stock:gtk-save-as Menu</property>
+                                <property name="Label" translatable="yes" />
+                                <property name="UseUnderline">True</property>
                               </widget>
                               <packing>
                                 <property name="Position">1</property>
@@ -7843,7 +7797,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                               </widget>
                               <packing>
                                 <property name="Position">1</property>
-                                <property name="AutoSize">True</property>
+                                <property name="AutoSize">False</property>
                               </packing>
                             </child>
                           </widget>
@@ -7972,76 +7926,96 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.HBox" id="hbox8">
+                      <widget class="Gtk.VBox" id="vbox5">
                         <property name="MemberName" />
-                        <property name="Homogeneous">True</property>
                         <property name="Spacing">6</property>
                         <child>
-                          <widget class="Gtk.Frame" id="frame1">
+                          <widget class="Gtk.HBox" id="hbox10">
                             <property name="MemberName" />
-                            <property name="ShadowType">None</property>
+                            <property name="Spacing">6</property>
                             <child>
-                              <widget class="Gtk.Alignment" id="GtkAlignment6">
+                              <widget class="Gtk.Image" id="homeshieldimage">
                                 <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="Yalign">0</property>
-                                <property name="LeftPadding">12</property>
-                                <child>
-                                  <widget class="LongoMatch.Gui.Component.TeamPlayersSelection" 
id="localteamplayersselection">
-                                    <property name="MemberName" />
-                                    <property name="Events">ButtonPressMask</property>
-                                  </widget>
-                                </child>
                               </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="GtkLabel10">
+                              <widget class="Gtk.Label" id="homelabel">
                                 <property name="MemberName" />
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Home 
team&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
                               </widget>
                               <packing>
-                                <property name="type">label_item</property>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
-                          </widget>
-                          <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.Frame" id="frame2">
-                            <property name="MemberName" />
-                            <property name="ShadowType">None</property>
                             <child>
-                              <widget class="Gtk.Alignment" id="GtkAlignment7">
+                              <widget class="Gtk.ComboBox" id="hometeamscombobox">
                                 <property name="MemberName" />
-                                <property name="Xalign">0</property>
-                                <property name="Yalign">0</property>
-                                <property name="LeftPadding">12</property>
-                                <child>
-                                  <widget class="LongoMatch.Gui.Component.TeamPlayersSelection" 
id="awayteamplayersselection">
-                                    <property name="MemberName" />
-                                    <property name="Events">ButtonPressMask</property>
-                                  </widget>
-                                </child>
+                                <property name="IsTextCombo">True</property>
+                                <property name="Items" translatable="yes" />
                               </widget>
+                              <packing>
+                                <property name="Position">2</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="GtkLabel11">
+                              <widget class="Gtk.ComboBox" id="awayteamscombobox">
                                 <property name="MemberName" />
-                                <property name="LabelProp" translatable="yes">&lt;b&gt;Away 
team&lt;/b&gt;</property>
-                                <property name="UseMarkup">True</property>
+                                <property name="IsTextCombo">True</property>
+                                <property name="Items" translatable="yes" />
                               </widget>
                               <packing>
-                                <property name="type">label_item</property>
+                                <property name="Position">3</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Label" id="awaylabel">
+                                <property name="MemberName" />
+                              </widget>
+                              <packing>
+                                <property name="Position">4</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Image" id="awayshieldimage">
+                                <property name="MemberName" />
+                              </widget>
+                              <packing>
+                                <property name="Position">5</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
                               </packing>
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">1</property>
+                            <property name="Position">0</property>
                             <property name="AutoSize">False</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.DrawingArea" id="drawingarea1">
+                            <property name="MemberName" />
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
                           </packing>
                         </child>
                       </widget>
@@ -8138,80 +8112,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.TeamPlayersSelection" design-size="300 300">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <child>
-      <widget class="Gtk.VBox" id="vbox4">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <child>
-          <widget class="Gtk.HBox" id="hbox4">
-            <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <child>
-              <widget class="Gtk.Image" id="shieldimage">
-                <property name="MemberName" />
-                <property name="Pixbuf">resource:logo.svg</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="namelabel">
-                <property name="MemberName" />
-              </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="Gtk.ComboBox" id="teamscombobox">
-                <property name="MemberName" />
-                <property name="IsTextCombo">True</property>
-                <property name="Items" translatable="yes" />
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">False</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">0</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
-            <property name="MemberName" />
-            <property name="ShadowType">In</property>
-            <child>
-              <widget class="Gtk.IconView" id="playersiconview">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="ShowScrollbars">True</property>
-                <property name="SelectionMode">None</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.TeamsTemplatesPanel" design-size="1123 552">
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.TeamsTemplatesPanel" design-size="1325 552">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -8385,7 +8286,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.TeamTemplateEditor" design-size="841 514">
+  <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.TeamTemplateEditor" design-size="950 521">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
@@ -8403,7 +8304,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                 <child>
                   <widget class="Gtk.HBox" id="hbox2">
                     <property name="MemberName" />
-                    <property name="Spacing">50</property>
+                    <property name="Spacing">30</property>
                     <child>
                       <widget class="Gtk.Frame" id="frame1">
                         <property name="MemberName" />
@@ -8456,6 +8357,7 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                             <child>
                               <widget class="Gtk.Entry" id="teamnameentry">
                                 <property name="MemberName" />
+                                <property name="WidthRequest">100</property>
                                 <property name="CanFocus">True</property>
                                 <property name="IsEditable">True</property>
                                 <property name="InvisibleChar">•</property>
@@ -8481,6 +8383,130 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                         <property name="Fill">False</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="Gtk.Frame" id="frame2">
+                        <property name="MemberName" />
+                        <property name="ShadowType">None</property>
+                        <child>
+                          <widget class="Gtk.Alignment" id="GtkAlignment6">
+                            <property name="MemberName" />
+                            <property name="Xalign">0</property>
+                            <property name="Yalign">0</property>
+                            <property name="LeftPadding">12</property>
+                            <child>
+                              <widget class="Gtk.VBox" id="vbox1">
+                                <property name="MemberName" />
+                                <property name="Spacing">6</property>
+                                <child>
+                                  <widget class="Gtk.HBox" id="hbox5">
+                                    <property name="MemberName" />
+                                    <property name="Spacing">6</property>
+                                    <child>
+                                      <widget class="Gtk.Label" id="label1">
+                                        <property name="MemberName" />
+                                        <property name="LabelProp" translatable="yes">Number of 
players</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">0</property>
+                                        <property name="AutoSize">True</property>
+                                        <property name="Expand">False</property>
+                                        <property name="Fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="Gtk.Label" id="nplayerslabel">
+                                        <property name="MemberName" />
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">1</property>
+                                        <property name="AutoSize">True</property>
+                                        <property name="Expand">False</property>
+                                        <property name="Fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">0</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.HBox" id="hbox6">
+                                    <property name="MemberName" />
+                                    <property name="Spacing">6</property>
+                                    <child>
+                                      <widget class="Gtk.Label" id="label2">
+                                        <property name="MemberName" />
+                                        <property name="LabelProp" translatable="yes">Tactics</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">0</property>
+                                        <property name="AutoSize">True</property>
+                                        <property name="Expand">False</property>
+                                        <property name="Fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="Gtk.Entry" id="tacticsentry">
+                                        <property name="MemberName" />
+                                        <property name="WidthRequest">30</property>
+                                        <property name="CanFocus">True</property>
+                                        <property name="IsEditable">True</property>
+                                        <property name="InvisibleChar">•</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">1</property>
+                                        <property name="AutoSize">True</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="Gtk.Button" id="applybutton">
+                                        <property name="MemberName" />
+                                        <property name="CanFocus">True</property>
+                                        <property name="Type">TextAndIcon</property>
+                                        <property name="Icon">stock:gtk-apply Menu</property>
+                                        <property name="Label" translatable="yes" />
+                                        <property name="UseUnderline">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="Position">2</property>
+                                        <property name="AutoSize">True</property>
+                                        <property name="Expand">False</property>
+                                        <property name="Fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">1</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="GtkLabel6">
+                            <property name="MemberName" />
+                            <property name="LabelProp" 
translatable="yes">&lt;b&gt;Formation&lt;/b&gt;</property>
+                            <property name="UseMarkup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="Position">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
@@ -8490,20 +8516,51 @@ Defining &lt;b&gt; Game Units &lt;/b&gt; will help you during the analysis to in
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
+                  <widget class="Gtk.DrawingArea" id="drawingarea">
                     <property name="MemberName" />
-                    <property name="ShadowType">In</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox7">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.IconView" id="playersiconview">
+                      <widget class="Gtk.ToggleButton" id="subsbutton">
                         <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShowScrollbars">True</property>
+                        <property name="Type">TextAndIcon</property>
+                        <property name="Icon">stock:gtk-refresh Dialog</property>
+                        <property name="Label" translatable="yes" />
+                        <property name="UseUnderline">True</property>
+                        <property name="FocusOnClick">False</property>
+                        <property name="Active">True</property>
                       </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Label" id="warninglabel">
+                        <property name="MemberName" />
+                        <property name="Visible">False</property>
+                        <property name="LabelProp" translatable="yes">Substitutions activated.
+Click 2 players to swap them</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
                     </child>
                   </widget>
                   <packing>
-                    <property name="Position">1</property>
+                    <property name="Position">2</property>
                     <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
                   </packing>
                 </child>
               </widget>
diff --git a/LongoMatch.GUI/gtk-gui/objects.xml b/LongoMatch.GUI/gtk-gui/objects.xml
index cc4de42..e58f271 100644
--- a/LongoMatch.GUI/gtk-gui/objects.xml
+++ b/LongoMatch.GUI/gtk-gui/objects.xml
@@ -156,10 +156,6 @@
     <itemgroups />
     <signals />
   </object>
-  <object type="LongoMatch.Gui.Component.TeamTaggerWidget" palette-category="General" allow-children="false" 
base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
   <object type="LongoMatch.Gui.Component.TeamTemplateEditor" palette-category="General" 
allow-children="false" base-type="Gtk.Bin">
     <itemgroups>
       <itemgroup label="TeamTemplateEditor Properties">
@@ -369,10 +365,6 @@
       </itemgroup>
     </signals>
   </object>
-  <object type="LongoMatch.Gui.Component.TeamPlayersSelection" palette-category="General" 
allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
   <object type="LongoMatch.Gui.Panel.TeamsTemplatesPanel" palette-category="General" allow-children="false" 
base-type="Gtk.Bin">
     <itemgroups />
     <signals>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]