diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index 5e562b6..3abca64 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -598,7 +598,15 @@ namespace DMX2
lblPage.LabelProp = Conduite.Courante.Midi.CurrentPage.ToString();
if(fullUpdateFlag) ConstruitMatriceSeqColumns();
- if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw();
+ if (Conduite.Courante.SequenceurMaitre.EffetChange ()) {
+ MatriceUI.QueueDraw ();
+ int l = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours;
+ if (l < Conduite.Courante.SequenceurMaitre.Lignes.Count && l >= 0) {
+ labelMasterPos.LabelProp =
+ (l + 1).ToString () + " - " +
+ Conduite.Courante.SequenceurMaitre.Lignes[l].Nom;
+ }
+ }
fullUpdateFlag=false;
masterScale.Value = Conduite.Courante.Master;
updScheduled=false;
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index db80daf..4a1d428 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -48,6 +48,9 @@ namespace DMX2
private global::Gtk.VSeparator vseparator1;
private global::Gtk.HPaned hpaned1;
private global::Gtk.HPaned hpaned2;
+ private global::Gtk.VBox vbox4;
+ private global::Gtk.EventBox evBBox2;
+ private global::Gtk.Label labelMasterPos;
private global::Gtk.ScrolledWindow GtkScrolledWindow2;
private global::Gtk.NodeView MatriceUI;
private global::Gtk.ScrolledWindow scrolledwindow2;
@@ -392,6 +395,25 @@ namespace DMX2
this.hpaned2.Name = "hpaned2";
this.hpaned2.Position = 177;
// Container child hpaned2.Gtk.Paned+PanedChild
+ this.vbox4 = new global::Gtk.VBox ();
+ this.vbox4.Name = "vbox4";
+ this.vbox4.Spacing = 6;
+ // Container child vbox4.Gtk.Box+BoxChild
+ this.evBBox2 = new global::Gtk.EventBox ();
+ this.evBBox2.Name = "evBBox2";
+ // Container child evBBox2.Gtk.Container+ContainerChild
+ this.labelMasterPos = new global::Gtk.Label ();
+ this.labelMasterPos.Name = "labelMasterPos";
+ this.labelMasterPos.Xpad = 4;
+ this.labelMasterPos.Ypad = 4;
+ this.labelMasterPos.Xalign = 0F;
+ this.evBBox2.Add (this.labelMasterPos);
+ this.vbox4.Add (this.evBBox2);
+ global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.evBBox2]));
+ w66.Position = 0;
+ w66.Expand = false;
+ w66.Fill = false;
+ // Container child vbox4.Gtk.Box+BoxChild
this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow ();
this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
@@ -401,12 +423,15 @@ namespace DMX2
this.MatriceUI.Name = "MatriceUI";
this.MatriceUI.RulesHint = true;
this.GtkScrolledWindow2.Add (this.MatriceUI);
- this.hpaned2.Add (this.GtkScrolledWindow2);
- global::Gtk.Paned.PanedChild w66 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2]));
- w66.Resize = false;
+ this.vbox4.Add (this.GtkScrolledWindow2);
+ global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkScrolledWindow2]));
+ w68.Position = 1;
+ this.hpaned2.Add (this.vbox4);
+ global::Gtk.Paned.PanedChild w69 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.vbox4]));
+ w69.Resize = false;
this.hpaned1.Add (this.hpaned2);
- global::Gtk.Paned.PanedChild w67 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
- w67.Resize = false;
+ global::Gtk.Paned.PanedChild w70 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
+ w70.Resize = false;
// Container child hpaned1.Gtk.Paned+PanedChild
this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
this.scrolledwindow2.WidthRequest = 150;
@@ -414,32 +439,32 @@ namespace DMX2
this.scrolledwindow2.Name = "scrolledwindow2";
this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child scrolledwindow2.Gtk.Container+ContainerChild
- global::Gtk.Viewport w68 = new global::Gtk.Viewport ();
- w68.ShadowType = ((global::Gtk.ShadowType)(0));
+ global::Gtk.Viewport w71 = new global::Gtk.Viewport ();
+ w71.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;
- w68.Add (this.vboxCircuits);
- this.scrolledwindow2.Add (w68);
+ w71.Add (this.vboxCircuits);
+ this.scrolledwindow2.Add (w71);
this.hpaned1.Add (this.scrolledwindow2);
- global::Gtk.Paned.PanedChild w71 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
- w71.Resize = false;
- w71.Shrink = false;
+ global::Gtk.Paned.PanedChild w74 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
+ w74.Resize = false;
+ w74.Shrink = false;
this.hbox1.Add (this.hpaned1);
- global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
- w72.Position = 2;
+ global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
+ w75.Position = 2;
this.vbox1.Add (this.hbox1);
- global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
- w73.Position = 0;
+ global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
+ w76.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 w74 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
- w74.Position = 1;
- w74.Expand = false;
- w74.Fill = false;
+ global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
+ w77.Position = 1;
+ w77.Expand = false;
+ w77.Fill = false;
// Container child vbox1.Gtk.Box+BoxChild
this.hbox4 = new global::Gtk.HBox ();
this.hbox4.Name = "hbox4";
@@ -450,10 +475,10 @@ namespace DMX2
this.toolbar7.Name = "toolbar7";
this.toolbar7.ShowArrow = false;
this.hbox4.Add (this.toolbar7);
- global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
- w75.Position = 0;
- w75.Expand = false;
- w75.Fill = false;
+ global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
+ w78.Position = 0;
+ w78.Expand = false;
+ w78.Fill = false;
// Container child hbox4.Gtk.Box+BoxChild
this.evInfo = new global::Gtk.EventBox ();
this.evInfo.Name = "evInfo";
@@ -463,8 +488,8 @@ namespace DMX2
this.lblInfo.LabelProp = "info";
this.evInfo.Add (this.lblInfo);
this.hbox4.Add (this.evInfo);
- global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
- w77.Position = 1;
+ global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
+ w80.Position = 1;
// Container child hbox4.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
@@ -472,15 +497,15 @@ namespace DMX2
this.toolbar8.ShowArrow = false;
this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
this.hbox4.Add (this.toolbar8);
- global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
- w78.Position = 2;
- w78.Expand = false;
- w78.Fill = false;
+ 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 w79 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
- w79.Position = 2;
- w79.Expand = false;
- w79.Fill = false;
+ global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
+ w82.Position = 2;
+ w82.Expand = false;
+ w82.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 7909eeb..2c80ee1 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -478,17 +478,46 @@ page
True
177
-
+
- In
+ 6
-
+
- True
- True
- True
-
+
+
+
+ 4
+ 4
+ 0
+
+
+
+ 0
+ True
+ False
+ False
+
+
+
+
+
+ In
+
+
+
+ True
+ True
+ True
+
+
+
+
+
+ 1
+ True
+
diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc
index bc5770a..380110b 100644
--- a/DMX-2.0/style.gtkrc
+++ b/DMX-2.0/style.gtkrc
@@ -123,6 +123,11 @@ style "soundtimelabel" = "counter"
font_name = "DejaVu Sans Mono Bold 9"
}
+style "masterpos" = "counter"
+{
+ font_name = "DejaVu Sans Mono Bold 10"
+}
+
style "page" = "sombre"
{
fg[NORMAL] = "#FFFF00"
@@ -228,13 +233,14 @@ widget_class "*.." style "treeview_header-s"
widget "gtk-tooltip*" style "tooltips-s"
+widget "*.evBBox" style "counter"
+widget "*.evBBox*" style "counter"
+widget "*.labelMasterPos" style "masterpos"
widget "*.pb" style "circuitspb"
widget "*.posLabel" style "counter"
widget "*.timeLabel" style "counter"
widget "*.actLabel" style "actmacro"
-widget "*.evBBox" style "counter"
-widget "*.evBBox1" style "counter"
widget "*.soundTimeLabel" style "soundtimelabel"