[longomatch] Edit notes, name and players for plays
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Edit notes, name and players for plays
- Date: Wed, 24 Sep 2014 20:22:00 +0000 (UTC)
commit 92a90c78ecbb64cde661b3c65e2c0e688dba60f7
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Tue Sep 2 11:39:57 2014 +0200
Edit notes, name and players for plays
LongoMatch.GUI/Gui/Component/NotesWidget.cs | 14 +--
.../Gui/Component/PlaysCoordinatesTagger.cs | 1 -
LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs | 1 +
LongoMatch.GUI/Gui/Dialog/PlayEditor.cs | 56 +++++-
LongoMatch.GUI/Gui/Menu/PlaysMenu.cs | 8 +-
LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs | 12 +-
.../LongoMatch.Gui.Component.NotesWidget.cs | 25 +---
...goMatch.Gui.Component.PlaysCoordinatesTagger.cs | 22 +--
.../gtk-gui/LongoMatch.Gui.Dialog.PlayEditor.cs | 134 +++++++++++----
LongoMatch.GUI/gtk-gui/gui.stetic | 186 +++++++++++++-------
data/theme/gtk-2.0/gtkrc | 1 +
11 files changed, 290 insertions(+), 170 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Component/NotesWidget.cs b/LongoMatch.GUI/Gui/Component/NotesWidget.cs
index a9e7fad..39d144b 100644
--- a/LongoMatch.GUI/Gui/Component/NotesWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/NotesWidget.cs
@@ -63,18 +63,10 @@ namespace LongoMatch.Gui.Component
}
}
- protected virtual void OnEdition(object sender, EventArgs args) {
- if(Notes != play.Notes) {
- savebutton.Sensitive = true;
- }
- }
-
- protected virtual void OnSavebuttonClicked(object sender, System.EventArgs e)
+ protected virtual void OnEdition (object sender, EventArgs args)
{
- if(play != null) {
- play.Notes=Notes;
- Config.EventsBroker.EmitTimeNodeChanged (play, null);
- savebutton.Sensitive = false;
+ if (play != null) {
+ play.Notes = Notes;
}
}
diff --git a/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
b/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
index 24f07f5..0a32113 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysCoordinatesTagger.cs
@@ -60,7 +60,6 @@ namespace LongoMatch.Gui.Component
field.Visible = play.Category.TagFieldPosition;
hfield.Visible = play.Category.TagHalfFieldPosition;
goal.Visible = play.Category.TagGoalPosition;
- vbox2.Visible = hfield.Visible || goal.Visible;
play.AddDefaultPositions ();
diff --git a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
index da99c6f..4009df6 100644
--- a/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
+++ b/LongoMatch.GUI/Gui/Component/TeamTemplateEditor.cs
@@ -50,6 +50,7 @@ namespace LongoMatch.Gui.Component
this.Build ();
teamtagger = new TeamTagger (new WidgetWrapper (drawingarea));
+ teamtagger.SelectionMode = MultiSelectionMode.MultipleWithModifier;
teamtagger.PlayersSelectionChangedEvent += HandlePlayersSelectionChangedEvent;
ConnectSignals ();
diff --git a/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs b/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs
index 2f09358..cb581cd 100644
--- a/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs
+++ b/LongoMatch.GUI/Gui/Dialog/PlayEditor.cs
@@ -16,26 +16,66 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
+using System.Linq;
+using LongoMatch.Common;
using LongoMatch.Store;
+using LongoMatch.Drawing.Widgets;
+using System.Collections.Generic;
+using LongoMatch.Drawing.Cairo;
namespace LongoMatch.Gui.Dialog
{
public partial class PlayEditor : Gtk.Dialog
{
+ TeamTagger teamtagger;
+ Play play;
+
public PlayEditor ()
{
this.Build ();
+ teamtagger = new TeamTagger (new WidgetWrapper (drawingarea3));
+ teamtagger.Compact = true;
+ teamtagger.SelectionMode = MultiSelectionMode.Multiple;
+ teamtagger.PlayersSelectionChangedEvent += HandlePlayersSelectionChangedEvent;
}
-
- public void LoadPlay (Play play, Project project, bool editTags, bool editPos, bool
editPlayers, bool editNotes) {
- notes.Visible = editNotes;
- tagger.Visible = editPos;
- tagger.LoadBackgrounds (project);
- tagger.LoadPlay (play);
+ protected override void OnDestroyed ()
+ {
+ teamtagger.Dispose ();
+ tagger.Destroy ();
+ base.OnDestroyed ();
+ }
+
+ public void LoadPlay (Play play, Project project, bool editTags, bool editPos, bool
editPlayers, bool editNotes)
+ {
+ this.play = play;
+ notesframe.Visible = editNotes;
+ tagger.Visible = editPos && (play.Category.TagFieldPosition ||
+ play.Category.TagHalfFieldPosition ||
+ play.Category.TagGoalPosition);
+ drawingarea3.Visible = editPlayers;
+ nameframe.Visible = editTags;
+
+ nameentry.Text = play.Name;
+ if (editPos) {
+ tagger.LoadBackgrounds (project);
+ tagger.LoadPlay (play);
+ }
- notes.Play = play;
+ if (editNotes) {
+ notes.Play = play;
+ }
+ if (editPlayers) {
+ teamtagger.LoadTeams (project.LocalTeamTemplate, project.VisitorTeamTemplate,
+ project.Categories.FieldBackground);
+ teamtagger.Select (play.Players);
+ }
+ }
+
+ void HandlePlayersSelectionChangedEvent (List<Player> players)
+ {
+ play.Players = players.ToList();
}
+
}
}
-
diff --git a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
index 94c8215..34b1da5 100644
--- a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
+++ b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
@@ -29,7 +29,7 @@ namespace LongoMatch.Gui.Menus
public class PlaysMenu: Gtk.Menu
{
- public event EventHandler EditNameEvent;
+ public event EventHandler EditPlayEvent;
MenuItem edit, newPlay, del, addPLN, snapshot, render;
MenuItem duplicate, moveCat, drawings;
@@ -171,10 +171,10 @@ namespace LongoMatch.Gui.Menus
Add (newPlay);
newPlay.Activated += HandleNePlayActivated;
- edit = new MenuItem (Catalog.GetString ("Edit name"));
+ edit = new MenuItem (Catalog.GetString ("Edit properties"));
edit.Activated += (sender, e) => {
- if (EditNameEvent != null) {
- EditNameEvent (this, null);
+ if (EditPlayEvent != null) {
+ EditPlayEvent (this, null);
}
};
Add (edit);
diff --git a/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs b/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
index ea47de3..717e715 100644
--- a/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
+++ b/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
@@ -61,7 +61,7 @@ namespace LongoMatch.Gui.Component
custColumn.SetCellDataFunc (cr, RenderElement);
playsMenu = new PlaysMenu ();
- playsMenu.EditNameEvent += OnEdit;
+ playsMenu.EditPlayEvent += HandleEditPlayEvent;
AppendColumn(custColumn);
}
@@ -150,12 +150,10 @@ namespace LongoMatch.Gui.Component
Config.EventsBroker.EmitLoadPlay (item as Play);
}
- protected virtual void OnEdit (object obj, EventArgs args) {
- TreePath[] paths = Selection.GetSelectedRows();
-
- //editing = true;
- //nameCell.Editable = true;
- //SetCursor(paths[0], nameColumn, true);
+ void HandleEditPlayEvent (object sender, EventArgs e)
+ {
+ Config.GUIToolkit.EditPlay (SelectedPlay, Project, true, true, true, true);
+ Config.EventsBroker.EmitTeamTagsChanged ();
}
protected void OnFilterUpdated() {
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs
index 9f6bc66..e1e952b 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.NotesWidget.cs
@@ -4,10 +4,8 @@ namespace LongoMatch.Gui.Component
{
public partial class NotesWidget
{
- private global::Gtk.VBox vbox2;
private global::Gtk.ScrolledWindow scrolledwindow1;
private global::Gtk.TextView textview1;
- private global::Gtk.Button savebutton;
protected virtual void Build ()
{
@@ -16,10 +14,6 @@ namespace LongoMatch.Gui.Component
global::Stetic.BinContainer.Attach (this);
this.Name = "LongoMatch.Gui.Component.NotesWidget";
// Container child LongoMatch.Gui.Component.NotesWidget.Gtk.Container+ContainerChild
- this.vbox2 = new global::Gtk.VBox ();
- this.vbox2.Name = "vbox2";
- this.vbox2.Spacing = 6;
- // Container child vbox2.Gtk.Box+BoxChild
this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
this.scrolledwindow1.CanFocus = true;
this.scrolledwindow1.Name = "scrolledwindow1";
@@ -33,28 +27,11 @@ namespace LongoMatch.Gui.Component
this.textview1.Name = "textview1";
w1.Add (this.textview1);
this.scrolledwindow1.Add (w1);
- this.vbox2.Add (this.scrolledwindow1);
- global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.scrolledwindow1]));
- w4.Position = 0;
- // Container child vbox2.Gtk.Box+BoxChild
- this.savebutton = new global::Gtk.Button ();
- this.savebutton.Sensitive = false;
- this.savebutton.CanFocus = true;
- this.savebutton.Name = "savebutton";
- this.savebutton.UseStock = true;
- this.savebutton.UseUnderline = true;
- this.savebutton.Label = "gtk-save";
- this.vbox2.Add (this.savebutton);
- global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.savebutton]));
- w5.Position = 1;
- w5.Expand = false;
- w5.Fill = false;
- this.Add (this.vbox2);
+ this.Add (this.scrolledwindow1);
if ((this.Child != null)) {
this.Child.ShowAll ();
}
this.Show ();
- this.savebutton.Clicked += new global::System.EventHandler (this.OnSavebuttonClicked);
}
}
}
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.PlaysCoordinatesTagger.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.PlaysCoordinatesTagger.cs
index 185a488..355bc6c 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.PlaysCoordinatesTagger.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.PlaysCoordinatesTagger.cs
@@ -6,7 +6,6 @@ namespace LongoMatch.Gui.Component
{
private global::Gtk.HBox mainbox;
private global::LongoMatch.Gui.Component.CoordinatesTagger field;
- private global::Gtk.VBox vbox2;
private global::LongoMatch.Gui.Component.CoordinatesTagger hfield;
private global::LongoMatch.Gui.Component.CoordinatesTagger goal;
@@ -28,26 +27,19 @@ namespace LongoMatch.Gui.Component
global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.mainbox [this.field]));
w1.Position = 0;
// Container child mainbox.Gtk.Box+BoxChild
- this.vbox2 = new global::Gtk.VBox ();
- this.vbox2.Name = "vbox2";
- this.vbox2.Spacing = 6;
- // Container child vbox2.Gtk.Box+BoxChild
this.hfield = new global::LongoMatch.Gui.Component.CoordinatesTagger ();
this.hfield.Events = ((global::Gdk.EventMask)(256));
this.hfield.Name = "hfield";
- this.vbox2.Add (this.hfield);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hfield]));
- w2.Position = 0;
- // Container child vbox2.Gtk.Box+BoxChild
+ this.mainbox.Add (this.hfield);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.mainbox
[this.hfield]));
+ w2.Position = 1;
+ // Container child mainbox.Gtk.Box+BoxChild
this.goal = new global::LongoMatch.Gui.Component.CoordinatesTagger ();
this.goal.Events = ((global::Gdk.EventMask)(256));
this.goal.Name = "goal";
- this.vbox2.Add (this.goal);
- global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.goal]));
- w3.Position = 1;
- this.mainbox.Add (this.vbox2);
- global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.mainbox [this.vbox2]));
- w4.Position = 1;
+ this.mainbox.Add (this.goal);
+ global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.mainbox [this.goal]));
+ w3.Position = 2;
this.Add (this.mainbox);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Dialog.PlayEditor.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Dialog.PlayEditor.cs
index 8571344..95f8343 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Dialog.PlayEditor.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Dialog.PlayEditor.cs
@@ -4,9 +4,18 @@ namespace LongoMatch.Gui.Dialog
{
public partial class PlayEditor
{
- private global::Gtk.HBox hbox1;
- private global::LongoMatch.Gui.Component.PlaysCoordinatesTagger tagger;
+ private global::Gtk.HBox hbox4;
+ private global::Gtk.Frame nameframe;
+ private global::Gtk.Alignment GtkAlignment3;
+ private global::Gtk.HBox hbox3;
+ private global::Gtk.Entry nameentry;
+ private global::Gtk.Label GtkLabel3;
+ private global::Gtk.Frame notesframe;
+ private global::Gtk.Alignment GtkAlignment;
private global::LongoMatch.Gui.Component.NotesWidget notes;
+ private global::Gtk.Label GtkLabel;
+ private global::LongoMatch.Gui.Component.PlaysCoordinatesTagger tagger;
+ private global::Gtk.DrawingArea drawingarea3;
private global::Gtk.Button buttonCancel;
private global::Gtk.Button buttonOk;
@@ -28,32 +37,93 @@ namespace LongoMatch.Gui.Dialog
w1.Name = "dialog1_VBox";
w1.BorderWidth = ((uint)(2));
// Container child dialog1_VBox.Gtk.Box+BoxChild
- this.hbox1 = new global::Gtk.HBox ();
- this.hbox1.Name = "hbox1";
- this.hbox1.Spacing = 6;
- // Container child hbox1.Gtk.Box+BoxChild
- this.tagger = new global::LongoMatch.Gui.Component.PlaysCoordinatesTagger ();
- this.tagger.Events = ((global::Gdk.EventMask)(256));
- this.tagger.Name = "tagger";
- this.hbox1.Add (this.tagger);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.tagger]));
+ this.hbox4 = new global::Gtk.HBox ();
+ this.hbox4.Name = "hbox4";
+ this.hbox4.Spacing = 6;
+ // Container child hbox4.Gtk.Box+BoxChild
+ this.nameframe = new global::Gtk.Frame ();
+ this.nameframe.Name = "nameframe";
+ this.nameframe.ShadowType = ((global::Gtk.ShadowType)(0));
+ // Container child nameframe.Gtk.Container+ContainerChild
+ this.GtkAlignment3 = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+ this.GtkAlignment3.Name = "GtkAlignment3";
+ this.GtkAlignment3.LeftPadding = ((uint)(12));
+ // Container child GtkAlignment3.Gtk.Container+ContainerChild
+ this.hbox3 = new global::Gtk.HBox ();
+ this.hbox3.Name = "hbox3";
+ this.hbox3.Spacing = 6;
+ // Container child hbox3.Gtk.Box+BoxChild
+ this.nameentry = new global::Gtk.Entry ();
+ this.nameentry.CanFocus = true;
+ this.nameentry.Name = "nameentry";
+ this.nameentry.IsEditable = true;
+ this.nameentry.InvisibleChar = '•';
+ this.hbox3.Add (this.nameentry);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox3
[this.nameentry]));
w2.Position = 0;
- // Container child hbox1.Gtk.Box+BoxChild
+ w2.Expand = false;
+ w2.Fill = false;
+ this.GtkAlignment3.Add (this.hbox3);
+ this.nameframe.Add (this.GtkAlignment3);
+ this.GtkLabel3 = new global::Gtk.Label ();
+ this.GtkLabel3.Name = "GtkLabel3";
+ this.GtkLabel3.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Name</b>");
+ this.GtkLabel3.UseMarkup = true;
+ this.nameframe.LabelWidget = this.GtkLabel3;
+ this.hbox4.Add (this.nameframe);
+ global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.nameframe]));
+ w5.Position = 0;
+ w5.Expand = false;
+ w5.Fill = false;
+ // Container child hbox4.Gtk.Box+BoxChild
+ this.notesframe = new global::Gtk.Frame ();
+ this.notesframe.Name = "notesframe";
+ this.notesframe.ShadowType = ((global::Gtk.ShadowType)(0));
+ // Container child notesframe.Gtk.Container+ContainerChild
+ this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
+ this.GtkAlignment.Name = "GtkAlignment";
+ this.GtkAlignment.LeftPadding = ((uint)(12));
+ // Container child GtkAlignment.Gtk.Container+ContainerChild
this.notes = new global::LongoMatch.Gui.Component.NotesWidget ();
+ this.notes.HeightRequest = 100;
this.notes.Events = ((global::Gdk.EventMask)(256));
this.notes.Name = "notes";
- this.hbox1.Add (this.notes);
- global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.notes]));
- w3.Position = 1;
- w1.Add (this.hbox1);
- global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox1]));
- w4.Position = 0;
+ this.GtkAlignment.Add (this.notes);
+ this.notesframe.Add (this.GtkAlignment);
+ this.GtkLabel = new global::Gtk.Label ();
+ this.GtkLabel.Name = "GtkLabel";
+ this.GtkLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Notes</b>");
+ this.GtkLabel.UseMarkup = true;
+ this.notesframe.LabelWidget = this.GtkLabel;
+ this.hbox4.Add (this.notesframe);
+ global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.notesframe]));
+ w8.Position = 1;
+ w1.Add (this.hbox4);
+ global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox4]));
+ w9.Position = 0;
+ w9.Expand = false;
+ w9.Fill = false;
+ // Container child dialog1_VBox.Gtk.Box+BoxChild
+ this.tagger = new global::LongoMatch.Gui.Component.PlaysCoordinatesTagger ();
+ this.tagger.HeightRequest = 200;
+ this.tagger.Events = ((global::Gdk.EventMask)(256));
+ this.tagger.Name = "tagger";
+ w1.Add (this.tagger);
+ global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1 [this.tagger]));
+ w10.Position = 1;
+ // Container child dialog1_VBox.Gtk.Box+BoxChild
+ this.drawingarea3 = new global::Gtk.DrawingArea ();
+ this.drawingarea3.HeightRequest = 200;
+ this.drawingarea3.Name = "drawingarea3";
+ w1.Add (this.drawingarea3);
+ global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(w1 [this.drawingarea3]));
+ w11.Position = 2;
// Internal child LongoMatch.Gui.Dialog.PlayEditor.ActionArea
- global::Gtk.HButtonBox w5 = this.ActionArea;
- w5.Name = "dialog1_ActionArea";
- w5.Spacing = 10;
- w5.BorderWidth = ((uint)(5));
- w5.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+ global::Gtk.HButtonBox w12 = this.ActionArea;
+ w12.Name = "dialog1_ActionArea";
+ w12.Spacing = 10;
+ w12.BorderWidth = ((uint)(5));
+ w12.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
this.buttonCancel = new global::Gtk.Button ();
this.buttonCancel.CanDefault = true;
@@ -63,9 +133,9 @@ namespace LongoMatch.Gui.Dialog
this.buttonCancel.UseUnderline = true;
this.buttonCancel.Label = "gtk-cancel";
this.AddActionWidget (this.buttonCancel, -6);
- global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5
[this.buttonCancel]));
- w6.Expand = false;
- w6.Fill = false;
+ global::Gtk.ButtonBox.ButtonBoxChild w13 =
((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCancel]));
+ w13.Expand = false;
+ w13.Fill = false;
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
this.buttonOk = new global::Gtk.Button ();
this.buttonOk.CanDefault = true;
@@ -75,15 +145,15 @@ namespace LongoMatch.Gui.Dialog
this.buttonOk.UseUnderline = true;
this.buttonOk.Label = "gtk-ok";
this.AddActionWidget (this.buttonOk, -5);
- global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5
[this.buttonOk]));
- w7.Position = 1;
- w7.Expand = false;
- w7.Fill = false;
+ global::Gtk.ButtonBox.ButtonBoxChild w14 =
((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonOk]));
+ w14.Position = 1;
+ w14.Expand = false;
+ w14.Fill = false;
if ((this.Child != null)) {
this.Child.ShowAll ();
}
- this.DefaultWidth = 707;
- this.DefaultHeight = 441;
+ this.DefaultWidth = 1021;
+ this.DefaultHeight = 639;
this.Show ();
}
}
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index 44d78bd..b0a9b9a 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -2496,54 +2496,26 @@ Circle</property>
</widget>
</child>
</widget>
- <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.NotesWidget" design-size="300 130">
+ <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.NotesWidget" design-size="299 130">
<property name="MemberName" />
<child>
- <widget class="Gtk.VBox" id="vbox2">
+ <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
<property name="MemberName" />
- <property name="Spacing">6</property>
+ <property name="CanFocus">True</property>
+ <property name="ShadowType">In</property>
<child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
+ <widget class="Gtk.Viewport" id="GtkViewport">
<property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="ShadowType">In</property>
+ <property name="ShadowType">None</property>
<child>
- <widget class="Gtk.Viewport" id="GtkViewport">
+ <widget class="Gtk.TextView" id="textview1">
<property name="MemberName" />
- <property name="ShadowType">None</property>
- <child>
- <widget class="Gtk.TextView" id="textview1">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="ShowScrollbars">True</property>
- <property name="Text" translatable="yes" />
- </widget>
- </child>
+ <property name="CanFocus">True</property>
+ <property name="ShowScrollbars">True</property>
+ <property name="Text" translatable="yes" />
</widget>
</child>
</widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Button" id="savebutton">
- <property name="MemberName" />
- <property name="Sensitive">False</property>
- <property name="CanFocus">True</property>
- <property name="UseStock">True</property>
- <property name="Type">StockItem</property>
- <property name="StockId">gtk-save</property>
- <signal name="Clicked" handler="OnSavebuttonClicked" />
- <property name="label">gtk-save</property>
- </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>
@@ -5453,7 +5425,7 @@ You can continue with the current capture, cancel it or save your project.
</widget>
</child>
</widget>
- <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.PlaysCoordinatesTagger" design-size="352 364">
+ <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.PlaysCoordinatesTagger" design-size="759 274">
<property name="MemberName" />
<property name="Visible">False</property>
<child>
@@ -5471,35 +5443,25 @@ You can continue with the current capture, cancel it or save your project.
</packing>
</child>
<child>
- <widget class="Gtk.VBox" id="vbox2">
+ <widget class="LongoMatch.Gui.Component.CoordinatesTagger" id="hfield">
<property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="LongoMatch.Gui.Component.CoordinatesTagger" id="hfield">
- <property name="MemberName" />
- <property name="Events">ButtonPressMask</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- <child>
- <widget class="LongoMatch.Gui.Component.CoordinatesTagger" id="goal">
- <property name="MemberName" />
- <property name="Events">ButtonPressMask</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
+ <property name="Events">ButtonPressMask</property>
</widget>
<packing>
<property name="Position">1</property>
<property name="AutoSize">True</property>
</packing>
</child>
+ <child>
+ <widget class="LongoMatch.Gui.Component.CoordinatesTagger" id="goal">
+ <property name="MemberName" />
+ <property name="Events">ButtonPressMask</property>
+ </widget>
+ <packing>
+ <property name="Position">2</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -7348,7 +7310,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.TeamsTemplatesPanel" design-size="1325 583">
+ <widget class="Gtk.Bin" id="LongoMatch.Gui.Panel.TeamsTemplatesPanel" design-size="1325 587">
<property name="MemberName" />
<property name="Visible">False</property>
<child>
@@ -10395,7 +10357,7 @@ You can continue with the current capture, cancel it or save your project.
</widget>
</child>
</widget>
- <widget class="Gtk.Dialog" id="LongoMatch.Gui.Dialog.PlayEditor" design-size="707 441">
+ <widget class="Gtk.Dialog" id="LongoMatch.Gui.Dialog.PlayEditor" design-size="1021 639">
<property name="MemberName" />
<property name="Title" translatable="yes">Edit play details</property>
<property name="Icon">stock:longomatch Menu</property>
@@ -10412,23 +10374,88 @@ You can continue with the current capture, cancel it or save your project.
<property name="MemberName" />
<property name="BorderWidth">2</property>
<child>
- <widget class="Gtk.HBox" id="hbox1">
+ <widget class="Gtk.HBox" id="hbox4">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
- <widget class="LongoMatch.Gui.Component.PlaysCoordinatesTagger" id="tagger">
+ <widget class="Gtk.Frame" id="nameframe">
<property name="MemberName" />
- <property name="Events">ButtonPressMask</property>
+ <property name="ShadowType">None</property>
+ <child>
+ <widget class="Gtk.Alignment" id="GtkAlignment3">
+ <property name="MemberName" />
+ <property name="Xalign">0</property>
+ <property name="Yalign">0</property>
+ <property name="LeftPadding">12</property>
+ <child>
+ <widget class="Gtk.HBox" id="hbox3">
+ <property name="MemberName" />
+ <property name="Spacing">6</property>
+ <child>
+ <widget class="Gtk.Entry" id="nameentry">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="IsEditable">True</property>
+ <property name="InvisibleChar">•</property>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">False</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="GtkLabel3">
+ <property name="MemberName" />
+ <property name="LabelProp" translatable="yes"><b>Name</b></property>
+ <property name="UseMarkup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</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="LongoMatch.Gui.Component.NotesWidget" id="notes">
+ <widget class="Gtk.Frame" id="notesframe">
<property name="MemberName" />
- <property name="Events">ButtonPressMask</property>
+ <property name="ShadowType">None</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="LongoMatch.Gui.Component.NotesWidget" id="notes">
+ <property name="MemberName" />
+ <property name="HeightRequest">100</property>
+ <property name="Events">ButtonPressMask</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="GtkLabel">
+ <property name="MemberName" />
+ <property name="LabelProp" translatable="yes"><b>Notes</b></property>
+ <property name="UseMarkup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="Position">1</property>
@@ -10439,6 +10466,29 @@ You can continue with the current capture, cancel it or save your project.
<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="LongoMatch.Gui.Component.PlaysCoordinatesTagger" id="tagger">
+ <property name="MemberName" />
+ <property name="HeightRequest">200</property>
+ <property name="Events">ButtonPressMask</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.DrawingArea" id="drawingarea3">
+ <property name="MemberName" />
+ <property name="HeightRequest">200</property>
+ </widget>
+ <packing>
+ <property name="Position">2</property>
+ <property name="AutoSize">True</property>
</packing>
</child>
</widget>
diff --git a/data/theme/gtk-2.0/gtkrc b/data/theme/gtk-2.0/gtkrc
index c79045f..947e089 100644
--- a/data/theme/gtk-2.0/gtkrc
+++ b/data/theme/gtk-2.0/gtkrc
@@ -141,6 +141,7 @@ class "GtkCheckMenuItem" style "longomatch-checkbox"
class "GtkRadioButton" style "longomatch-radiobutton"
class "GtkTreeView" style "longomatch-treeview"
class "GtkIconView" style "longomatch-treeview"
+class "GtkTextView" style "longomatch-treeview"
# Background for the menubar
class "GtkMenuBar" style "longomatch-menubar"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
