[longomatch] Update GUI related files



commit 2cb6aca00ea68030100fc2ddd5c4727f2653df3f
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Mar 29 23:33:53 2010 +0200

    Update GUI related files

 .../LongoMatch.Gui.Dialog.NewProjectDialog.cs      |    2 +-
 ...LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs |  127 ++++++++------------
 LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs    |    5 +-
 LongoMatch/gtk-gui/gui.stetic                      |    3 +-
 4 files changed, 57 insertions(+), 80 deletions(-)
---
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs
index 0bacb0b..89d289e 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.NewProjectDialog.cs
@@ -25,7 +25,7 @@ namespace LongoMatch.Gui.Dialog {
             this.Name = "LongoMatch.Gui.Dialog.NewProjectDialog";
             this.Title = Mono.Unix.Catalog.GetString("New Project");
             this.Icon = Stetic.IconLoader.LoadIcon(this, "longomatch", Gtk.IconSize.Dialog, 48);
-            this.WindowPosition = ((Gtk.WindowPosition)(1));
+            this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.Modal = true;
             this.DestroyWithParent = true;
             this.Gravity = ((Gdk.Gravity)(5));
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs
index 1280df1..5f9965a 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs
@@ -17,20 +17,16 @@ namespace LongoMatch.Gui.Dialog {
         
         private Gtk.HBox hbox1;
         
-        private Gtk.Image image61;
-        
-        private Gtk.Label label1;
-        
         private Gtk.RadioButton fromfileradiobutton;
         
-        private Gtk.HBox hbox2;
-        
-        private Gtk.Image image62;
+        private Gtk.Image image61;
         
-        private Gtk.Label label2;
+        private Gtk.HBox hbox2;
         
         private Gtk.RadioButton fakeliveradiobutton;
         
+        private Gtk.Image image62;
+        
         private Gtk.Button buttonCancel;
         
         private Gtk.Button buttonOk;
@@ -43,6 +39,9 @@ namespace LongoMatch.Gui.Dialog {
             this.Icon = Stetic.IconLoader.LoadIcon(this, "longomatch", Gtk.IconSize.Menu, 16);
             this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.Modal = true;
+            this.Gravity = ((Gdk.Gravity)(5));
+            this.SkipPagerHint = true;
+            this.SkipTaskbarHint = true;
             this.HasSeparator = false;
             // Internal child LongoMatch.Gui.Dialog.ProjectSelectionDialog.VBox
             Gtk.VBox w1 = this.VBox;
@@ -57,24 +56,7 @@ namespace LongoMatch.Gui.Dialog {
             this.hbox1.Name = "hbox1";
             this.hbox1.Spacing = 6;
             // Container child hbox1.Gtk.Box+BoxChild
-            this.image61 = new Gtk.Image();
-            this.image61.Name = "image61";
-            this.image61.Pixbuf = Gdk.Pixbuf.LoadFromResource("video.png");
-            this.hbox1.Add(this.image61);
-            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.image61]));
-            w2.Position = 0;
-            w2.Expand = false;
-            w2.Fill = false;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.label1 = new Gtk.Label();
-            this.label1.Name = "label1";
-            this.label1.Xalign = 0F;
-            this.label1.LabelProp = Mono.Unix.Catalog.GetString("New project using a video file");
-            this.hbox1.Add(this.label1);
-            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1]));
-            w3.Position = 1;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.fromfileradiobutton = new Gtk.RadioButton("");
+            this.fromfileradiobutton = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("New project usng a video file"));
             this.fromfileradiobutton.CanFocus = true;
             this.fromfileradiobutton.Name = "fromfileradiobutton";
             this.fromfileradiobutton.Active = true;
@@ -83,64 +65,61 @@ namespace LongoMatch.Gui.Dialog {
             this.fromfileradiobutton.FocusOnClick = false;
             this.fromfileradiobutton.Group = new GLib.SList(System.IntPtr.Zero);
             this.hbox1.Add(this.fromfileradiobutton);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox1[this.fromfileradiobutton]));
