diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index 9afda49..378da83 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -200,6 +200,7 @@ namespace DMX2
protected void OnBtnRetireLigneClicked (object sender, EventArgs e)
{
+ if(IndexEffetSelectionne()==-1) return;
Conduite.Courante.SequenceurMaitre.RetireLigne(IndexEffetSelectionne());
FillMatrice();
}
@@ -597,21 +598,21 @@ namespace DMX2
if (Conduite.Courante.BlackOut) {
- ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 100, 100));
+ evInfo.ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 100, 100));
return;
}
if (Conduite.Courante.Pause) {
- ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 255, 100));
+ evInfo.ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 255, 100));
return;
}
if (Conduite.Courante.Master != 100) {
- ModifyBg (Gtk.StateType.Normal,new Gdk.Color (205, 205, 255));
+ evInfo.ModifyBg (Gtk.StateType.Normal,new Gdk.Color (205, 205, 255));
return;
}
- ModifyBg (Gtk.StateType.Normal, defStyle.Background(StateType.Normal) );
+ evInfo.ModifyBg (Gtk.StateType.Normal, defStyle.Background(StateType.Normal) );
}
diff --git a/DMX-2.0/SequenceurMaitre.cs b/DMX-2.0/SequenceurMaitre.cs
index 66ff5a3..5afd7e1 100644
--- a/DMX-2.0/SequenceurMaitre.cs
+++ b/DMX-2.0/SequenceurMaitre.cs
@@ -198,6 +198,7 @@ namespace DMX2
public void RetireLigne (int pos)
{
lock (this) {
+ if(pos<0 || pos >= lignes.Count) return;
if(lignes[pos]== enCours)
{
enCours=null;
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index 316bf0a..47f962f 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -44,7 +44,8 @@ namespace DMX2
private global::Gtk.HSeparator hseparator1;
private global::Gtk.HBox hbox4;
private global::Gtk.Toolbar toolbar7;
- private global::Gtk.Fixed fixed5;
+ private global::Gtk.EventBox evInfo;
+ private global::Gtk.Label label2;
private global::Gtk.Toolbar toolbar8;
protected virtual void Build ()
@@ -387,12 +388,16 @@ namespace DMX2
w71.Expand = false;
w71.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 w72 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5]));
- w72.Position = 1;
+ this.evInfo = new global::Gtk.EventBox ();
+ this.evInfo.Name = "evInfo";
+ // Container child evInfo.Gtk.Container+ContainerChild
+ this.label2 = new global::Gtk.Label ();
+ this.label2.Name = "label2";
+ this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("info");
+ this.evInfo.Add (this.label2);
+ this.hbox4.Add (this.evInfo);
+ global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
+ w73.Position = 1;
// Container child hbox4.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
@@ -400,15 +405,15 @@ namespace DMX2
this.toolbar8.ShowArrow = false;
this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
this.hbox4.Add (this.toolbar8);
- global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
- w73.Position = 2;
- w73.Expand = false;
- w73.Fill = false;
- this.vbox1.Add (this.hbox4);
- global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
+ global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
w74.Position = 2;
w74.Expand = false;
w74.Fill = false;
+ this.vbox1.Add (this.hbox4);
+ global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
+ w75.Position = 2;
+ w75.Expand = false;
+ w75.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 df95162..0fc3a8c 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -474,9 +474,14 @@
-
+
- False
+
+
+
+ info
+
+
1