GNOME.org
 

[longomatch/test: 8/10] WIP after rebase

commit d700c92a5aacf2505b4ab0eebeadf1624d31707f
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sun Nov 14 21:48:50 2010 +0100

    WIP after rebase

 LongoMatch/Gui/Dialog/PlayersSelectionDialog.cs    |   10 +-
 .../LongoMatch.Gui.Component.CategoryProperties.cs |    3 +-
 ...ngoMatch.Gui.Component.PlayersListTreeWidget.cs |    1 +
 ...LongoMatch.Gui.Component.PlaysListTreeWidget.cs |    1 +
 ...ngoMatch.Gui.Component.ProjectTemplateWidget.cs |   12 +-
 .../LongoMatch.Gui.Component.TagsTreeWidget.cs     |    1 +
 .../LongoMatch.Gui.Dialog.EditCategoryDialog.cs    |    2 +-
 ...Match.Gui.Dialog.ProjectTemplateEditorDialog.cs |    2 +-
 .../LongoMatch.Gui.Dialog.ProjectsManager.cs       |    2 +-
 LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs    |    2 +-
 LongoMatch/gtk-gui/gui.stetic                      |    6 +-
 LongoMatch/gtk-gui/objects.xml                     |  373 --------------------
 12 files changed, 21 insertions(+), 394 deletions(-)
---
diff --git a/LongoMatch/Gui/Dialog/PlayersSelectionDialog.cs b/LongoMatch/Gui/Dialog/PlayersSelectionDialog.cs
index 3145a15..55ac260 100644
--- a/LongoMatch/Gui/Dialog/PlayersSelectionDialog.cs
+++ b/LongoMatch/Gui/Dialog/PlayersSelectionDialog.cs
@@ -39,7 +39,6 @@ namespace LongoMatch.Gui.Dialog
 
 		public void SetPlayersInfo(TeamTemplate template) {
 			CheckButton button;
-			Player player;
 			int playersCount=0;
 
 			if (this.template != null)
@@ -50,14 +49,13 @@ namespace LongoMatch.Gui.Dialog
 			table1.NColumns =(uint)(template.PlayersCount/10);
 			table1.NRows =(uint) 10;
 
-			for (int i=0;i<template.PlayersCount;i++) {
-				player = template.GetPlayer(i);
-				if (player.Discarded)
+			foreach (Player player in template.PlayersList) {
+				if (player.Playing)
 					continue;
 
 				button = new CheckButton();
 				button.Label = player.Number + "-" + player.Name;
-				button.Name = i.ToString();
+				button.Name = playersCount.ToString();
 				button.Show();
 
 				uint row_top =(uint)(playersCount%table1.NRows);
@@ -66,7 +64,7 @@ namespace LongoMatch.Gui.Dialog
 				uint col_right = (uint) col_left+1 ;
 
 				table1.Attach(button,col_left,col_right,row_top,row_bottom);
-				checkButtonsList.Add(button);
+				checkButtonsDict.Add(button, player);
 				playersCount++;
 			}
 		}
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.CategoryProperties.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.CategoryProperties.cs
index de1a8e8..965f069 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.CategoryProperties.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.CategoryProperties.cs
@@ -75,6 +75,7 @@ namespace LongoMatch.Gui.Component
 			this.vbox3.Add (this.timeadjustwidget1);
 			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.timeadjustwidget1]));
 			w4.Position = 1;
+			w4.Expand = false;
 			w4.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
 			this.hbox2 = new global::Gtk.HBox ();
@@ -170,8 +171,6 @@ namespace LongoMatch.Gui.Component
 			}
 			this.Show ();
 			this.nameentry.Changed += new global::System.EventHandler (this.OnNameentryChanged);