-            w4.Position = 2;
+            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.fromfileradiobutton]));
+            w2.Position = 0;
+            // Container child hbox1.Gtk.Box+BoxChild
+            this.image61 = new Gtk.Image();
+            this.image61.Name = "image61";
+            this.image61.Pixbuf = Gdk.Pixbuf.LoadFromResource("video.png");
+            this.hbox1.Add(this.image61);
+            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.image61]));
+            w3.Position = 1;
+            w3.Expand = false;
+            w3.Fill = false;
+            this.vbox2.Add(this.hbox1);
+            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+            w4.Position = 0;
             w4.Expand = false;
             w4.Fill = false;
-            this.vbox2.Add(this.hbox1);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
-            w5.Position = 0;
-            w5.Expand = false;
-            w5.Fill = false;
             // Container child vbox2.Gtk.Box+BoxChild
             this.hbox2 = new Gtk.HBox();
             this.hbox2.Name = "hbox2";
             this.hbox2.Spacing = 6;
             // Container child hbox2.Gtk.Box+BoxChild
+            this.fakeliveradiobutton = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("Live project using a fake capture device"));
+            this.fakeliveradiobutton.CanFocus = true;
+            this.fakeliveradiobutton.Name = "fakeliveradiobutton";
+            this.fakeliveradiobutton.DrawIndicator = true;
+            this.fakeliveradiobutton.UseUnderline = true;
+            this.fakeliveradiobutton.Group = this.fromfileradiobutton.Group;
+            this.hbox2.Add(this.fakeliveradiobutton);
+            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.fakeliveradiobutton]));
+            w5.Position = 0;
+            // Container child hbox2.Gtk.Box+BoxChild
             this.image62 = new Gtk.Image();
             this.image62.Name = "image62";
             this.image62.Pixbuf = Gdk.Pixbuf.LoadFromResource("camera-video.png");
             this.hbox2.Add(this.image62);
             Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.image62]));
-            w6.Position = 0;
+            w6.Position = 1;
             w6.Expand = false;
             w6.Fill = false;
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.label2 = new Gtk.Label();
-            this.label2.Name = "label2";
-            this.label2.Xalign = 0F;
-            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Live project using a fake capture device");
-            this.hbox2.Add(this.label2);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox2[this.label2]));
+            this.vbox2.Add(this.hbox2);
+            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox2]));
             w7.Position = 1;
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.fakeliveradiobutton = new Gtk.RadioButton("");
-            this.fakeliveradiobutton.CanFocus = true;
-            this.fakeliveradiobutton.Name = "fakeliveradiobutton";
-            this.fakeliveradiobutton.DrawIndicator = true;
-            this.fakeliveradiobutton.UseUnderline = true;
-            this.fakeliveradiobutton.Group = this.fromfileradiobutton.Group;
-            this.hbox2.Add(this.fakeliveradiobutton);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox2[this.fakeliveradiobutton]));
-            w8.Position = 2;
+            w7.Expand = false;
+            w7.Fill = false;
+            w1.Add(this.vbox2);
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
+            w8.Position = 0;
             w8.Expand = false;
             w8.Fill = false;
-            this.vbox2.Add(this.hbox2);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox2]));
-            w9.Position = 1;
-            w9.Expand = false;
-            w9.Fill = false;
-            w1.Add(this.vbox2);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
-            w10.Position = 0;
-            w10.Expand = false;
-            w10.Fill = false;
             // Internal child LongoMatch.Gui.Dialog.ProjectSelectionDialog.ActionArea
-            Gtk.HButtonBox w11 = this.ActionArea;
-            w11.Name = "dialog1_ActionArea";
-            w11.Spacing = 6;
-            w11.BorderWidth = ((uint)(5));
-            w11.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
+            Gtk.HButtonBox w9 = this.ActionArea;
+            w9.Name = "dialog1_ActionArea";
+            w9.Spacing = 6;
+            w9.BorderWidth = ((uint)(5));
+            w9.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
             // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
             this.buttonCancel = new Gtk.Button();
             this.buttonCancel.CanDefault = true;
