diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index 7ebe1e9..9dada83 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -455,6 +455,7 @@ namespace DMX2
if(sequi != null) sequi.Update(fullUpdateFlag);
}
MajCircuits(fullUpdateFlag);
+ timeLabel.LabelProp = string.Format (@"{0:0\.0}", Conduite.Courante.SequenceurMaitre.TimeStamp.TotalMilliseconds / 100);
if(fullUpdateFlag) ConstruitMatriceSeqColumns();
if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw();
fullUpdateFlag=false;
diff --git a/DMX-2.0/SequenceurMaitre.cs b/DMX-2.0/SequenceurMaitre.cs
index 9fcb28d..0e90f59 100644
--- a/DMX-2.0/SequenceurMaitre.cs
+++ b/DMX-2.0/SequenceurMaitre.cs
@@ -85,6 +85,12 @@ namespace DMX2
bool change = false;
+ public TimeSpan TimeStamp {
+ get {
+ return timeStamp;
+ }
+ }
+
public int IndexLigneEnCours
{
get {
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index e8f07c7..28634f6 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -31,6 +31,7 @@ namespace DMX2
private global::Gtk.ToggleButton togglebutton2;
private global::Gtk.ToggleButton togglebutton1;
private global::Gtk.ToggleButton togglebutton3;
+ private global::Gtk.Label timeLabel;
private global::Gtk.VScale masterScale;
private global::Gtk.VSeparator vseparator1;
private global::Gtk.HPaned hpaned1;
@@ -287,6 +288,19 @@ namespace DMX2
w64.Expand = false;
w64.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
+ this.timeLabel = new global::Gtk.Label ();
+ this.timeLabel.Name = "timeLabel";
+ this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("0.00");
+ this.timeLabel.UseMarkup = true;
+ this.timeLabel.Justify = ((global::Gtk.Justification)(2));
+ this.timeLabel.Angle = 90;
+ this.vbox2.Add (this.timeLabel);
+ global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.timeLabel]));
+ w65.Position = 7;
+ w65.Expand = false;
+ w65.Fill = false;
+ w65.Padding = ((uint)(10));
+ // Container child vbox2.Gtk.Box+BoxChild
this.masterScale = new global::Gtk.VScale (null);
this.masterScale.HeightRequest = 150;
this.masterScale.Name = "masterScale";
@@ -299,23 +313,23 @@ namespace DMX2
this.masterScale.Digits = 0;
this.masterScale.ValuePos = ((global::Gtk.PositionType)(2));
this.vbox2.Add (this.masterScale);
- global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale]));
- w65.Position = 7;
- w65.Expand = false;
- w65.Fill = false;
- this.hbox1.Add (this.vbox2);
- global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
- w66.Position = 0;
+ global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale]));
+ w66.Position = 8;
w66.Expand = false;
w66.Fill = false;
+ this.hbox1.Add (this.vbox2);
+ global::Gtk.Box.BoxChild w67 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
+ w67.Position = 0;
+ w67.Expand = false;
+ w67.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 w67 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1]));
- w67.Position = 1;
- w67.Expand = false;
- w67.Fill = false;
+ global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1]));
+ w68.Position = 1;
+ w68.Expand = false;
+ w68.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
this.hpaned1 = new global::Gtk.HPaned ();
this.hpaned1.CanFocus = true;
@@ -336,8 +350,8 @@ namespace DMX2
this.MatriceUI.Name = "MatriceUI";
this.GtkScrolledWindow2.Add (this.MatriceUI);
this.hpaned2.Add (this.GtkScrolledWindow2);
- global::Gtk.Paned.PanedChild w69 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2]));
- w69.Resize = false;
+ global::Gtk.Paned.PanedChild w70 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2]));
+ w70.Resize = false;
// Container child hpaned2.Gtk.Paned+PanedChild
this.onglets = new global::Gtk.Notebook ();
this.onglets.CanFocus = true;
@@ -345,8 +359,8 @@ namespace DMX2
this.onglets.CurrentPage = 1;
this.hpaned2.Add (this.onglets);
this.hpaned1.Add (this.hpaned2);
- global::Gtk.Paned.PanedChild w71 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
- w71.Resize = false;
+ global::Gtk.Paned.PanedChild w72 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
+ w72.Resize = false;
// Container child hpaned1.Gtk.Paned+PanedChild
this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
this.scrolledwindow2.WidthRequest = 150;
@@ -354,32 +368,32 @@ namespace DMX2
this.scrolledwindow2.Name = "scrolledwindow2";
this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child scrolledwindow2.Gtk.Container+ContainerChild
- global::Gtk.Viewport w72 = new global::Gtk.Viewport ();
- w72.ShadowType = ((global::Gtk.ShadowType)(0));
+ global::Gtk.Viewport w73 = new global::Gtk.Viewport ();
+ w73.ShadowType = ((global::Gtk.ShadowType)(0));
// Container child GtkViewport1.Gtk.Container+ContainerChild
this.vboxCircuits = new global::Gtk.VBox ();
this.vboxCircuits.Name = "vboxCircuits";
this.vboxCircuits.Spacing = 2;
- w72.Add (this.vboxCircuits);
- this.scrolledwindow2.Add (w72);
+ w73.Add (this.vboxCircuits);
+ this.scrolledwindow2.Add (w73);
this.hpaned1.Add (this.scrolledwindow2);
- global::Gtk.Paned.PanedChild w75 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
- w75.Resize = false;
- w75.Shrink = false;
+ global::Gtk.Paned.PanedChild w76 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
+ w76.Resize = false;
+ w76.Shrink = false;
this.hbox1.Add (this.hpaned1);
- global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
- w76.Position = 2;
+ global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
+ w77.Position = 2;
this.vbox1.Add (this.hbox1);
- global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
- w77.Position = 0;
+ global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
+ w78.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 w78 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
- w78.Position = 1;
- w78.Expand = false;
- w78.Fill = false;
+ global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
+ w79.Position = 1;
+ w79.Expand = false;
+ w79.Fill = false;
// Container child vbox1.Gtk.Box+BoxChild
this.hbox4 = new global::Gtk.HBox ();
this.hbox4.Name = "hbox4";
@@ -390,17 +404,17 @@ namespace DMX2
this.toolbar7.Name = "toolbar7";
this.toolbar7.ShowArrow = false;
this.hbox4.Add (this.toolbar7);
- global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
- w79.Position = 0;
- w79.Expand = false;
- w79.Fill = false;
+ global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
+ w80.Position = 0;
+ w80.Expand = false;
+ w80.Fill = false;
// Container child hbox4.Gtk.Box+BoxChild
this.fixed5 = new global::Gtk.Fixed ();
this.fixed5.Name = "fixed5";
this.fixed5.HasWindow = false;
this.hbox4.Add (this.fixed5);
- global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5]));
- w80.Position = 1;
+ global::Gtk.Box.BoxChild w81 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5]));
+ w81.Position = 1;
// Container child hbox4.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
@@ -408,15 +422,15 @@ namespace DMX2
this.toolbar8.ShowArrow = false;
this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
this.hbox4.Add (this.toolbar8);
- global::Gtk.Box.BoxChild w81 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
- w81.Position = 2;
- w81.Expand = false;
- w81.Fill = false;
- this.vbox1.Add (this.hbox4);
- global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
+ global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
w82.Position = 2;
w82.Expand = false;
w82.Fill = false;
+ this.vbox1.Add (this.hbox4);
+ global::Gtk.Box.BoxChild w83 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
+ w83.Position = 2;
+ w83.Expand = false;
+ w83.Fill = false;
this.Add (this.vbox1);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index 77a9e1c..62d2bc2 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -304,6 +304,22 @@
False
+
+
+
+ <big>0.00</big>
+ True
+ Center
+ 90
+
+
+ 7
+ True
+ False
+ False
+ 10
+
+
@@ -319,7 +335,7 @@
- 7
+ 8
False
False
False