-			this.timeadjustwidget1.LeadTimeChanged += new global::System.EventHandler (this.OnTimeadjustwidget1LeadTimeChanged);
-			this.timeadjustwidget1.LagTimeChanged += new global::System.EventHandler (this.OnTimeadjustwidget1LagTimeChanged);
 			this.colorbutton1.ColorSet += new global::System.EventHandler (this.OnColorbutton1ColorSet);
 			this.changebuton.Clicked += new global::System.EventHandler (this.OnChangebutonClicked);
 			this.sortmethodcombobox.Changed += new global::System.EventHandler (this.OnSortmethodcomboboxChanged);
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs
index 5108469..9130231 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlayersListTreeWidget.cs
@@ -23,6 +23,7 @@ namespace LongoMatch.Gui.Component
 			this.playerstreeview = new global::LongoMatch.Gui.Component.PlayersTreeView ();
 			this.playerstreeview.CanFocus = true;
 			this.playerstreeview.Name = "playerstreeview";
+			this.playerstreeview.Colors = false;
 			this.scrolledwindow1.Add (this.playerstreeview);
 			this.Add (this.scrolledwindow1);
 			if ((this.Child != null)) {
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlaysListTreeWidget.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlaysListTreeWidget.cs
index 14bc1f0..cc942f1 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlaysListTreeWidget.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.PlaysListTreeWidget.cs
@@ -25,6 +25,7 @@ namespace LongoMatch.Gui.Component
 			this.treeview = new global::LongoMatch.Gui.Component.PlaysTreeView ();
 			this.treeview.CanFocus = true;
 			this.treeview.Name = "treeview";
+			this.treeview.Colors = false;
 			w1.Add (this.treeview);
 			this.scrolledwindow1.Add (w1);
 			this.Add (this.scrolledwindow1);
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.ProjectTemplateWidget.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.ProjectTemplateWidget.cs
index 940125f..3c8de3f 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.ProjectTemplateWidget.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.ProjectTemplateWidget.cs
@@ -8,7 +8,7 @@ namespace LongoMatch.Gui.Component
 
 		private global::Gtk.ScrolledWindow scrolledwindow2;
 
-		private global::LongoMatch.Gui.Component.CategoriesTreeView sectionstreeview1;
+		private global::LongoMatch.Gui.Component.CategoriesTreeView categoriestreeview;
 
 		private global::Gtk.VBox vbox2;
 
@@ -40,10 +40,10 @@ namespace LongoMatch.Gui.Component
 			this.scrolledwindow2.Name = "scrolledwindow2";
 			this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child scrolledwindow2.Gtk.Container+ContainerChild
-			this.sectionstreeview1 = new global::LongoMatch.Gui.Component.CategoriesTreeView ();
-			this.sectionstreeview1.CanFocus = true;
-			this.sectionstreeview1.Name = "sectionstreeview1";
-			this.scrolledwindow2.Add (this.sectionstreeview1);
+			this.categoriestreeview = new global::LongoMatch.Gui.Component.CategoriesTreeView ();
+			this.categoriestreeview.CanFocus = true;
+			this.categoriestreeview.Name = "categoriestreeview";
+			this.scrolledwindow2.Add (this.categoriestreeview);
 			this.hbox1.Add (this.scrolledwindow2);
 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow2]));
 			w2.Position = 0;
@@ -212,8 +212,6 @@ namespace LongoMatch.Gui.Component
 			this.exportbutton.Hide ();
 			this.Show ();
 			this.KeyPressEvent += new global::Gtk.KeyPressEventHandler (this.OnKeyPressEvent);
-			this.sectionstreeview1.SectionClicked += new global::LongoMatch.Handlers.SectionHandler (this.OnSectionstreeview1SectionClicked);
-			this.sectionstreeview1.SectionsSelected += new global::LongoMatch.Handlers.SectionsHandler (this.OnSectionstreeview1SectionsSelected);
 			this.newprevbutton.Clicked += new global::System.EventHandler (this.OnNewBefore);
 			this.newafterbutton.Clicked += new global::System.EventHandler (this.OnNewAfter);
 			this.newafterbutton.Activated += new global::System.EventHandler (this.OnNewBefore);
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.TagsTreeWidget.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.TagsTreeWidget.cs
index bcc556f..d5c47f3 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Component.TagsTreeWidget.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Component.TagsTreeWidget.cs
@@ -40,6 +40,7 @@ namespace LongoMatch.Gui.Component
 			this.treeview = new global::LongoMatch.Gui.Component.TagsTreeView ();
 			this.treeview.CanFocus = true;
 			this.treeview.Name = "treeview";
