[longomatch] Add support for setting custom colors to teams
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Add support for setting custom colors to teams
- Date: Sat, 22 Nov 2014 10:54:05 +0000 (UTC)
commit 8cb7c5f9208f9ca935293f7a27f4a73dd507702e
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Mon Nov 17 00:00:52 2014 +0100
Add support for setting custom colors to teams
LongoMatch.Core/Common/Color.cs | 5 +
LongoMatch.Core/Store/Player.cs | 6 +
LongoMatch.Core/Store/Templates/TeamTemplate.cs | 33 ++
LongoMatch.Drawing/CanvasObjects/PlayerObject.cs | 8 +-
.../CanvasObjects/PlayersTaggerObject.cs | 7 +-
LongoMatch.Drawing/PlayslistCellRenderer.cs | 3 +-
LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs | 111 +++--
LongoMatch.GUI/Gui/Dialog/SubstitutionsEditor.cs | 4 +
LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs | 106 +++--
.../LongoMatch.Gui.Component.TeamTemplateEditor.cs | 505 ++++++++++----------
.../LongoMatch.Gui.Panel.NewProjectPanel.cs | 141 ++++--
LongoMatch.GUI/gtk-gui/gui.stetic | 173 +++++--
12 files changed, 697 insertions(+), 405 deletions(-)
---
diff --git a/LongoMatch.Core/Common/Color.cs b/LongoMatch.Core/Common/Color.cs
index d2af3e7..7c1e0e4 100644
--- a/LongoMatch.Core/Common/Color.cs
+++ b/LongoMatch.Core/Common/Color.cs
@@ -70,6 +70,11 @@ namespace LongoMatch.Core.Common
{
return (Int32)R<<24 | (Int32)G<<16 | (Int32)B<<8 | (Int32)A;
}
+
+ public override string ToString ()
+ {
+ return string.Format ("#{0:X}{1:X}{2:X}{3:X}", R, G, B, A);
+ }
static public byte UShortToByte (ushort val) {
return (byte) (((float)val) / ushort.MaxValue * byte.MaxValue);
diff --git a/LongoMatch.Core/Store/Player.cs b/LongoMatch.Core/Store/Player.cs
index 99c4271..76e6255 100644
--- a/LongoMatch.Core/Store/Player.cs
+++ b/LongoMatch.Core/Store/Player.cs
@@ -138,6 +138,12 @@ namespace LongoMatch.Core.Store
get;
set;
}
+
+ [JsonIgnore]
+ public Color Color {
+ get;
+ set;
+ }
public override string ToString ()
{
diff --git a/LongoMatch.Core/Store/Templates/TeamTemplate.cs b/LongoMatch.Core/Store/Templates/TeamTemplate.cs
index af45b2b..8199515 100644
--- a/LongoMatch.Core/Store/Templates/TeamTemplate.cs
+++ b/LongoMatch.Core/Store/Templates/TeamTemplate.cs
@@ -43,6 +43,10 @@ namespace LongoMatch.Core.Store.Templates
List = new List<Player>();
string path = Path.Combine (Config.IconsDir, StyleConf.DefaultShield);
Shield = Image.LoadFromFile (path);
+ ActiveColor = 0;
+ Colors = new Color [2];
+ Colors[0] = Color.Blue1;
+ Colors[1] = Color.Red1;
}
public Guid ID {
@@ -69,6 +73,28 @@ namespace LongoMatch.Core.Store.Templates
get;
set;
}
+
+ public int ActiveColor {
+ get;
+ set;
+ }
+
+ public Color[] Colors {
+ get;
+ set;
+ }
+
+ [JsonIgnore]
+ public Color Color {
+ get {
+ if (ActiveColor <= Colors.Length) {
+ return Colors [ActiveColor];
+ } else {
+ ActiveColor = 0;
+ return Colors[0];
+ }
+ }
+ }
[JsonIgnore]
public int StartingPlayers {
@@ -156,6 +182,13 @@ namespace LongoMatch.Core.Store.Templates
public void Save(string filePath) {
Serializer.Save(this, filePath);
}
+
+ public void UpdateColors ()
+ {
+ foreach (Player p in List) {
+ p.Color = Color;
+ }
+ }
public Player AddDefaultItem (int i) {
Player p = new Player {
diff --git a/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
b/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
index 11a1143..0020373 100644
--- a/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/PlayerObject.cs
@@ -66,9 +66,10 @@ namespace LongoMatch.Drawing.CanvasObjects
set;
}
- public Color Color {
- get;
- set;
+ Color Color {
+ get {
+ return Player.Color;
+ }
}
public override double Width {
@@ -200,7 +201,6 @@ namespace LongoMatch.Drawing.CanvasObjects
}
Position = pos;
DrawPhoto = true;
- Color = Constants.PLAYER_SELECTED_COLOR;
Size = (int)PlayersIconSize.Medium;
Toggle = true;
LoadSurfaces ();
diff --git a/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
b/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
index df6809c..311cbf4 100644
--- a/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/PlayersTaggerObject.cs
@@ -296,6 +296,7 @@ namespace LongoMatch.Drawing.CanvasObjects
awayPlayers = new List<PlayerObject> ();
if (homeTeam != null) {
+ homeTeam.UpdateColors ();
homePlayingPlayers = GetPlayers (homeTeam.StartingPlayersList, Team.LOCAL);
homeBenchPlayers = GetPlayers (homeTeam.BenchPlayersList, Team.LOCAL);
homePlayers.AddRange (homePlayingPlayers);
@@ -310,6 +311,7 @@ namespace LongoMatch.Drawing.CanvasObjects
NTeams ++;
}
if (awayTeam != null) {
+ awayTeam.UpdateColors ();
awayPlayingPlayers = GetPlayers (awayTeam.StartingPlayersList, Team.VISITOR);
awayBenchPlayers = GetPlayers (awayTeam.BenchPlayersList, Team.VISITOR);
awayPlayers.AddRange (awayPlayingPlayers);
@@ -534,10 +536,7 @@ namespace LongoMatch.Drawing.CanvasObjects
playerObjects = new List<PlayerObject> ();
foreach (Player p in players) {
- PlayerObject po = new PlayerObject { Player = p,
- Color = color,
- Team = team,
- };
+ PlayerObject po = new PlayerObject { Player = p, Team = team};
po.ClickedEvent += HandlePlayerClickedEvent;
po.RedrawEvent += (co, area) => {EmitRedrawEvent (po, area);};
playerObjects.Add (po);
diff --git a/LongoMatch.Drawing/PlayslistCellRenderer.cs b/LongoMatch.Drawing/PlayslistCellRenderer.cs
index 95fc405..1c57ac0 100644
--- a/LongoMatch.Drawing/PlayslistCellRenderer.cs
+++ b/LongoMatch.Drawing/PlayslistCellRenderer.cs
@@ -72,6 +72,7 @@ namespace LongoMatch.Drawing
tk.DrawRectangle (new Point (countX1, countY), StyleConf.ListCountWidth, 2 *
StyleConf.ListCountRadio);
tk.StrokeColor = Config.Style.PaletteBackgroundDark;
tk.FontAlignment = FontAlignment.Center;
+ tk.FontWeight = FontWeight.Bold;
tk.DrawText (new Point (countX1, countY), StyleConf.ListCountWidth,
2 * StyleConf.ListCountRadio, count.ToString ());
}
@@ -116,7 +117,7 @@ namespace LongoMatch.Drawing
RenderBackgroundAndText (isExpanded, tk, backgroundArea, text, textWidth,
player.ToString ());
/* Photo */
RenderPlayer (tk, player, image);
- RenderCount (Config.Style.PaletteActive, count, tk, backgroundArea, cellArea);
+ RenderCount (player.Color, count, tk, backgroundArea, cellArea);
RenderSeparationLine (tk, context, backgroundArea);
tk.End ();
}
diff --git a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
index dcb9eb4..9786507 100644
--- a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
@@ -16,21 +16,18 @@
// 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;
-using LongoMatch.Core.Store.Templates;
+using Gtk;
+using LongoMatch.Core.Common;
using LongoMatch.Core.Store;
+using LongoMatch.Core.Store.Templates;
+using LongoMatch.Drawing.Cairo;
+using LongoMatch.Drawing.Widgets;
using Mono.Unix;
-
-using Image = LongoMatch.Core.Common.Image;
using Color = LongoMatch.Core.Common.Color;
-using LongoMatch.Core.Common;
-using LongoMatch.Gui.Popup;
-using LongoMatch.Gui.Dialog;
-using LongoMatch.Drawing.Widgets;
-using LongoMatch.Drawing.Cairo;
+using Image = LongoMatch.Core.Common.Image;
+using Misc = LongoMatch.Gui.Helpers.Misc;
namespace LongoMatch.Gui.Component
{
@@ -38,13 +35,14 @@ namespace LongoMatch.Gui.Component
public partial class TeamTemplateEditor : Gtk.Bin
{
public event EventHandler TemplateSaved;
-
+
Player loadedPlayer;
TeamTemplate template;
bool edited, ignoreChanges;
List<Player> selectedPlayers;
TeamTagger teamtagger;
-
+ const int SHIELD_SIZE = 70;
+
public TeamTemplateEditor ()
{
this.Build ();
@@ -53,6 +51,11 @@ namespace LongoMatch.Gui.Component
teamtagger.SelectionMode = MultiSelectionMode.MultipleWithModifier;
teamtagger.PlayersSelectionChangedEvent += HandlePlayersSelectionChangedEvent;
teamtagger.PlayersSubstitutionEvent += HandlePlayersSubstitutionEvent;
+ shieldimage.HeightRequest = shieldvbox.WidthRequest = SHIELD_SIZE;
+ colorbutton1.Color = Misc.ToGdkColor (Color.Red1);
+ colorbutton1.ColorSet += HandleColorSet;
+ colorbutton2.Color = Misc.ToGdkColor (Color.Green1);
+ colorbutton2.ColorSet += HandleColorSet;
ConnectSignals ();
@@ -74,22 +77,23 @@ namespace LongoMatch.Gui.Component
savebutton.Sensitive = edited;
}
}
-
+
public TeamTemplate Team {
set {
template = value;
ignoreChanges = true;
if (template.Shield != null) {
- shieldimage.Pixbuf = template.Shield.Value;
+ shieldimage.Pixbuf = template.Shield.Scale (SHIELD_SIZE,
SHIELD_SIZE).Value;
} else {
- shieldimage.Pixbuf = Helpers.Misc.LoadIcon
("longomatch-default-shield",
-
Constants.MAX_SHIELD_ICON_SIZE);
+ shieldimage.Pixbuf = Helpers.Misc.LoadIcon
("longomatch-default-shield", SHIELD_SIZE);
}
teamnameentry.Text = template.TeamName;
FillFormation ();
teamtagger.LoadTeams (template, null, Config.HHalfFieldBackground);
// Start with disabled widget until something get selected
ClearPlayer ();
+ colorbutton1.Color = Misc.ToGdkColor (value.Colors[0]);
+ colorbutton2.Color = Misc.ToGdkColor (value.Colors[1]);
ignoreChanges = false;
Edited = false;
}
@@ -101,14 +105,16 @@ namespace LongoMatch.Gui.Component
}
}
- public void AddPlayer () {
+ public void AddPlayer ()
+ {
Player p = template.AddDefaultItem (template.List.Count);
teamtagger.Reload ();
teamtagger.Select (p);
Edited = true;
}
- public void DeleteSelectedPlayers () {
+ public void DeleteSelectedPlayers ()
+ {
if (selectedPlayers == null || selectedPlayers.Count == 0) {
return;
}
@@ -122,8 +128,9 @@ namespace LongoMatch.Gui.Component
}
Team = template;
}
-
- void ConnectSignals () {
+
+ void ConnectSignals ()
+ {
newplayerbutton.Clicked += HandleNewPlayerClicked;
savebutton.Clicked += HandleSaveTemplateClicked;
deletebutton.Clicked += HandleDeletePlayerClicked;
@@ -144,7 +151,8 @@ namespace LongoMatch.Gui.Component
mailentry.Changed += HandleEntryChanged;
bdaydatepicker.ValueChanged += HandleEntryChanged;
- applybutton.Clicked += (s,e) => {ParseTactics();};
+ applybutton.Clicked += (s,e) => {
+ ParseTactics ();};
Edited = false;
}
@@ -182,12 +190,13 @@ namespace LongoMatch.Gui.Component
drawingarea.QueueDraw ();
}
- void FillFormation () {
+ void FillFormation ()
+ {
tacticsentry.Text = template.FormationStr;
- nplayerslabel.Text = template.StartingPlayers.ToString();
}
-
- void LoadPlayer (Player p) {
+
+ void LoadPlayer (Player p)
+ {
ignoreChanges = true;
loadedPlayer = p;
@@ -209,7 +218,8 @@ namespace LongoMatch.Gui.Component
ignoreChanges = false;
}
- void ClearPlayer () {
+ void ClearPlayer ()
+ {
ignoreChanges = true;
playerframe.Sensitive = false;
@@ -230,8 +240,9 @@ namespace LongoMatch.Gui.Component
ignoreChanges = false;
}
-
- void ParseTactics () {
+
+ void ParseTactics ()
+ {
try {
template.FormationStr = tacticsentry.Text;
teamtagger.Reload ();
@@ -242,8 +253,9 @@ namespace LongoMatch.Gui.Component
}
FillFormation ();
}
-
- Pixbuf PlayerPhoto (Player p) {
+
+ Pixbuf PlayerPhoto (Player p)
+ {
Pixbuf playerImage;
if (p.Photo != null) {
@@ -254,26 +266,27 @@ namespace LongoMatch.Gui.Component
}
return playerImage;
}
-
- void PlayersSelected (List<Player> players) {
+
+ void PlayersSelected (List<Player> players)
+ {
ignoreChanges = true;
selectedPlayers = players;
deletebutton.Sensitive = players.Count != 0;
if (players.Count == 1) {
- LoadPlayer (players[0]);
+ LoadPlayer (players [0]);
} else {
ClearPlayer ();
}
ignoreChanges = false;
}
-
+
void HandlePlayersSelectionChangedEvent (List<Player> players)
{
PlayersSelected (players);
}
-
+
void HandleSaveTemplateClicked (object sender, EventArgs e)
{
if (template != null) {
@@ -298,7 +311,7 @@ namespace LongoMatch.Gui.Component
{
DeleteSelectedPlayers ();
}
-
+
void HandleKeyPressEvent (object o, KeyPressEventArgs args)
{
if (args.Event.Key == Gdk.Key.Delete) {
@@ -336,22 +349,36 @@ namespace LongoMatch.Gui.Component
}
shield = new Image (pix);
- shield.ScaleInplace (Constants.MAX_SHIELD_ICON_SIZE,
- Constants.MAX_SHIELD_ICON_SIZE);
- if (shield != null)
- {
- shieldimage.Pixbuf = shield.Value;
+ if (shield != null) {
+ shield.ScaleInplace (Constants.MAX_SHIELD_ICON_SIZE,
+ Constants.MAX_SHIELD_ICON_SIZE);
template.Shield = shield;
+ shieldimage.Pixbuf = shield.Scale (SHIELD_SIZE, SHIELD_SIZE).Value;
Edited = true;
}
}
-
+
void HandlePlayersSubstitutionEvent (TeamTemplate team, Player p1, Player p2,
SubstitutionReason reason, Time time)
{
team.List.Swap (p1, p2);
teamtagger.Substitute (p1, p2, team);
}
+
+ void HandleColorSet (object sender, EventArgs e)
+ {
+ if (ignoreChanges)
+ return;
+ if (sender == colorbutton1) {
+ template.Colors [0] = Misc.ToLgmColor (colorbutton1.Color);
+ template.UpdateColors ();
+ drawingarea.QueueDraw ();
+ } else {
+ template.Colors [1] = Misc.ToLgmColor (colorbutton2.Color);
+ }
+ Edited = true;
+ }
+
}
}
diff --git a/LongoMatch.GUI/Gui/Dialog/SubstitutionsEditor.cs
b/LongoMatch.GUI/Gui/Dialog/SubstitutionsEditor.cs
index b36d3d5..467f9e7 100644
--- a/LongoMatch.GUI/Gui/Dialog/SubstitutionsEditor.cs
+++ b/LongoMatch.GUI/Gui/Dialog/SubstitutionsEditor.cs
@@ -119,6 +119,8 @@ namespace LongoMatch.Gui.Dialog
homeTeamPlayers = homeFieldPlayers.Concat (homeBenchPlayers).ToList ();
homeTeam = new TeamTemplate {
+ Colors = project.LocalTeamTemplate.Colors,
+ ActiveColor = project.LocalTeamTemplate.ActiveColor,
ID = project.LocalTeamTemplate.ID,
Formation = project.LocalTeamTemplate.Formation,
List = homeTeamPlayers
@@ -127,6 +129,8 @@ namespace LongoMatch.Gui.Dialog
if (awayFieldPlayers != null) {
awayTeamPlayers = awayFieldPlayers.Concat (awayBenchPlayers).ToList ();
awayTeam = new TeamTemplate {
+ Colors = project.VisitorTeamTemplate.Colors,
+ ActiveColor = project.VisitorTeamTemplate.ActiveColor,
ID = project.VisitorTeamTemplate.ID,
Formation = project.VisitorTeamTemplate.Formation,
List = awayTeamPlayers
diff --git a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
index 4912954..29669fe 100644
--- a/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/NewProjectPanel.cs
@@ -16,24 +16,23 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
-using System.Linq;
using System.Collections.Generic;
-using Gtk;
+using System.Linq;
using Gdk;
+using Gtk;
+using LongoMatch.Core.Common;
using LongoMatch.Core.Handlers;
+using LongoMatch.Core.Interfaces.GUI;
using LongoMatch.Core.Interfaces.Multimedia;
using LongoMatch.Core.Store;
-using LongoMatch.Core.Common;
using LongoMatch.Core.Store.Templates;
-using Misc = LongoMatch.Gui.Helpers.Misc;
-using Mono.Unix;
+using LongoMatch.Drawing.Cairo;
+using LongoMatch.Drawing.Widgets;
using LongoMatch.Gui.Helpers;
-using LongoMatch.Core.Interfaces.GUI;
+using Mono.Unix;
+using Color = LongoMatch.Core.Common.Color;
using Device = LongoMatch.Core.Common.Device;
-using Color = Gdk.Color;
-using LongoMatch.Drawing.Widgets;
-using LongoMatch.Drawing.Cairo;
-using LongoMatch.Gui.Component;
+using Misc = LongoMatch.Gui.Helpers.Misc;
namespace LongoMatch.Gui.Panel
{
@@ -54,7 +53,7 @@ namespace LongoMatch.Gui.Panel
ListStore videoStandardList, encProfileList, qualList;
IMultimediaToolkit mtoolkit;
IGUIToolkit gtoolkit;
- Color red;
+ Gdk.Color red;
TeamTemplate hometemplate, awaytemplate;
Dashboard analysisTemplate;
TeamTagger teamtagger;
@@ -69,8 +68,6 @@ namespace LongoMatch.Gui.Panel
notebook1.ShowBorder = false;
- panelheader1.ApplyClicked += HandleNextClicked;
- panelheader1.BackClicked += HandleBackClicked;
LoadIcons ();
ConnectSignals ();
FillCategories ();
@@ -89,14 +86,10 @@ namespace LongoMatch.Gui.Panel
FillProjectDetails ();
}
UpdateTitle ();
- Color.Parse ("red", ref red);
+ Gdk.Color.Parse ("red", ref red);
outputfilelabel.ModifyFg (StateType.Normal, red);
- Color.Parse ("red", ref red);
urilabel.ModifyFg (StateType.Normal, red);
- Color.Parse ("red", ref red);
ApplyStyle ();
- hometacticsbutton.Clicked += HandleTacticsChanged;
- awaytacticsbutton.Clicked += HandleTacticsChanged;
}
protected override void OnDestroyed ()
@@ -167,6 +160,14 @@ namespace LongoMatch.Gui.Panel
void ConnectSignals ()
{
+ homecolor1button.Clicked += HandleColorClicked;
+ homecolor2button.Clicked += HandleColorClicked;
+ awaycolor1button.Clicked += HandleColorClicked;
+ awaycolor2button.Clicked += HandleColorClicked;
+ hometacticsbutton.Clicked += HandleTacticsChanged;
+ awaytacticsbutton.Clicked += HandleTacticsChanged;
+ panelheader1.ApplyClicked += HandleNextClicked;
+ panelheader1.BackClicked += HandleBackClicked;
urientry.Changed += HandleEntryChanged;
tagscombobox.Changed += HandleSportsTemplateChanged;
}
@@ -207,7 +208,7 @@ namespace LongoMatch.Gui.Panel
bool filemode = false, urimode = false, capturemode = false;
if (projectType == ProjectType.FileProject ||
- projectType == ProjectType.EditProject) {
+ projectType == ProjectType.EditProject) {
filemode = true;
} else if (projectType == ProjectType.CaptureProject) {
capturemode = true;
@@ -252,14 +253,38 @@ namespace LongoMatch.Gui.Panel
}
}
+ void SetButtonColor (DrawingArea area, Color color)
+ {
+ Gdk.Color gcolor = Misc.ToGdkColor (color);
+ area.ModifyBg (StateType.Normal, gcolor);
+ area.ModifyBg (StateType.Active, gcolor);
+ area.ModifyBg (StateType.Insensitive, gcolor);
+ area.ModifyBg (StateType.Prelight, gcolor);
+ area.ModifyBg (StateType.Selected, gcolor);
+ }
+
void LoadTemplate (TeamTemplate template, Team team)
{
if (team == Team.LOCAL) {
hometemplate = Cloner.Clone (template);
hometacticsentry.Text = hometemplate.FormationStr;
+ SetButtonColor (homecolor1, hometemplate.Colors [0]);
+ SetButtonColor (homecolor2, hometemplate.Colors [1]);
+ if (awaytemplate != null && awaytemplate.Color.Equals (hometemplate.Color)) {
+ homecolor2button.Click ();
+ } else {
+ homecolor1button.Click ();
+ }
} else {
awaytemplate = Cloner.Clone (template);
awaytacticsentry.Text = awaytemplate.FormationStr;
+ SetButtonColor (awaycolor1, awaytemplate.Colors [0]);
+ SetButtonColor (awaycolor2, awaytemplate.Colors [1]);
+ if (hometemplate != null && hometemplate.Color.Equals (awaytemplate.Color)) {
+ awaycolor2button.Click ();
+ } else {
+ awaycolor1button.Click ();
+ }
}
teamtagger.LoadTeams (hometemplate, awaytemplate,
analysisTemplate.FieldBackground);
@@ -368,7 +393,7 @@ namespace LongoMatch.Gui.Panel
}
return true;
}
-
+
void StartProject ()
{
if (CreateProject ()) {
@@ -448,9 +473,9 @@ namespace LongoMatch.Gui.Panel
return;
}
if (projectType == ProjectType.CaptureProject ||
- projectType == ProjectType.FakeCaptureProject ||
- projectType == ProjectType.URICaptureProject) {
- project.CreateLineupEvent ();
+ projectType == ProjectType.FakeCaptureProject ||
+ projectType == ProjectType.URICaptureProject) {
+ project.CreateLineupEvent ();
Config.EventsBroker.EmitOpenNewProject (project, projectType,
captureSettings);
return;
}
@@ -475,22 +500,22 @@ namespace LongoMatch.Gui.Panel
Menu menu = new Menu ();
MenuItem item = new MenuItem ("Remove for this match");
item.Activated += (sender, e) => {
- hometemplate.RemovePlayers (players, false);
- awaytemplate.RemovePlayers (players, false);
- teamtagger.Reload ();
+ hometemplate.RemovePlayers (players, false);
+ awaytemplate.RemovePlayers (players, false);
+ teamtagger.Reload ();
};
menu.Add (item);
menu.ShowAll ();
menu.Popup ();
}
-
+
void HandlePlayersSubstitutionEvent (TeamTemplate team, Player p1, Player p2,
SubstitutionReason reason, Time time)
{
team.List.Swap (p1, p2);
teamtagger.Substitute (p1, p2, team);
}
-
+
void HandleTacticsChanged (object sender, EventArgs e)
{
TeamTemplate team;
@@ -514,6 +539,31 @@ namespace LongoMatch.Gui.Panel
entry.Text = team.FormationStr;
}
+ void HandleColorClicked (object sender, EventArgs e)
+ {
+ ToggleButton button = sender as ToggleButton;
+ if (!button.Active) {
+ return;
+ }
+ if (button == homecolor1button) {
+ homecolor2button.Active = false;
+ hometemplate.ActiveColor = 0;
+ hometemplate.UpdateColors ();
+ } else if (button == homecolor2button) {
+ homecolor1button.Active = false;
+ hometemplate.ActiveColor = 1;
+ hometemplate.UpdateColors ();
+ } else if (button == awaycolor1button) {
+ awaycolor2button.Active = false;
+ awaytemplate.ActiveColor = 0;
+ awaytemplate.UpdateColors ();
+ } else if (button == awaycolor2button) {
+ awaycolor1button.Active = false;
+ awaytemplate.ActiveColor = 1;
+ awaytemplate.UpdateColors ();
+ }
+ drawingarea.QueueDraw ();
+ }
}
}
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
index 891e39f..785cd1e 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.TeamTemplateEditor.cs
@@ -22,9 +22,11 @@ namespace LongoMatch.Gui.Component
private global::Gtk.HBox hbox5;
private global::Gtk.Entry tacticsentry;
private global::Gtk.Button applybutton;
- private global::Gtk.Label label1;
+ private global::Gtk.HBox hbox6;
+ private global::Gtk.ColorButton colorbutton1;
+ private global::Gtk.ColorButton colorbutton2;
private global::Gtk.Label label2;
- private global::Gtk.Label nplayerslabel;
+ private global::Gtk.Label label4;
private global::Gtk.Entry teamnameentry;
private global::Gtk.DrawingArea drawingarea;
private global::Gtk.Alignment alignment2;
@@ -104,11 +106,13 @@ namespace LongoMatch.Gui.Component
this.shieldframe.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child shieldframe.Gtk.Container+ContainerChild
this.shieldalignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+ this.shieldalignment.WidthRequest = 120;
+ this.shieldalignment.HeightRequest = 120;
this.shieldalignment.Name = "shieldalignment";
- this.shieldalignment.LeftPadding = ((uint)(12));
- this.shieldalignment.TopPadding = ((uint)(12));
- this.shieldalignment.RightPadding = ((uint)(12));
- this.shieldalignment.BottomPadding = ((uint)(12));
+ this.shieldalignment.LeftPadding = ((uint)(6));
+ this.shieldalignment.TopPadding = ((uint)(6));
+ this.shieldalignment.RightPadding = ((uint)(6));
+ this.shieldalignment.BottomPadding = ((uint)(6));
// Container child shieldalignment.Gtk.Container+ContainerChild
this.shieldeventbox = new global::Gtk.EventBox ();
this.shieldeventbox.Name = "shieldeventbox";
@@ -164,9 +168,6 @@ namespace LongoMatch.Gui.Component
this.GtkLabel4.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Team name</span>");
this.GtkLabel4.UseMarkup = true;
this.teamtable.Add (this.GtkLabel4);
- global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.GtkLabel4]));
- w8.XOptions = ((global::Gtk.AttachOptions)(4));
- w8.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child teamtable.Gtk.Table+TableChild
this.hbox5 = new global::Gtk.HBox ();
this.hbox5.Name = "hbox5";
@@ -207,22 +208,42 @@ namespace LongoMatch.Gui.Component
w18.Fill = false;
this.teamtable.Add (this.hbox5);
global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.hbox5]));
- w19.TopAttach = ((uint)(2));
- w19.BottomAttach = ((uint)(3));
+ w19.TopAttach = ((uint)(1));
+ w19.BottomAttach = ((uint)(2));
w19.LeftAttach = ((uint)(1));
w19.RightAttach = ((uint)(2));
w19.XOptions = ((global::Gtk.AttachOptions)(4));
w19.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child teamtable.Gtk.Table+TableChild
- this.label1 = new global::Gtk.Label ();
- this.label1.Name = "label1";
- this.label1.Xalign = 1F;
- this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Number of players</span>");
- this.label1.UseMarkup = true;
- this.teamtable.Add (this.label1);
- global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.label1]));
- w20.TopAttach = ((uint)(1));
- w20.BottomAttach = ((uint)(2));
+ this.hbox6 = new global::Gtk.HBox ();
+ this.hbox6.Name = "hbox6";
+ this.hbox6.Spacing = 6;
+ // Container child hbox6.Gtk.Box+BoxChild
+ this.colorbutton1 = new global::Gtk.ColorButton ();
+ this.colorbutton1.CanFocus = true;
+ this.colorbutton1.Events = ((global::Gdk.EventMask)(784));
+ this.colorbutton1.Name = "colorbutton1";
+ this.hbox6.Add (this.colorbutton1);
+ global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox6
[this.colorbutton1]));
+ w20.Position = 0;
+ w20.Fill = false;
+ // Container child hbox6.Gtk.Box+BoxChild
+ this.colorbutton2 = new global::Gtk.ColorButton ();
+ this.colorbutton2.CanFocus = true;
+ this.colorbutton2.Events = ((global::Gdk.EventMask)(784));
+ this.colorbutton2.Name = "colorbutton2";
+ this.hbox6.Add (this.colorbutton2);
+ global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox6
[this.colorbutton2]));
+ w21.Position = 1;
+ w21.Fill = false;
+ this.teamtable.Add (this.hbox6);
+ global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.hbox6]));
+ w22.TopAttach = ((uint)(2));
+ w22.BottomAttach = ((uint)(3));
+ w22.LeftAttach = ((uint)(1));
+ w22.RightAttach = ((uint)(2));
+ w22.XOptions = ((global::Gtk.AttachOptions)(4));
+ w22.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child teamtable.Gtk.Table+TableChild
this.label2 = new global::Gtk.Label ();
this.label2.Name = "label2";
@@ -230,23 +251,19 @@ namespace LongoMatch.Gui.Component
this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Tactics</span>");
this.label2.UseMarkup = true;
this.teamtable.Add (this.label2);
- global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.label2]));
- w21.TopAttach = ((uint)(2));
- w21.BottomAttach = ((uint)(3));
- w21.XOptions = ((global::Gtk.AttachOptions)(4));
- w21.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.label2]));
+ w23.TopAttach = ((uint)(1));
+ w23.BottomAttach = ((uint)(2));
// Container child teamtable.Gtk.Table+TableChild
- this.nplayerslabel = new global::Gtk.Label ();
- this.nplayerslabel.Name = "nplayerslabel";
- this.nplayerslabel.Xalign = 0F;
- this.teamtable.Add (this.nplayerslabel);
- global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.nplayerslabel]));
- w22.TopAttach = ((uint)(1));
- w22.BottomAttach = ((uint)(2));
- w22.LeftAttach = ((uint)(1));
- w22.RightAttach = ((uint)(2));
- w22.XOptions = ((global::Gtk.AttachOptions)(4));
- w22.YOptions = ((global::Gtk.AttachOptions)(4));
+ this.label4 = new global::Gtk.Label ();
+ this.label4.Name = "label4";
+ this.label4.Xalign = 1F;
+ this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Colors</span>");
+ this.label4.UseMarkup = true;
+ this.teamtable.Add (this.label4);
+ global::Gtk.Table.TableChild w24 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.label4]));
+ w24.TopAttach = ((uint)(2));
+ w24.BottomAttach = ((uint)(3));
// Container child teamtable.Gtk.Table+TableChild
this.teamnameentry = new global::Gtk.Entry ();
this.teamnameentry.WidthRequest = 100;
@@ -255,31 +272,31 @@ namespace LongoMatch.Gui.Component
this.teamnameentry.IsEditable = true;
this.teamnameentry.InvisibleChar = '•';
this.teamtable.Add (this.teamnameentry);
- global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.teamnameentry]));
- w23.LeftAttach = ((uint)(1));
- w23.RightAttach = ((uint)(2));
- w23.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.teamtable
[this.teamnameentry]));
+ w25.LeftAttach = ((uint)(1));
+ w25.RightAttach = ((uint)(2));
+ w25.YOptions = ((global::Gtk.AttachOptions)(4));
this.hbox2.Add (this.teamtable);
- global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.hbox2
[this.teamtable]));
- w24.Position = 1;
- w24.Expand = false;
- w24.Fill = false;
+ global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.hbox2
[this.teamtable]));
+ w26.Position = 1;
+ w26.Expand = false;
+ w26.Fill = false;
this.vbox5.Add (this.hbox2);
- global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
- w25.Position = 0;
- w25.Expand = false;
- w25.Fill = false;
+ global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox2]));
+ w27.Position = 0;
+ w27.Expand = false;
+ w27.Fill = false;
// Container child vbox5.Gtk.Box+BoxChild
this.drawingarea = new global::Gtk.DrawingArea ();
this.drawingarea.Name = "drawingarea";
this.vbox5.Add (this.drawingarea);
- global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox5
[this.drawingarea]));
- w26.Position = 1;
+ global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox5
[this.drawingarea]));
+ w28.Position = 1;
this.GtkAlignment3.Add (this.vbox5);
this.teamframe.Add (this.GtkAlignment3);
this.hbox4.Add (this.teamframe);
- global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.teamframe]));
- w29.Position = 0;
+ global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.teamframe]));
+ w31.Position = 0;
// Container child hbox4.Gtk.Box+BoxChild
this.alignment2 = new global::Gtk.Alignment (0.5F, 0F, 1F, 0F);
this.alignment2.Name = "alignment2";
@@ -323,39 +340,39 @@ namespace LongoMatch.Gui.Component
this.playerimage = new global::Gtk.Image ();
this.playerimage.Name = "playerimage";
this.playervbox.Add (this.playerimage);
- global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.playervbox
[this.playerimage]));
- w30.Position = 0;
- w30.Expand = false;
- w30.Fill = false;
+ global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.playervbox
[this.playerimage]));
+ w32.Position = 0;
+ w32.Expand = false;
+ w32.Fill = false;
// Container child playervbox.Gtk.Box+BoxChild
this.playerimagelabel1 = new global::Gtk.Label ();
this.playerimagelabel1.Name = "playerimagelabel1";
this.playerimagelabel1.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Player picture</span>");
this.playerimagelabel1.UseMarkup = true;
this.playervbox.Add (this.playerimagelabel1);
- global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.playervbox
[this.playerimagelabel1]));
- w31.Position = 1;
- w31.Expand = false;
- w31.Fill = false;
+ global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.playervbox
[this.playerimagelabel1]));
+ w33.Position = 1;
+ w33.Expand = false;
+ w33.Fill = false;
// Container child playervbox.Gtk.Box+BoxChild
this.playerimagelabel2 = new global::Gtk.Label ();
this.playerimagelabel2.Name = "playerimagelabel2";
this.playerimagelabel2.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"8\">click to change...</span>");
this.playerimagelabel2.UseMarkup = true;
this.playervbox.Add (this.playerimagelabel2);
- global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.playervbox
[this.playerimagelabel2]));
- w32.Position = 2;
- w32.Expand = false;
- w32.Fill = false;
+ global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.playervbox
[this.playerimagelabel2]));
+ w34.Position = 2;
+ w34.Expand = false;
+ w34.Fill = false;
this.playereventbox.Add (this.playervbox);
this.playerimagealignment.Add (this.playereventbox);
this.playerimageframe.Add (this.playerimagealignment);
this.alignment1.Add (this.playerimageframe);
this.playerpropertyhbox.Add (this.alignment1);
- global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.playerpropertyhbox
[this.alignment1]));
- w37.Position = 0;
- w37.Expand = false;
- w37.Fill = false;
+ global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.playerpropertyhbox
[this.alignment1]));
+ w39.Position = 0;
+ w39.Expand = false;
+ w39.Fill = false;
// Container child playerpropertyhbox.Gtk.Box+BoxChild
this.table1 = new global::Gtk.Table (((uint)(10)), ((uint)(2)), false);
this.table1.Name = "table1";
@@ -367,13 +384,13 @@ namespace LongoMatch.Gui.Component
this.bdaydatepicker.Name = "bdaydatepicker";
this.bdaydatepicker.Date = new global::System.DateTime (0);
this.table1.Add (this.bdaydatepicker);
- global::Gtk.Table.TableChild w38 = ((global::Gtk.Table.TableChild)(this.table1
[this.bdaydatepicker]));
- w38.TopAttach = ((uint)(8));
- w38.BottomAttach = ((uint)(9));
- w38.LeftAttach = ((uint)(1));
- w38.RightAttach = ((uint)(2));
- w38.XOptions = ((global::Gtk.AttachOptions)(4));
- w38.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table1
[this.bdaydatepicker]));
+ w40.TopAttach = ((uint)(8));
+ w40.BottomAttach = ((uint)(9));
+ w40.LeftAttach = ((uint)(1));
+ w40.RightAttach = ((uint)(2));
+ w40.XOptions = ((global::Gtk.AttachOptions)(4));
+ w40.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.heightspinbutton = new global::Gtk.SpinButton (0, 100, 1);
this.heightspinbutton.CanFocus = true;
@@ -384,13 +401,13 @@ namespace LongoMatch.Gui.Component
this.heightspinbutton.Numeric = true;
this.heightspinbutton.Value = 18;
this.table1.Add (this.heightspinbutton);
- global::Gtk.Table.TableChild w39 = ((global::Gtk.Table.TableChild)(this.table1
[this.heightspinbutton]));
- w39.TopAttach = ((uint)(6));
- w39.BottomAttach = ((uint)(7));
- w39.LeftAttach = ((uint)(1));
- w39.RightAttach = ((uint)(2));
- w39.XOptions = ((global::Gtk.AttachOptions)(4));
- w39.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w41 = ((global::Gtk.Table.TableChild)(this.table1
[this.heightspinbutton]));
+ w41.TopAttach = ((uint)(6));
+ w41.BottomAttach = ((uint)(7));
+ w41.LeftAttach = ((uint)(1));
+ w41.RightAttach = ((uint)(2));
+ w41.XOptions = ((global::Gtk.AttachOptions)(4));
+ w41.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label11 = new global::Gtk.Label ();
this.label11.Name = "label11";
@@ -398,11 +415,11 @@ namespace LongoMatch.Gui.Component
this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Position</span>");
this.label11.UseMarkup = true;
this.table1.Add (this.label11);
- global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table1
[this.label11]));
- w40.TopAttach = ((uint)(4));
- w40.BottomAttach = ((uint)(5));
- w40.XOptions = ((global::Gtk.AttachOptions)(4));
- w40.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w42 = ((global::Gtk.Table.TableChild)(this.table1
[this.label11]));
+ w42.TopAttach = ((uint)(4));
+ w42.BottomAttach = ((uint)(5));
+ w42.XOptions = ((global::Gtk.AttachOptions)(4));
+ w42.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label12 = new global::Gtk.Label ();
this.label12.Name = "label12";
@@ -410,8 +427,8 @@ namespace LongoMatch.Gui.Component
this.label12.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Name</span>");
this.label12.UseMarkup = true;
this.table1.Add (this.label12);
- global::Gtk.Table.TableChild w41 = ((global::Gtk.Table.TableChild)(this.table1
[this.label12]));
- w41.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w43 = ((global::Gtk.Table.TableChild)(this.table1
[this.label12]));
+ w43.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label13 = new global::Gtk.Label ();
this.label13.Name = "label13";
@@ -419,11 +436,11 @@ namespace LongoMatch.Gui.Component
this.label13.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Last name</span>");
this.label13.UseMarkup = true;
this.table1.Add (this.label13);
- global::Gtk.Table.TableChild w42 = ((global::Gtk.Table.TableChild)(this.table1
[this.label13]));
- w42.TopAttach = ((uint)(1));
- w42.BottomAttach = ((uint)(2));
- w42.XOptions = ((global::Gtk.AttachOptions)(4));
- w42.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w44 = ((global::Gtk.Table.TableChild)(this.table1
[this.label13]));
+ w44.TopAttach = ((uint)(1));
+ w44.BottomAttach = ((uint)(2));
+ w44.XOptions = ((global::Gtk.AttachOptions)(4));
+ w44.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label14 = new global::Gtk.Label ();
this.label14.Name = "label14";
@@ -431,11 +448,11 @@ namespace LongoMatch.Gui.Component
this.label14.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Nickname</span>");
this.label14.UseMarkup = true;
this.table1.Add (this.label14);
- global::Gtk.Table.TableChild w43 = ((global::Gtk.Table.TableChild)(this.table1
[this.label14]));
- w43.TopAttach = ((uint)(2));
- w43.BottomAttach = ((uint)(3));
- w43.XOptions = ((global::Gtk.AttachOptions)(4));
- w43.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.table1
[this.label14]));
+ w45.TopAttach = ((uint)(2));
+ w45.BottomAttach = ((uint)(3));
+ w45.XOptions = ((global::Gtk.AttachOptions)(4));
+ w45.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label3 = new global::Gtk.Label ();
this.label3.Name = "label3";
@@ -443,11 +460,11 @@ namespace LongoMatch.Gui.Component
this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Number</span>");
this.label3.UseMarkup = true;
this.table1.Add (this.label3);
- global::Gtk.Table.TableChild w44 = ((global::Gtk.Table.TableChild)(this.table1
[this.label3]));
- w44.TopAttach = ((uint)(5));
- w44.BottomAttach = ((uint)(6));
- w44.XOptions = ((global::Gtk.AttachOptions)(4));
- w44.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.table1
[this.label3]));
+ w46.TopAttach = ((uint)(5));
+ w46.BottomAttach = ((uint)(6));
+ w46.XOptions = ((global::Gtk.AttachOptions)(4));
+ w46.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label5 = new global::Gtk.Label ();
this.label5.Name = "label5";
@@ -455,11 +472,11 @@ namespace LongoMatch.Gui.Component
this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Height</span>");
this.label5.UseMarkup = true;
this.table1.Add (this.label5);
- global::Gtk.Table.TableChild w45 = ((global::Gtk.Table.TableChild)(this.table1
[this.label5]));
- w45.TopAttach = ((uint)(6));
- w45.BottomAttach = ((uint)(7));
- w45.XOptions = ((global::Gtk.AttachOptions)(4));
- w45.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table1
[this.label5]));
+ w47.TopAttach = ((uint)(6));
+ w47.BottomAttach = ((uint)(7));
+ w47.XOptions = ((global::Gtk.AttachOptions)(4));
+ w47.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label6 = new global::Gtk.Label ();
this.label6.Name = "label6";
@@ -467,11 +484,11 @@ namespace LongoMatch.Gui.Component
this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Weight</span>");
this.label6.UseMarkup = true;
this.table1.Add (this.label6);
- global::Gtk.Table.TableChild w46 = ((global::Gtk.Table.TableChild)(this.table1
[this.label6]));
- w46.TopAttach = ((uint)(7));
- w46.BottomAttach = ((uint)(8));
- w46.XOptions = ((global::Gtk.AttachOptions)(4));
- w46.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table1
[this.label6]));
+ w48.TopAttach = ((uint)(7));
+ w48.BottomAttach = ((uint)(8));
+ w48.XOptions = ((global::Gtk.AttachOptions)(4));
+ w48.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label7 = new global::Gtk.Label ();
this.label7.Name = "label7";
@@ -479,11 +496,11 @@ namespace LongoMatch.Gui.Component
this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Birth Date</span>");
this.label7.UseMarkup = true;
this.table1.Add (this.label7);
- global::Gtk.Table.TableChild w47 = ((global::Gtk.Table.TableChild)(this.table1
[this.label7]));
- w47.TopAttach = ((uint)(8));
- w47.BottomAttach = ((uint)(9));
- w47.XOptions = ((global::Gtk.AttachOptions)(4));
- w47.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table1
[this.label7]));
+ w49.TopAttach = ((uint)(8));
+ w49.BottomAttach = ((uint)(9));
+ w49.XOptions = ((global::Gtk.AttachOptions)(4));
+ w49.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.label8 = new global::Gtk.Label ();
this.label8.Name = "label8";
@@ -491,11 +508,11 @@ namespace LongoMatch.Gui.Component
this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Nationality</span>");
this.label8.UseMarkup = true;
this.table1.Add (this.label8);
- global::Gtk.Table.TableChild w48 = ((global::Gtk.Table.TableChild)(this.table1
[this.label8]));
- w48.TopAttach = ((uint)(3));
- w48.BottomAttach = ((uint)(4));
- w48.XOptions = ((global::Gtk.AttachOptions)(4));
- w48.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table1
[this.label8]));
+ w50.TopAttach = ((uint)(3));
+ w50.BottomAttach = ((uint)(4));
+ w50.XOptions = ((global::Gtk.AttachOptions)(4));
+ w50.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.lastnameentry = new global::Gtk.Entry ();
this.lastnameentry.CanFocus = true;
@@ -503,13 +520,13 @@ namespace LongoMatch.Gui.Component
this.lastnameentry.IsEditable = true;
this.lastnameentry.InvisibleChar = '●';
this.table1.Add (this.lastnameentry);
- global::Gtk.Table.TableChild w49 = ((global::Gtk.Table.TableChild)(this.table1
[this.lastnameentry]));
- w49.TopAttach = ((uint)(1));
- w49.BottomAttach = ((uint)(2));
- w49.LeftAttach = ((uint)(1));
- w49.RightAttach = ((uint)(2));
- w49.XOptions = ((global::Gtk.AttachOptions)(4));
- w49.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w51 = ((global::Gtk.Table.TableChild)(this.table1
[this.lastnameentry]));
+ w51.TopAttach = ((uint)(1));
+ w51.BottomAttach = ((uint)(2));
+ w51.LeftAttach = ((uint)(1));
+ w51.RightAttach = ((uint)(2));
+ w51.XOptions = ((global::Gtk.AttachOptions)(4));
+ w51.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.mailentry = new global::Gtk.Entry ();
this.mailentry.CanFocus = true;
@@ -517,13 +534,13 @@ namespace LongoMatch.Gui.Component
this.mailentry.IsEditable = true;
this.mailentry.InvisibleChar = '•';
this.table1.Add (this.mailentry);
- global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table1
[this.mailentry]));
- w50.TopAttach = ((uint)(9));
- w50.BottomAttach = ((uint)(10));
- w50.LeftAttach = ((uint)(1));
- w50.RightAttach = ((uint)(2));
- w50.XOptions = ((global::Gtk.AttachOptions)(4));
- w50.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w52 = ((global::Gtk.Table.TableChild)(this.table1
[this.mailentry]));
+ w52.TopAttach = ((uint)(9));
+ w52.BottomAttach = ((uint)(10));
+ w52.LeftAttach = ((uint)(1));
+ w52.RightAttach = ((uint)(2));
+ w52.XOptions = ((global::Gtk.AttachOptions)(4));
+ w52.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.maillabel = new global::Gtk.Label ();
this.maillabel.Name = "maillabel";
@@ -531,11 +548,11 @@ namespace LongoMatch.Gui.Component
this.maillabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">E-mail</span>");
this.maillabel.UseMarkup = true;
this.table1.Add (this.maillabel);
- global::Gtk.Table.TableChild w51 = ((global::Gtk.Table.TableChild)(this.table1
[this.maillabel]));
- w51.TopAttach = ((uint)(9));
- w51.BottomAttach = ((uint)(10));
- w51.XOptions = ((global::Gtk.AttachOptions)(4));
- w51.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table1
[this.maillabel]));
+ w53.TopAttach = ((uint)(9));
+ w53.BottomAttach = ((uint)(10));
+ w53.XOptions = ((global::Gtk.AttachOptions)(4));
+ w53.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.nameentry = new global::Gtk.Entry ();
this.nameentry.CanFocus = true;
@@ -543,11 +560,11 @@ namespace LongoMatch.Gui.Component
this.nameentry.IsEditable = true;
this.nameentry.InvisibleChar = '●';
this.table1.Add (this.nameentry);
- global::Gtk.Table.TableChild w52 = ((global::Gtk.Table.TableChild)(this.table1
[this.nameentry]));
- w52.LeftAttach = ((uint)(1));
- w52.RightAttach = ((uint)(2));
- w52.XOptions = ((global::Gtk.AttachOptions)(4));
- w52.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.table1
[this.nameentry]));
+ w54.LeftAttach = ((uint)(1));
+ w54.RightAttach = ((uint)(2));
+ w54.XOptions = ((global::Gtk.AttachOptions)(4));
+ w54.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.nationalityentry = new global::Gtk.Entry ();
this.nationalityentry.CanFocus = true;
@@ -555,13 +572,13 @@ namespace LongoMatch.Gui.Component
this.nationalityentry.IsEditable = true;
this.nationalityentry.InvisibleChar = '●';
this.table1.Add (this.nationalityentry);
- global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table1
[this.nationalityentry]));
- w53.TopAttach = ((uint)(3));
- w53.BottomAttach = ((uint)(4));
- w53.LeftAttach = ((uint)(1));
- w53.RightAttach = ((uint)(2));
- w53.XOptions = ((global::Gtk.AttachOptions)(4));
- w53.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w55 = ((global::Gtk.Table.TableChild)(this.table1
[this.nationalityentry]));
+ w55.TopAttach = ((uint)(3));
+ w55.BottomAttach = ((uint)(4));
+ w55.LeftAttach = ((uint)(1));
+ w55.RightAttach = ((uint)(2));
+ w55.XOptions = ((global::Gtk.AttachOptions)(4));
+ w55.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.nicknameentry = new global::Gtk.Entry ();
this.nicknameentry.CanFocus = true;
@@ -569,13 +586,13 @@ namespace LongoMatch.Gui.Component
this.nicknameentry.IsEditable = true;
this.nicknameentry.InvisibleChar = '●';
this.table1.Add (this.nicknameentry);
- global::Gtk.Table.TableChild w54 = ((global::Gtk.Table.TableChild)(this.table1
[this.nicknameentry]));
- w54.TopAttach = ((uint)(2));
- w54.BottomAttach = ((uint)(3));
- w54.LeftAttach = ((uint)(1));
- w54.RightAttach = ((uint)(2));
- w54.XOptions = ((global::Gtk.AttachOptions)(4));
- w54.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w56 = ((global::Gtk.Table.TableChild)(this.table1
[this.nicknameentry]));
+ w56.TopAttach = ((uint)(2));
+ w56.BottomAttach = ((uint)(3));
+ 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.numberspinbutton = new global::Gtk.SpinButton (0, 100, 1);
this.numberspinbutton.CanFocus = true;
@@ -584,13 +601,13 @@ namespace LongoMatch.Gui.Component
this.numberspinbutton.ClimbRate = 1;
this.numberspinbutton.Numeric = true;
this.table1.Add (this.numberspinbutton);
- global::Gtk.Table.TableChild w55 = ((global::Gtk.Table.TableChild)(this.table1
[this.numberspinbutton]));
- w55.TopAttach = ((uint)(5));
- w55.BottomAttach = ((uint)(6));
- w55.LeftAttach = ((uint)(1));
- w55.RightAttach = ((uint)(2));
- w55.XOptions = ((global::Gtk.AttachOptions)(4));
- w55.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w57 = ((global::Gtk.Table.TableChild)(this.table1
[this.numberspinbutton]));
+ w57.TopAttach = ((uint)(5));
+ w57.BottomAttach = ((uint)(6));
+ w57.LeftAttach = ((uint)(1));
+ w57.RightAttach = ((uint)(2));
+ w57.XOptions = ((global::Gtk.AttachOptions)(4));
+ w57.YOptions = ((global::Gtk.AttachOptions)(4));
// Container child table1.Gtk.Table+TableChild
this.positionentry = new global::Gtk.Entry ();
this.positionentry.CanFocus = true;
@@ -598,13 +615,13 @@ namespace LongoMatch.Gui.Component
this.positionentry.IsEditable = true;
this.positionentry.InvisibleChar = '●';
this.table1.Add (this.positionentry);
- global::Gtk.Table.TableChild w56 = ((global::Gtk.Table.TableChild)(this.table1
[this.positionentry]));
- w56.TopAttach = ((uint)(4));
- w56.BottomAttach = ((uint)(5));
- w56.LeftAttach = ((uint)(1));
- w56.RightAttach = ((uint)(2));
- w56.XOptions = ((global::Gtk.AttachOptions)(4));
- w56.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w58 = ((global::Gtk.Table.TableChild)(this.table1
[this.positionentry]));
+ w58.TopAttach = ((uint)(4));
+ w58.BottomAttach = ((uint)(5));
+ 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.weightspinbutton = new global::Gtk.SpinButton (0, 1000, 1);
this.weightspinbutton.CanFocus = true;
@@ -614,29 +631,29 @@ namespace LongoMatch.Gui.Component
this.weightspinbutton.Numeric = true;
this.weightspinbutton.Value = 80;
this.table1.Add (this.weightspinbutton);
- global::Gtk.Table.TableChild w57 = ((global::Gtk.Table.TableChild)(this.table1
[this.weightspinbutton]));
- w57.TopAttach = ((uint)(7));
- w57.BottomAttach = ((uint)(8));
- w57.LeftAttach = ((uint)(1));
- w57.RightAttach = ((uint)(2));
- w57.XOptions = ((global::Gtk.AttachOptions)(4));
- w57.YOptions = ((global::Gtk.AttachOptions)(4));
+ global::Gtk.Table.TableChild w59 = ((global::Gtk.Table.TableChild)(this.table1
[this.weightspinbutton]));
+ w59.TopAttach = ((uint)(7));
+ w59.BottomAttach = ((uint)(8));
+ w59.LeftAttach = ((uint)(1));
+ w59.RightAttach = ((uint)(2));
+ w59.XOptions = ((global::Gtk.AttachOptions)(4));
+ w59.YOptions = ((global::Gtk.AttachOptions)(4));
this.playerpropertyhbox.Add (this.table1);
- global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.playerpropertyhbox
[this.table1]));
- w58.Position = 1;
- w58.Expand = false;
- w58.Fill = false;
+ global::Gtk.Box.BoxChild w60 = ((global::Gtk.Box.BoxChild)(this.playerpropertyhbox
[this.table1]));
+ w60.Position = 1;
+ w60.Expand = false;
+ w60.Fill = false;
this.playerpropertyalignment.Add (this.playerpropertyhbox);
this.playerframe.Add (this.playerpropertyalignment);
this.alignment2.Add (this.playerframe);
this.hbox4.Add (this.alignment2);
- global::Gtk.Box.BoxChild w62 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.alignment2]));
- w62.Position = 1;
- w62.Expand = false;
- w62.Fill = false;
+ global::Gtk.Box.BoxChild w64 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.alignment2]));
+ w64.Position = 1;
+ w64.Expand = false;
+ w64.Fill = false;
this.vbox3.Add (this.hbox4);
- global::Gtk.Box.BoxChild w63 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox4]));
- w63.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";
@@ -647,82 +664,82 @@ namespace LongoMatch.Gui.Component
this.savebutton.Name = "savebutton";
this.savebutton.UseUnderline = true;
// Container child savebutton.Gtk.Container+ContainerChild
- global::Gtk.Alignment w64 = 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 w65 = new global::Gtk.HBox ();
- w65.Spacing = 2;
+ global::Gtk.HBox w67 = new global::Gtk.HBox ();
+ w67.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Image w66 = new global::Gtk.Image ();
- w66.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-save",
global::Gtk.IconSize.Dialog);
- w65.Add (w66);
+ 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 w68 = new global::Gtk.Label ();
- w68.LabelProp = global::Mono.Unix.Catalog.GetString ("Save template");
- w68.UseUnderline = true;
- w65.Add (w68);
- w64.Add (w65);
- this.savebutton.Add (w64);
+ 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 w72 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.savebutton]));
- w72.Expand = false;
- w72.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 w73 = 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 w74 = new global::Gtk.HBox ();
- w74.Spacing = 2;
+ global::Gtk.HBox w76 = new global::Gtk.HBox ();
+ w76.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Image w75 = new global::Gtk.Image ();
- w75.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new",
global::Gtk.IconSize.Dialog);
- w74.Add (w75);
+ 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 w77 = new global::Gtk.Label ();
- w77.LabelProp = global::Mono.Unix.Catalog.GetString ("New player");
- w77.UseUnderline = true;
- w74.Add (w77);
- w73.Add (w74);
- this.newplayerbutton.Add (w73);
+ 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 w81 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.newplayerbutton]));
- w81.Position = 1;
- w81.Expand = false;
- w81.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 w82 = 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 w83 = new global::Gtk.HBox ();
- w83.Spacing = 2;
+ global::Gtk.HBox w85 = new global::Gtk.HBox ();
+ w85.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Image w84 = new global::Gtk.Image ();
- w84.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete",
global::Gtk.IconSize.Dialog);
- w83.Add (w84);
+ 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 w86 = new global::Gtk.Label ();
- w86.LabelProp = global::Mono.Unix.Catalog.GetString ("Delete player");
- w86.UseUnderline = true;
- w83.Add (w86);
- w82.Add (w83);
- this.deletebutton.Add (w82);
+ 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 w90 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.deletebutton]));
- w90.Position = 2;
- w90.Expand = false;
- w90.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 w91 = ((global::Gtk.Box.BoxChild)(this.vbox3
[this.hbuttonbox2]));
- w91.Position = 1;
- w91.Expand = false;
- w91.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 ();
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
index 7b5d9cb..104a4d8 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.NewProjectPanel.cs
@@ -75,11 +75,19 @@ namespace LongoMatch.Gui.Panel
private global::Gtk.Label label8;
private global::Gtk.Entry hometacticsentry;
private global::Gtk.Button hometacticsbutton;
+ private global::Gtk.ToggleButton homecolor1button;
+ private global::Gtk.DrawingArea homecolor1;
+ private global::Gtk.ToggleButton homecolor2button;
+ private global::Gtk.DrawingArea homecolor2;
private global::Gtk.Alignment awayalignment;
private global::Gtk.HBox hbox17;
private global::Gtk.Label label9;
private global::Gtk.Entry awaytacticsentry;
private global::Gtk.Button awaytacticsbutton;
+ private global::Gtk.ToggleButton awaycolor1button;
+ private global::Gtk.DrawingArea awaycolor1;
+ private global::Gtk.ToggleButton awaycolor2button;
+ private global::Gtk.DrawingArea awaycolor2;
private global::Gtk.DrawingArea drawingarea;
private global::Gtk.Label label3;
private global::LongoMatch.Gui.Component.ProjectPeriods projectperiods1;
@@ -668,10 +676,36 @@ namespace LongoMatch.Gui.Panel
w71.Position = 2;
w71.Expand = false;
w71.Fill = false;
+ // Container child hbox16.Gtk.Box+BoxChild
+ this.homecolor1button = new global::Gtk.ToggleButton ();
+ this.homecolor1button.WidthRequest = 30;
+ this.homecolor1button.CanFocus = true;
+ this.homecolor1button.Name = "homecolor1button";
+ // Container child homecolor1button.Gtk.Container+ContainerChild
+ this.homecolor1 = new global::Gtk.DrawingArea ();
+ this.homecolor1.Name = "homecolor1";
+ this.homecolor1button.Add (this.homecolor1);
+ this.homecolor1button.Label = null;
+ this.hbox16.Add (this.homecolor1button);
+ global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.hbox16
[this.homecolor1button]));
+ w73.Position = 3;
+ // Container child hbox16.Gtk.Box+BoxChild
+ this.homecolor2button = new global::Gtk.ToggleButton ();
+ this.homecolor2button.WidthRequest = 30;
+ this.homecolor2button.CanFocus = true;
+ this.homecolor2button.Name = "homecolor2button";
+ // Container child homecolor2button.Gtk.Container+ContainerChild
+ this.homecolor2 = new global::Gtk.DrawingArea ();
+ this.homecolor2.Name = "homecolor2";
+ this.homecolor2button.Add (this.homecolor2);
+ this.homecolor2button.Label = null;
+ this.hbox16.Add (this.homecolor2button);
+ global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox16
[this.homecolor2button]));
+ w75.Position = 4;
this.homealignment.Add (this.hbox16);
this.hbox14.Add (this.homealignment);
- global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.hbox14
[this.homealignment]));
- w73.Position = 0;
+ global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox14
[this.homealignment]));
+ w77.Position = 0;
// Container child hbox14.Gtk.Box+BoxChild
this.awayalignment = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 1F);
this.awayalignment.Name = "awayalignment";
@@ -684,10 +718,10 @@ namespace LongoMatch.Gui.Panel
this.label9.Name = "label9";
this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Tactics");
this.hbox17.Add (this.label9);
- global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.label9]));
- w74.Position = 0;
- w74.Expand = false;
- w74.Fill = false;
+ global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.label9]));
+ w78.Position = 0;
+ w78.Expand = false;
+ w78.Fill = false;
// Container child hbox17.Gtk.Box+BoxChild
this.awaytacticsentry = new global::Gtk.Entry ();
this.awaytacticsentry.CanFocus = true;
@@ -695,56 +729,81 @@ namespace LongoMatch.Gui.Panel
this.awaytacticsentry.IsEditable = true;
this.awaytacticsentry.InvisibleChar = '•';
this.hbox17.Add (this.awaytacticsentry);
- global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.awaytacticsentry]));
- w75.Position = 1;
- w75.Expand = false;
+ global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.awaytacticsentry]));
+ w79.Position = 1;
+ w79.Expand = false;
// Container child hbox17.Gtk.Box+BoxChild
this.awaytacticsbutton = new global::Gtk.Button ();
this.awaytacticsbutton.CanFocus = true;
this.awaytacticsbutton.Name = "awaytacticsbutton";
this.awaytacticsbutton.UseUnderline = true;
// Container child awaytacticsbutton.Gtk.Container+ContainerChild
- global::Gtk.Alignment w76 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+ global::Gtk.Alignment w80 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
// Container child GtkAlignment.Gtk.Container+ContainerChild
- global::Gtk.HBox w77 = new global::Gtk.HBox ();
- w77.Spacing = 2;
+ global::Gtk.HBox w81 = new global::Gtk.HBox ();
+ w81.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Image w78 = new global::Gtk.Image ();
- w78.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-apply",
global::Gtk.IconSize.Menu);
- w77.Add (w78);
+ global::Gtk.Image w82 = new global::Gtk.Image ();
+ w82.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-apply",
global::Gtk.IconSize.Menu);
+ w81.Add (w82);
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Label w80 = new global::Gtk.Label ();
- w77.Add (w80);
- w76.Add (w77);
- this.awaytacticsbutton.Add (w76);
+ global::Gtk.Label w84 = new global::Gtk.Label ();
+ w81.Add (w84);
+ w80.Add (w81);
+ this.awaytacticsbutton.Add (w80);
this.hbox17.Add (this.awaytacticsbutton);
- global::Gtk.Box.BoxChild w84 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.awaytacticsbutton]));
- w84.Position = 2;
- w84.Expand = false;
- w84.Fill = false;
+ global::Gtk.Box.BoxChild w88 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.awaytacticsbutton]));
+ w88.Position = 2;
+ w88.Expand = false;
+ w88.Fill = false;
+ // Container child hbox17.Gtk.Box+BoxChild
+ this.awaycolor1button = new global::Gtk.ToggleButton ();
+ this.awaycolor1button.WidthRequest = 30;
+ this.awaycolor1button.CanFocus = true;
+ this.awaycolor1button.Name = "awaycolor1button";
+ // Container child awaycolor1button.Gtk.Container+ContainerChild
+ this.awaycolor1 = new global::Gtk.DrawingArea ();
+ this.awaycolor1.Name = "awaycolor1";
+ this.awaycolor1button.Add (this.awaycolor1);
+ this.awaycolor1button.Label = null;
+ this.hbox17.Add (this.awaycolor1button);
+ global::Gtk.Box.BoxChild w90 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.awaycolor1button]));
+ w90.Position = 3;
+ // Container child hbox17.Gtk.Box+BoxChild
+ this.awaycolor2button = new global::Gtk.ToggleButton ();
+ this.awaycolor2button.WidthRequest = 30;
+ this.awaycolor2button.CanFocus = true;
+ this.awaycolor2button.Name = "awaycolor2button";
+ // Container child awaycolor2button.Gtk.Container+ContainerChild
+ this.awaycolor2 = new global::Gtk.DrawingArea ();
+ this.awaycolor2.Name = "awaycolor2";
+ this.awaycolor2button.Add (this.awaycolor2);
+ this.awaycolor2button.Label = null;
+ this.hbox17.Add (this.awaycolor2button);
+ global::Gtk.Box.BoxChild w92 = ((global::Gtk.Box.BoxChild)(this.hbox17
[this.awaycolor2button]));
+ w92.Position = 4;
this.awayalignment.Add (this.hbox17);
this.hbox14.Add (this.awayalignment);
- global::Gtk.Box.BoxChild w86 = ((global::Gtk.Box.BoxChild)(this.hbox14
[this.awayalignment]));
- w86.Position = 1;
+ global::Gtk.Box.BoxChild w94 = ((global::Gtk.Box.BoxChild)(this.hbox14
[this.awayalignment]));
+ w94.Position = 1;
this.vbox6.Add (this.hbox14);
- global::Gtk.Box.BoxChild w87 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.hbox14]));
- w87.Position = 0;
- w87.Expand = false;
- w87.Fill = false;
+ global::Gtk.Box.BoxChild w95 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.hbox14]));
+ w95.Position = 0;
+ w95.Expand = false;
// Container child vbox6.Gtk.Box+BoxChild
this.drawingarea = new global::Gtk.DrawingArea ();
this.drawingarea.Name = "drawingarea";
this.vbox6.Add (this.drawingarea);
- global::Gtk.Box.BoxChild w88 = ((global::Gtk.Box.BoxChild)(this.vbox6
[this.drawingarea]));
- w88.Position = 1;
+ global::Gtk.Box.BoxChild w96 = ((global::Gtk.Box.BoxChild)(this.vbox6
[this.drawingarea]));
+ w96.Position = 1;
this.vbox5.Add (this.vbox6);
- global::Gtk.Box.BoxChild w89 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox6]));
- w89.Position = 1;
+ global::Gtk.Box.BoxChild w97 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox6]));
+ w97.Position = 1;
this.notebook1.Add (this.vbox5);
- global::Gtk.Notebook.NotebookChild w90 =
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox5]));
- w90.Position = 1;
- w90.TabFill = false;
- w90.MenuLabel = "";
+ global::Gtk.Notebook.NotebookChild w98 =
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox5]));
+ w98.Position = 1;
+ w98.TabFill = false;
+ w98.MenuLabel = "";
// Notebook tab
this.label3 = new global::Gtk.Label ();
this.label3.Name = "label3";
@@ -756,8 +815,8 @@ namespace LongoMatch.Gui.Panel
this.projectperiods1.Events = ((global::Gdk.EventMask)(256));
this.projectperiods1.Name = "projectperiods1";
this.notebook1.Add (this.projectperiods1);
- global::Gtk.Notebook.NotebookChild w91 =
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.projectperiods1]));
- w91.Position = 2;
+ global::Gtk.Notebook.NotebookChild w99 =
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.projectperiods1]));
+ w99.Position = 2;
// Notebook tab
this.label7 = new global::Gtk.Label ();
this.label7.Name = "label7";
@@ -765,8 +824,8 @@ namespace LongoMatch.Gui.Panel
this.notebook1.SetTabLabel (this.projectperiods1, this.label7);
this.label7.ShowAll ();
this.vbox3.Add (this.notebook1);
- global::Gtk.Box.BoxChild w92 = ((global::Gtk.Box.BoxChild)(this.vbox3
[this.notebook1]));
- w92.Position = 1;
+ global::Gtk.Box.BoxChild w100 = ((global::Gtk.Box.BoxChild)(this.vbox3
[this.notebook1]));
+ w100.Position = 1;
this.Add (this.vbox3);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index f7ebd5b..7a90f48 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -5875,7 +5875,7 @@ You can continue with the current capture, cancel it or save your project.
</widget>
</child>
</widget>
- <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.NewProjectPanel" design-size="1129 750">
+ <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.NewProjectPanel" design-size="1129 786">
<property name="MemberName" />
<property name="Visible">False</property>
<child>
@@ -6759,6 +6759,40 @@ You can continue with the current capture, cancel it or save your project.
<property name="Fill">False</property>
</packing>
</child>
+ <child>
+ <widget class="Gtk.ToggleButton" id="homecolor1button">
+ <property name="MemberName" />
+ <property name="WidthRequest">30</property>
+ <property name="CanFocus">True</property>
+ <property name="Type">Custom</property>
+ <child>
+ <widget class="Gtk.DrawingArea" id="homecolor1">
+ <property name="MemberName" />
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">3</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.ToggleButton" id="homecolor2button">
+ <property name="MemberName" />
+ <property name="WidthRequest">30</property>
+ <property name="CanFocus">True</property>
+ <property name="Type">Custom</property>
+ <child>
+ <widget class="Gtk.DrawingArea" id="homecolor2">
+ <property name="MemberName" />
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">4</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -6816,6 +6850,40 @@ You can continue with the current capture, cancel it or save your project.
<property name="Fill">False</property>
</packing>
</child>
+ <child>
+ <widget class="Gtk.ToggleButton" id="awaycolor1button">
+ <property name="MemberName" />
+ <property name="WidthRequest">30</property>
+ <property name="CanFocus">True</property>
+ <property name="Type">Custom</property>
+ <child>
+ <widget class="Gtk.DrawingArea" id="awaycolor1">
+ <property name="MemberName" />
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">3</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.ToggleButton" id="awaycolor2button">
+ <property name="MemberName" />
+ <property name="WidthRequest">30</property>
+ <property name="CanFocus">True</property>
+ <property name="Type">Custom</property>
+ <child>
+ <widget class="Gtk.DrawingArea" id="awaycolor2">
+ <property name="MemberName" />
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">4</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -6827,9 +6895,8 @@ You can continue with the current capture, cancel it or save your project.
</widget>
<packing>
<property name="Position">0</property>
- <property name="AutoSize">True</property>
+ <property name="AutoSize">False</property>
<property name="Expand">False</property>
- <property name="Fill">False</property>
</packing>
</child>
<child>
@@ -7267,12 +7334,14 @@ You can continue with the current capture, cancel it or save your project.
<child>
<widget class="Gtk.Alignment" id="shieldalignment">
<property name="MemberName" />
+ <property name="WidthRequest">120</property>
+ <property name="HeightRequest">120</property>
<property name="Xalign">0</property>
<property name="Yalign">0</property>
- <property name="LeftPadding">12</property>
- <property name="TopPadding">12</property>
- <property name="RightPadding">12</property>
- <property name="BottomPadding">12</property>
+ <property name="LeftPadding">6</property>
+ <property name="TopPadding">6</property>
+ <property name="RightPadding">6</property>
+ <property name="BottomPadding">6</property>
<child>
<widget class="Gtk.EventBox" id="shieldeventbox">
<property name="MemberName" />
@@ -7346,13 +7415,11 @@ You can continue with the current capture, cancel it or save your project.
<property name="UseMarkup">True</property>
</widget>
<packing>
- <property name="AutoSize">True</property>
- <property name="XOptions">Fill</property>
- <property name="YOptions">Fill</property>
- <property name="XExpand">False</property>
+ <property name="AutoSize">False</property>
+ <property name="XExpand">True</property>
<property name="XFill">True</property>
<property name="XShrink">False</property>
- <property name="YExpand">False</property>
+ <property name="YExpand">True</property>
<property name="YFill">True</property>
<property name="YShrink">False</property>
</packing>
@@ -7392,8 +7459,8 @@ You can continue with the current capture, cancel it or save your project.
</child>
</widget>
<packing>
- <property name="TopAttach">2</property>
- <property name="BottomAttach">3</property>
+ <property name="TopAttach">1</property>
+ <property name="BottomAttach">2</property>
<property name="LeftAttach">1</property>
<property name="RightAttach">2</property>
<property name="AutoSize">True</property>
@@ -7408,20 +7475,48 @@ You can continue with the current capture, cancel it or save your project.
</packing>
</child>
<child>
- <widget class="Gtk.Label" id="label1">
+ <widget class="Gtk.HBox" id="hbox6">
<property name="MemberName" />
- <property name="Xalign">1</property>
- <property name="LabelProp" translatable="yes"><span
font_desc="10">Number of players</span></property>
- <property name="UseMarkup">True</property>
+ <property name="Spacing">6</property>
+ <child>
+ <widget class="Gtk.ColorButton" id="colorbutton1">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Events">ButtonMotionMask, ButtonPressMask,
ButtonReleaseMask</property>
+ <property name="Alpha">-1</property>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.ColorButton" id="colorbutton2">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Events">ButtonMotionMask, ButtonPressMask,
ButtonReleaseMask</property>
+ <property name="Alpha">-1</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="TopAttach">1</property>
- <property name="BottomAttach">2</property>
- <property name="AutoSize">False</property>
- <property name="XExpand">True</property>
+ <property name="TopAttach">2</property>
+ <property name="BottomAttach">3</property>
+ <property name="LeftAttach">1</property>
+ <property name="RightAttach">2</property>
+ <property name="AutoSize">True</property>
+ <property name="XOptions">Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">False</property>
<property name="XFill">True</property>
<property name="XShrink">False</property>
- <property name="YExpand">True</property>
+ <property name="YExpand">False</property>
<property name="YFill">True</property>
<property name="YShrink">False</property>
</packing>
@@ -7434,36 +7529,32 @@ You can continue with the current capture, cancel it or save your project.
<property name="UseMarkup">True</property>
</widget>
<packing>
- <property name="TopAttach">2</property>
- <property name="BottomAttach">3</property>
- <property name="AutoSize">True</property>
- <property name="XOptions">Fill</property>
- <property name="YOptions">Fill</property>
- <property name="XExpand">False</property>
+ <property name="TopAttach">1</property>
+ <property name="BottomAttach">2</property>
+ <property name="AutoSize">False</property>
+ <property name="XExpand">True</property>
<property name="XFill">True</property>
<property name="XShrink">False</property>
- <property name="YExpand">False</property>
+ <property name="YExpand">True</property>
<property name="YFill">True</property>
<property name="YShrink">False</property>
</packing>
</child>
<child>
- <widget class="Gtk.Label" id="nplayerslabel">
+ <widget class="Gtk.Label" id="label4">
<property name="MemberName" />
- <property name="Xalign">0</property>
+ <property name="Xalign">1</property>
+ <property name="LabelProp" translatable="yes"><span
font_desc="10">Colors</span></property>
+ <property name="UseMarkup">True</property>
</widget>
<packing>
- <property name="TopAttach">1</property>
- <property name="BottomAttach">2</property>
- <property name="LeftAttach">1</property>
- <property name="RightAttach">2</property>
- <property name="AutoSize">True</property>
- <property name="XOptions">Fill</property>
- <property name="YOptions">Fill</property>
- <property name="XExpand">False</property>
+ <property name="TopAttach">2</property>
+ <property name="BottomAttach">3</property>
+ <property name="AutoSize">False</property>
+ <property name="XExpand">True</property>
<property name="XFill">True</property>
<property name="XShrink">False</property>
- <property name="YExpand">False</property>
+ <property name="YExpand">True</property>
<property name="YFill">True</property>
<property name="YShrink">False</property>
</packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
