diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj index 96b831a..cd80254 100644 --- a/DMX-2.0/DMX-2.0.csproj +++ b/DMX-2.0/DMX-2.0.csproj @@ -108,6 +108,9 @@ + + + diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index e9e59bd..0226e27 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -37,7 +37,6 @@ namespace DMX2 idCol.Title = "Num"; idCol.PackStart (idCell, true); idCol.SetCellDataFunc (idCell, new Gtk.TreeCellDataFunc (RenderMatriceNum)); - this.MatriceUI.AppendColumn (idCol); var nomCol = new Gtk.TreeViewColumn (); @@ -423,6 +422,14 @@ namespace DMX2 AddSeqUI(s); } + protected void OnSeqMacroActionActivated (object sender, EventArgs e) + { + Sequenceur s = new SequenceurMacro(); + Conduite.Courante.AjoutSequenceur(s); + AddSeqUI(s); + NextUpdateFull(); + } + #endregion #region Gestion de l'affichage @@ -561,10 +568,7 @@ namespace DMX2 Conduite.Courante.Drivers.Add( new DriverBoitierV1()); - } protected void OnSeqMacroActionActivated (object sender, EventArgs e) - { - throw new System.NotImplementedException (); - } + } diff --git a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs index cb6593c..f3ac682 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs @@ -131,7 +131,7 @@ namespace DMX2 this.seqMasterScale.Adjustment.Upper = 100; this.seqMasterScale.Adjustment.PageIncrement = 10; this.seqMasterScale.Adjustment.StepIncrement = 1; - this.seqMasterScale.Adjustment.Value = 100; + this.seqMasterScale.Adjustment.Value = 87; this.seqMasterScale.DrawValue = true; this.seqMasterScale.Digits = 0; this.seqMasterScale.ValuePos = ((global::Gtk.PositionType)(1)); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index eb9a347..d59c650 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -785,7 +785,7 @@ 100 10 1 - 100 + 87 True 0 Right @@ -1538,4 +1538,227 @@ + + + + Action + + gtk-go-forward + + + Action + + gtk-go-back + + + Action + + gtk-media-pause + + + Action + + gtk-media-next + + + Action + + _ + gtk-close + + + Action + + circuits + + + Action + + gtk-add + + + Action + + gtk-remove + + + + + + + In + + + + 0 + 0 + 12 + + + + 6 + + + + 6 + + + + 6 + + + + 6 + + + + n° 0 + + + 0 + True + False + False + + + + + + 0.00 + + + End + 1 + True + False + False + + + + + 0 + True + False + False + + + + + + True + 100 + 10 + 1 + 100 + True + 0 + Right + + + 1 + True + False + False + + + + + + + + 2 + True + False + False + + + + + + False + + + + + + + + + + + End + 3 + True + False + False + + + + + 0 + True + False + False + + + + + + Vertical + False + + + + + + + End + 1 + True + False + False + + + + + 0 + True + False + False + + + + + + True + In + + + + True + + + + + 1 + True + + + + + + + + + + Séquenceur Macro + True + + + label_item + + + + + \ No newline at end of file