@@ -150,9 +129,9 @@ namespace LongoMatch.Gui.Dialog {
             this.buttonCancel.UseUnderline = true;
             this.buttonCancel.Label = "gtk-cancel";
             this.AddActionWidget(this.buttonCancel, -6);
-            Gtk.ButtonBox.ButtonBoxChild w12 = ((Gtk.ButtonBox.ButtonBoxChild)(w11[this.buttonCancel]));
-            w12.Expand = false;
-            w12.Fill = false;
+            Gtk.ButtonBox.ButtonBoxChild w10 = ((Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonCancel]));
+            w10.Expand = false;
+            w10.Fill = false;
             // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
             this.buttonOk = new Gtk.Button();
             this.buttonOk.CanDefault = true;
@@ -162,14 +141,14 @@ namespace LongoMatch.Gui.Dialog {
             this.buttonOk.UseUnderline = true;
             this.buttonOk.Label = "gtk-ok";
             this.AddActionWidget(this.buttonOk, -5);
-            Gtk.ButtonBox.ButtonBoxChild w13 = ((Gtk.ButtonBox.ButtonBoxChild)(w11[this.buttonOk]));
-            w13.Position = 1;
-            w13.Expand = false;
-            w13.Fill = false;
+            Gtk.ButtonBox.ButtonBoxChild w11 = ((Gtk.ButtonBox.ButtonBoxChild)(w9[this.buttonOk]));
+            w11.Position = 1;
+            w11.Expand = false;
+            w11.Fill = false;
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
-            this.DefaultWidth = 355;
+            this.DefaultWidth = 298;
             this.DefaultHeight = 138;
             this.Show();
         }
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
index 476f8ae..6b47e8b 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.MainWindow.cs
@@ -193,7 +193,7 @@ namespace LongoMatch.Gui {
             this.ImportProjectAction.ShortLabel = Mono.Unix.Catalog.GetString("_Import Project");
             w1.Add(this.ImportProjectAction, "<Control>i");
             this.FreeCaptureModeAction = new Gtk.RadioAction("FreeCaptureModeAction", 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 = Mono.Unix.Catalog.GetString("Free Capture Mode");
             w1.Add(this.FreeCaptureModeAction, null);
@@ -407,7 +407,7 @@ namespace LongoMatch.Gui {
                 this.Child.ShowAll();
             }
             this.DefaultWidth = 1259;
-            this.DefaultHeight = 817;
+            this.DefaultHeight = 848;
             this.leftbox.Hide();
             this.drawingtoolbox1.Hide();
             this.timelinewidget1.Hide();
@@ -417,7 +417,6 @@ namespace LongoMatch.Gui {
             this.rightvbox.Hide();
             this.videoprogressbar.Hide();
             this.Show();
-            this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
             this.NewPojectAction.Activated += new System.EventHandler(this.OnNewActivated);
             this.OpenProjectAction.Activated += new System.EventHandler(this.OnOpenActivated);
             this.QuitAction.Activated += new System.EventHandler(this.OnQuitActivated);
diff --git a/LongoMatch/gtk-gui/gui.stetic b/LongoMatch/gtk-gui/gui.stetic
index 34a7c8e..5d04f39 100644
--- a/LongoMatch/gtk-gui/gui.stetic
+++ b/LongoMatch/gtk-gui/gui.stetic
@@ -1526,7 +1526,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Window" id="LongoMatch.Gui.MainWindow" design-size="1259 817">
+  <widget class="Gtk.Window" id="LongoMatch.Gui.MainWindow" design-size="1259 848">
     <action-group name="Default">
       <action id="FileAction">
         <property name="Type">Action</property>
@@ -1706,7 +1706,6 @@
     <property name="Icon">stock:longomatch Dialog</property>
     <property name="WindowPosition">Center</property>
     <property name="Gravity">Center</property>
-    <signal name="DeleteEvent" handler="OnDeleteEvent" />
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />



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