+			this.treeview.Colors = false;
 			this.GtkScrolledWindow.Add (this.treeview);
 			this.vbox1.Add (this.GtkScrolledWindow);
 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkScrolledWindow]));
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EditCategoryDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EditCategoryDialog.cs
index be8a240..8bfb87c 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EditCategoryDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.EditCategoryDialog.cs
@@ -49,7 +49,7 @@ namespace LongoMatch.Gui.Dialog
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
-			this.DefaultWidth = 266;
+			this.DefaultWidth = 492;
 			this.DefaultHeight = 191;
 			this.Show ();
 		}
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectTemplateEditorDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectTemplateEditorDialog.cs
index 90eb402..5205418 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectTemplateEditorDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectTemplateEditorDialog.cs
@@ -53,7 +53,7 @@ namespace LongoMatch.Gui.Dialog
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
-			this.DefaultWidth = 516;
+			this.DefaultWidth = 518;
 			this.DefaultHeight = 243;
 			this.Show ();
 		}
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs
index e98e783..1595df8 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectsManager.cs
@@ -195,7 +195,7 @@ namespace LongoMatch.Gui.Dialog
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
-			this.DefaultWidth = 804;
+			this.DefaultWidth = 1006;
 			this.DefaultHeight = 597;
 			this.Show ();
 			this.projectlistwidget1.ProjectsSelected += new global::LongoMatch.Handlers.ProjectsSelectedHandler (this.OnProjectlistwidget1ProjectsSelected);
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
index 6a17ee0..5fe8d80 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
@@ -187,7 +187,7 @@ namespace LongoMatch.Gui
 			this.ImportProjectAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Import Project");
 			w1.Add (this.ImportProjectAction, "<Control>i");
 			this.FreeCaptureModeAction = new global::Gtk.RadioAction ("FreeCaptureModeAction", global::Mono.Unix.Catalog.GetString ("Free Capture Mode"), null, null, 0);
-			this.FreeCaptureModeAction.Group = this.CaptureModeAction.Group;
+			this.FreeCaptureModeAction.Group = this.AnalyzeModeAction.Group;
 			this.FreeCaptureModeAction.Sensitive = false;
 			this.FreeCaptureModeAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Free Capture Mode");
 			w1.Add (this.FreeCaptureModeAction, "<Control>f");
diff --git a/LongoMatch/gtk-gui/gui.stetic b/LongoMatch/gtk-gui/gui.stetic
index 268a9bf..0a9cf14 100644
--- a/LongoMatch/gtk-gui/gui.stetic
+++ b/LongoMatch/gtk-gui/gui.stetic
@@ -964,6 +964,7 @@
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="ShowScrollbars">True</property>
+                <property name="Colors">False</property>
               </widget>
             </child>
           </widget>
@@ -1581,7 +1582,6 @@
               <widget class="LongoMatch.Gui.Component.CategoriesTreeView" id="categoriestreeview">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <signal name="CategoriesSelected" handler="OnCategoriestreeviewCategoriesSelected" />
               </widget>
             </child>
           </widget>
@@ -4355,6 +4355,7 @@ No</property>
           <widget class="LongoMatch.Gui.Component.PlayersTreeView" id="playerstreeview">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
+            <property name="Colors">False</property>
           </widget>
         </child>
       </widget>
@@ -5390,6 +5391,7 @@ You can add new tags using the text entry and clicking "Add Tag"</property>
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="ShowScrollbars">True</property>
+                <property name="Colors">False</property>
               </widget>
             </child>
           </widget>
@@ -5864,4 +5866,4 @@ You can continue with the current capture, cancel it or save your project.
       </widget>
     </child>
   </widget>
-</stetic-interface>
+</stetic-interface>
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]