diff --git a/DMX-2.0.userprefs b/DMX-2.0.userprefs
index d07f687..372f237 100644
--- a/DMX-2.0.userprefs
+++ b/DMX-2.0.userprefs
@@ -2,18 +2,172 @@
-
-
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs
index 01f87cf..70bf87b 100644
--- a/DMX-2.0/Conduite.cs
+++ b/DMX-2.0/Conduite.cs
@@ -1,31 +1,52 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.Collections.ObjectModel;
namespace DMX2
{
- public class Conduite
+ public class Conduite : IComparer
{
- public static Conduite ConduiteCourante = null;
+ public static Conduite Courante = new Conduite();
public Conduite()
{
}
- Dictionary circuits = new Dictionary();
+ List circuits = new List();
- public Dictionary Circuits {
+ public ReadOnlyCollection Circuits {
get {
- return circuits;
+ return circuits.AsReadOnly();
}
}
- Dictionary sequenceurs= new Dictionary();
+ public Circuit NouveauCircuit ()
+ {
+ Circuit c = new Circuit();
+ circuits.Add (c);
+ return c;
+ }
- public Dictionary Sequenceurs {
+ public void SupprimeCircuit(Circuit c)
+ {
+ circuits.Remove(c);
+
+ }
+
+
+ int IComparer.Compare (Circuit x, Circuit y)
+ {
+ return Conduite.Courante.circuits.IndexOf(x) -
+ Conduite.Courante.circuits.IndexOf(y);
+ }
+
+ List sequenceurs= new List();
+
+ public List Sequenceurs {
get {
return sequenceurs;
}
@@ -49,6 +70,7 @@ namespace DMX2
public Circuit()
{
id=maxid++;
+ Name = "Circuit n°" + id.ToString();
}
public string Name {
diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj
index 529e71d..9ff810a 100644
--- a/DMX-2.0/DMX-2.0.csproj
+++ b/DMX-2.0/DMX-2.0.csproj
@@ -75,6 +75,8 @@
+
+
\ No newline at end of file
diff --git a/DMX-2.0/GestionCircuits.cs b/DMX-2.0/GestionCircuits.cs
new file mode 100644
index 0000000..17c5e8d
--- /dev/null
+++ b/DMX-2.0/GestionCircuits.cs
@@ -0,0 +1,78 @@
+using System;
+
+namespace DMX2
+{
+ public partial class GestionCircuits : Gtk.Dialog
+ {
+ Gtk.ListStore ls;
+ public GestionCircuits ()
+ {
+ this.Build ();
+ Gtk.TreeViewColumn nameCol = new Gtk.TreeViewColumn();
+ Gtk.CellRendererText nameCell = new Gtk.CellRendererText();
+ nameCol.Title = "Circuit";
+ nameCol.PackStart(nameCell,true);
+ nameCol.SetCellDataFunc(nameCell, new Gtk.TreeCellDataFunc(
+ new Gtk.TreeCellDataFunc(RenderCircuitName)
+ ));
+
+ nameCell.Editable =true;
+ nameCell.Edited += OnNameCellEdited;
+
+ this.listeCircuits.AppendColumn(nameCol);
+
+ ls = new Gtk.ListStore(typeof (Circuit));
+ this.listeCircuits.Model = ls;
+ UpdateListeCircuits();
+ listeCircuits.Selection.Mode = Gtk.SelectionMode.Multiple;
+ }
+
+ void OnNameCellEdited (object o, Gtk.EditedArgs args)
+ {
+ Gtk.TreeIter iter;
+ ls.GetIter (out iter, new Gtk.TreePath (args.Path));
+ Circuit c = ls.GetValue(iter,0) as Circuit;
+ c.Name = args.NewText;
+
+ }
+
+ private void RenderCircuitName(Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter) {
+ Circuit c = tree_model.GetValue (iter, 0) as Circuit;
+ (cell as Gtk.CellRendererText).Text = c.Name;
+ }
+
+ protected void UpdateListeCircuits ()
+ {
+ ls.Clear();
+ foreach(Circuit c in Conduite.Courante.Circuits)
+ ls.AppendValues(c);
+ }
+
+ protected void OnAddActionActivated (object sender, EventArgs e)
+ {
+
+ Gtk.Dialog dlg = new Gtk.Dialog("Test", this, Gtk.DialogFlags.DestroyWithParent);
+ Gtk.VBox vb = new Gtk.VBox();
+ var etry = new Gtk.Entry();
+ dlg.Add(vb);
+ vb.Add(etry);
+ vb.Add(dlg.AddButton("Close",Gtk.ResponseType.Close));
+ dlg.Run ();
+ dlg.Destroy();
+
+ Conduite.Courante.NouveauCircuit();
+ UpdateListeCircuits();
+
+ }
+ protected void OnRemoveActionActivated (object sender, EventArgs e)
+ {
+ throw new System.NotImplementedException ();
+ }
+
+ protected void OnResp (object o, Gtk.ResponseArgs args)
+ {
+ Hide ();
+ Destroy();
+ }
+ }
+}
diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index 965e556..7e8f502 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -21,6 +21,14 @@ namespace DMX2
Application.Quit ();
}
+ protected void OnCircuitsActionActivated (object sender, EventArgs e)
+ {
+ GestionCircuits gc= new GestionCircuits();
+ gc.Parent=this;
+ gc.Run();
+ }
+
+
}
}
\ No newline at end of file
diff --git a/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs b/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs
new file mode 100644
index 0000000..f19d280
--- /dev/null
+++ b/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs
@@ -0,0 +1,97 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace DMX2
+{
+ public partial class GestionCircuits
+ {
+ private global::Gtk.UIManager UIManager;
+ private global::Gtk.Action addAction;
+ private global::Gtk.Action removeAction;
+ private global::Gtk.VBox vbox2;
+ private global::Gtk.Toolbar toolbar1;
+ private global::Gtk.ScrolledWindow GtkScrolledWindow;
+ private global::Gtk.TreeView listeCircuits;
+ private global::Gtk.Button buttonOk;
+
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget DMX2.GestionCircuits
+ this.UIManager = new global::Gtk.UIManager ();
+ global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
+ this.addAction = new global::Gtk.Action ("addAction", null, null, "gtk-add");
+ w1.Add (this.addAction, null);
+ this.removeAction = new global::Gtk.Action ("removeAction", null, null, "gtk-remove");
+ w1.Add (this.removeAction, null);
+ this.UIManager.InsertActionGroup (w1, 0);
+ this.AddAccelGroup (this.UIManager.AccelGroup);
+ this.Name = "DMX2.GestionCircuits";
+ this.Title = global::Mono.Unix.Catalog.GetString ("Circuits");
+ this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
+ this.DestroyWithParent = true;
+ this.Gravity = ((global::Gdk.Gravity)(10));
+ // Internal child DMX2.GestionCircuits.VBox
+ global::Gtk.VBox w2 = this.VBox;
+ w2.Name = "dialog1_VBox";
+ w2.BorderWidth = ((uint)(2));
+ // Container child dialog1_VBox.Gtk.Box+BoxChild
+ this.vbox2 = new global::Gtk.VBox ();
+ this.vbox2.Name = "vbox2";
+ this.vbox2.Spacing = 6;
+ // Container child vbox2.Gtk.Box+BoxChild
+ this.UIManager.AddUiFromString ("");
+ this.toolbar1 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar1")));
+ this.toolbar1.Name = "toolbar1";
+ this.toolbar1.ShowArrow = false;
+ this.vbox2.Add (this.toolbar1);
+ global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.toolbar1]));
+ w3.Position = 0;
+ w3.Expand = false;
+ w3.Fill = false;
+ // Container child vbox2.Gtk.Box+BoxChild
+ this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+ this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+ this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+ // Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+ this.listeCircuits = new global::Gtk.TreeView ();
+ this.listeCircuits.CanFocus = true;
+ this.listeCircuits.Name = "listeCircuits";
+ this.listeCircuits.EnableSearch = false;
+ this.listeCircuits.Reorderable = true;
+ this.GtkScrolledWindow.Add (this.listeCircuits);
+ this.vbox2.Add (this.GtkScrolledWindow);
+ global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow]));
+ w5.Position = 1;
+ w2.Add (this.vbox2);
+ global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w2 [this.vbox2]));
+ w6.Position = 0;
+ // Internal child DMX2.GestionCircuits.ActionArea
+ global::Gtk.HButtonBox w7 = this.ActionArea;
+ w7.Name = "dialog1_ActionArea";
+ w7.Spacing = 10;
+ w7.BorderWidth = ((uint)(5));
+ w7.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+ // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+ this.buttonOk = new global::Gtk.Button ();
+ this.buttonOk.CanDefault = true;
+ this.buttonOk.CanFocus = true;
+ this.buttonOk.Name = "buttonOk";
+ this.buttonOk.UseStock = true;
+ this.buttonOk.UseUnderline = true;
+ this.buttonOk.Label = "gtk-close";
+ this.AddActionWidget (this.buttonOk, -7);
+ global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.buttonOk]));
+ w8.Expand = false;
+ w8.Fill = false;
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.DefaultWidth = 400;
+ this.DefaultHeight = 456;
+ this.Show ();
+ this.Response += new global::Gtk.ResponseHandler (this.OnResp);
+ this.addAction.Activated += new global::System.EventHandler (this.OnAddActionActivated);
+ this.removeAction.Activated += new global::System.EventHandler (this.OnRemoveActionActivated);
+ }
+ }
+}
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index b9d4e81..0dbb987 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -5,21 +5,17 @@ namespace DMX2
public partial class MainWindow
{
private global::Gtk.UIManager UIManager;
- private global::Gtk.Action newAction;
private global::Gtk.Action openAction;
private global::Gtk.Action saveAction;
private global::Gtk.Action saveAsAction;
private global::Gtk.Action quitAction;
private global::Gtk.Action closeAction;
private global::Gtk.Action TestAction;
- private global::Gtk.Action FileAction;
- private global::Gtk.Action newAction3;
private global::Gtk.Action CircuitsAction;
- private global::Gtk.Action UniversDMXAction;
+ private global::Gtk.Action propertiesAction;
private global::Gtk.Action FichierAction;
- private global::Gtk.Action newAction2;
+ private global::Gtk.Action newAction;
private global::Gtk.VBox vbox1;
- private global::Gtk.MenuBar menubar34;
private global::Gtk.HBox hbox1;
private global::Gtk.Fixed fixed2;
private global::Gtk.VSeparator vseparator1;
@@ -30,8 +26,6 @@ namespace DMX2
private global::Gtk.ScrolledWindow GtkScrolledWindow;
private global::Gtk.NodeView nodeview1;
private global::Gtk.VBox vbox2;
- private global::Gtk.Button button15;
- private global::Gtk.Image image5;
private global::Gtk.ProgressBar progressbar1;
private global::Gtk.ProgressBar progressbar2;
private global::Gtk.ProgressBar progressbar3;
@@ -47,9 +41,6 @@ namespace DMX2
// Widget DMX2.MainWindow
this.UIManager = new global::Gtk.UIManager ();
global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
- this.newAction = new global::Gtk.Action ("newAction", global::Mono.Unix.Catalog.GetString ("_Nouveau"), null, "gtk-new");
- this.newAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Nouveau");
- w1.Add (this.newAction, null);
this.openAction = new global::Gtk.Action ("openAction", global::Mono.Unix.Catalog.GetString ("_Ouvrir"), null, "gtk-open");
this.openAction.Sensitive = false;
this.openAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Ouvrir");
@@ -68,23 +59,17 @@ namespace DMX2
this.TestAction = new global::Gtk.Action ("TestAction", global::Mono.Unix.Catalog.GetString ("Test"), null, null);
this.TestAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Test");
w1.Add (this.TestAction, null);
- this.FileAction = new global::Gtk.Action ("FileAction", global::Mono.Unix.Catalog.GetString ("File"), null, null);
- this.FileAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("File");
- w1.Add (this.FileAction, null);
- this.newAction3 = new global::Gtk.Action ("newAction3", global::Mono.Unix.Catalog.GetString ("_Nouveau"), null, "gtk-new");
- this.newAction3.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Nouveau");
- w1.Add (this.newAction3, null);
this.CircuitsAction = new global::Gtk.Action ("CircuitsAction", global::Mono.Unix.Catalog.GetString ("Circuits"), null, "circuits");
this.CircuitsAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Circuits");
w1.Add (this.CircuitsAction, null);
- this.UniversDMXAction = new global::Gtk.Action ("UniversDMXAction", null, null, "UniversDMX");
- w1.Add (this.UniversDMXAction, null);
- this.FichierAction = new global::Gtk.Action ("FichierAction", global::Mono.Unix.Catalog.GetString ("Fichier"), null, null);
- this.FichierAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Fichier");
+ this.propertiesAction = new global::Gtk.Action ("propertiesAction", global::Mono.Unix.Catalog.GetString ("Circuits"), null, "gtk-properties");
+ this.propertiesAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Circuits");
+ w1.Add (this.propertiesAction, null);
+ this.FichierAction = new global::Gtk.Action ("FichierAction", global::Mono.Unix.Catalog.GetString ("_Fichier"), null, null);
+ this.FichierAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Fichier");
w1.Add (this.FichierAction, null);
- this.newAction2 = new global::Gtk.Action ("newAction2", global::Mono.Unix.Catalog.GetString ("_Nouveau"), null, "gtk-new");
- this.newAction2.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Nouveau");
- w1.Add (this.newAction2, null);
+ this.newAction = new global::Gtk.Action ("newAction", null, null, "gtk-new");
+ w1.Add (this.newAction, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
this.Name = "DMX2.MainWindow";
@@ -95,15 +80,6 @@ namespace DMX2
this.vbox1.Name = "vbox1";
this.vbox1.Spacing = 6;
// Container child vbox1.Gtk.Box+BoxChild
- this.UIManager.AddUiFromString ("");
- this.menubar34 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/menubar34")));
- this.menubar34.Name = "menubar34";
- this.vbox1.Add (this.menubar34);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.menubar34]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- // Container child vbox1.Gtk.Box+BoxChild
this.hbox1 = new global::Gtk.HBox ();
this.hbox1.Name = "hbox1";
this.hbox1.Spacing = 6;
@@ -113,18 +89,18 @@ namespace DMX2
this.fixed2.Name = "fixed2";
this.fixed2.HasWindow = false;
this.hbox1.Add (this.fixed2);
- global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.fixed2]));
- w3.Position = 0;
- w3.Expand = false;
- w3.Fill = false;
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.fixed2]));
+ w2.Position = 0;
+ w2.Expand = false;
+ w2.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
this.vseparator1 = new global::Gtk.VSeparator ();
this.vseparator1.Name = "vseparator1";
this.hbox1.Add (this.vseparator1);
- global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1]));
- w4.Position = 1;
- w4.Expand = false;
- w4.Fill = false;
+ global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1]));
+ w3.Position = 1;
+ w3.Expand = false;
+ w3.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
this.hpaned1 = new global::Gtk.HPaned ();
this.hpaned1.CanFocus = true;
@@ -141,17 +117,17 @@ namespace DMX2
this.scrolledwindow1.Name = "scrolledwindow1";
this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child scrolledwindow1.Gtk.Container+ContainerChild
- global::Gtk.Viewport w5 = new global::Gtk.Viewport ();
- w5.ShadowType = ((global::Gtk.ShadowType)(0));
+ global::Gtk.Viewport w4 = new global::Gtk.Viewport ();
+ w4.ShadowType = ((global::Gtk.ShadowType)(0));
// Container child GtkViewport.Gtk.Container+ContainerChild
this.vbox3 = new global::Gtk.VBox ();
this.vbox3.Name = "vbox3";
this.vbox3.Spacing = 6;
- w5.Add (this.vbox3);
- this.scrolledwindow1.Add (w5);
+ w4.Add (this.vbox3);
+ this.scrolledwindow1.Add (w4);
this.hpaned2.Add (this.scrolledwindow1);
- global::Gtk.Paned.PanedChild w8 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.scrolledwindow1]));
- w8.Resize = false;
+ global::Gtk.Paned.PanedChild w7 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.scrolledwindow1]));
+ w7.Resize = false;
// Container child hpaned2.Gtk.Paned+PanedChild
this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
this.GtkScrolledWindow.Name = "GtkScrolledWindow";
@@ -163,86 +139,71 @@ namespace DMX2
this.GtkScrolledWindow.Add (this.nodeview1);
this.hpaned2.Add (this.GtkScrolledWindow);
this.hpaned1.Add (this.hpaned2);
- global::Gtk.Paned.PanedChild w11 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
- w11.Resize = false;
+ global::Gtk.Paned.PanedChild w10 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
+ w10.Resize = false;
// Container child hpaned1.Gtk.Paned+PanedChild
this.vbox2 = new global::Gtk.VBox ();
this.vbox2.WidthRequest = 150;
this.vbox2.Name = "vbox2";
this.vbox2.Spacing = 2;
// Container child vbox2.Gtk.Box+BoxChild
- this.button15 = new global::Gtk.Button ();
- this.button15.CanFocus = true;
- this.button15.Name = "button15";
- // Container child button15.Gtk.Container+ContainerChild
- this.image5 = new global::Gtk.Image ();
- this.image5.Name = "image5";
- this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-properties", global::Gtk.IconSize.Button);
- this.button15.Add (this.image5);
- this.button15.Label = null;
- this.vbox2.Add (this.button15);
- global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.button15]));
- w13.Position = 0;
- w13.Expand = false;
- w13.Fill = false;
- // Container child vbox2.Gtk.Box+BoxChild
this.progressbar1 = new global::Gtk.ProgressBar ();
this.progressbar1.Name = "progressbar1";
this.vbox2.Add (this.progressbar1);
- global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.progressbar1]));
- w14.Position = 1;
- w14.Expand = false;
- w14.Fill = false;
+ global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.progressbar1]));
+ w11.Position = 0;
+ w11.Expand = false;
+ w11.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.progressbar2 = new global::Gtk.ProgressBar ();
this.progressbar2.Name = "progressbar2";
this.vbox2.Add (this.progressbar2);
- global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.progressbar2]));
- w15.Position = 2;
- w15.Expand = false;
- w15.Fill = false;
+ global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.progressbar2]));
+ w12.Position = 1;
+ w12.Expand = false;
+ w12.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.progressbar3 = new global::Gtk.ProgressBar ();
this.progressbar3.Name = "progressbar3";
this.vbox2.Add (this.progressbar3);
- global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.progressbar3]));
- w16.Position = 3;
- w16.Expand = false;
- w16.Fill = false;
+ global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.progressbar3]));
+ w13.Position = 2;
+ w13.Expand = false;
+ w13.Fill = false;
this.hpaned1.Add (this.vbox2);
this.hbox1.Add (this.hpaned1);
- global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
- w18.Position = 2;
+ global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
+ w15.Position = 2;
this.vbox1.Add (this.hbox1);
- global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
- w19.Position = 1;
+ global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
+ w16.Position = 0;
// Container child vbox1.Gtk.Box+BoxChild
this.hseparator1 = new global::Gtk.HSeparator ();
this.hseparator1.Name = "hseparator1";
this.vbox1.Add (this.hseparator1);
- global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
- w20.Position = 2;
- w20.Expand = false;
- w20.Fill = false;
+ global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
+ w17.Position = 1;
+ w17.Expand = false;
+ w17.Fill = false;
// Container child vbox1.Gtk.Box+BoxChild
this.hbox2 = new global::Gtk.HBox ();
this.hbox2.Name = "hbox2";
this.hbox2.Spacing = 6;
// Container child hbox2.Gtk.Box+BoxChild
- this.UIManager.AddUiFromString ("");
+ this.UIManager.AddUiFromString ("");
this.toolbar3 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar3")));
this.toolbar3.Name = "toolbar3";
this.toolbar3.ShowArrow = false;
this.hbox2.Add (this.toolbar3);
- global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar3]));
- w21.Position = 0;
+ global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar3]));
+ w18.Position = 0;
// Container child hbox2.Gtk.Box+BoxChild
this.fixed3 = new global::Gtk.Fixed ();
this.fixed3.Name = "fixed3";
this.fixed3.HasWindow = false;
this.hbox2.Add (this.fixed3);
- global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed3]));
- w22.Position = 1;
+ global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed3]));
+ w19.Position = 1;
// Container child hbox2.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("");
this.toolbar2 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar2")));
@@ -250,25 +211,25 @@ namespace DMX2
this.toolbar2.ShowArrow = false;
this.toolbar2.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
this.hbox2.Add (this.toolbar2);
- global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar2]));
- w23.Position = 2;
- w23.Expand = false;
- w23.Fill = false;
+ global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar2]));
+ w20.Position = 2;
+ w20.Expand = false;
+ w20.Fill = false;
this.vbox1.Add (this.hbox2);
- global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
- w24.Position = 3;
- w24.Expand = false;
- w24.Fill = false;
+ global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
+ w21.Position = 2;
+ w21.Expand = false;
+ w21.Fill = false;
this.Add (this.vbox1);
if ((this.Child != null)) {
this.Child.ShowAll ();
}
this.DefaultWidth = 1027;
this.DefaultHeight = 709;
- this.menubar34.Hide ();
this.Show ();
this.DeleteEvent += new global::Gtk.DeleteEventHandler (this.OnDeleteEvent);
this.quitAction.Activated += new global::System.EventHandler (this.OnQuitActionActivated);
+ this.CircuitsAction.Activated += new global::System.EventHandler (this.OnCircuitsActionActivated);
}
}
}
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index d0f23fc..e07352e 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -34,12 +34,6 @@
-
- Action
- _Nouveau
- _Nouveau
- gtk-new
-
Action
_Ouvrir
@@ -76,37 +70,27 @@
Test
Test
-
- Action
- File
- File
-
-
- Action
- _Nouveau
- _Nouveau
- gtk-new
-
Action
Circuits
Circuits
circuits
+
-
+
Action
-
- UniversDMX
+ Circuits
+ Circuits
+ gtk-properties
Action
- Fichier
- Fichier
+ _Fichier
+ _Fichier
-
+
Action
- _Nouveau
- _Nouveau
+
gtk-new
@@ -118,19 +102,6 @@
6
-
-
-
- 0
- True
- False
- False
-
-
@@ -223,31 +194,12 @@
150
2
-
-
-
- True
- Custom
-
-
-
- stock:gtk-properties Button
-
-
-
-
- 0
- True
- False
- False
-
-
- 1
+ 0
True
False
False
@@ -258,7 +210,7 @@
- 2
+ 1
True
False
False
@@ -269,7 +221,7 @@
- 3
+ 2
True
False
False
@@ -285,7 +237,7 @@
- 1
+ 0
False
@@ -294,7 +246,7 @@
- 2
+ 1
True
False
False
@@ -308,9 +260,8 @@
False
-
+
-
@@ -333,7 +284,7 @@
False
Icons
-
+
@@ -351,7 +302,7 @@
- 3
+ 2
True
False
False
@@ -360,4 +311,104 @@
+
+
+
+ Action
+
+ gtk-add
+
+
+
+ Action
+
+ gtk-remove
+
+
+
+
+ Circuits
+ Dialog
+ True
+ Static
+ 1
+ False
+
+
+
+
+ 2
+
+
+
+ 6
+
+
+
+ False
+
+
+
+
+
+
+ 0
+ True
+ False
+ False
+
+
+
+
+
+ In
+
+
+
+ True
+ True
+ False
+ True
+
+
+
+
+ 1
+ True
+
+
+
+
+ 0
+ True
+
+
+
+
+
+
+
+ 10
+ 5
+ 1
+ End
+
+
+
+ True
+ True
+ True
+ StockItem
+ gtk-close
+ -7
+ gtk-close
+
+
+ False
+ False
+
+
+
+
+
\ No newline at end of file