diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index 9dada83..e9e59bd 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -468,7 +468,7 @@ namespace DMX2 //Activation / Désactivation des boutons en fonction de l'état de la counduite courante btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive = showAllAction.Sensitive = universAction.Sensitive = masterScale.Sensitive = - seqLinAction.Sensitive = circAction.Sensitive = saveAction.Sensitive = + seqLinAction.Sensitive = seqMacroAction.Sensitive = circAction.Sensitive = saveAction.Sensitive = saveAsAction.Sensitive = closeAction.Sensitive = true; openAction.Sensitive = newAction.Sensitive = false; this.Title = "DMX 2.0 - " + Conduite.Courante.Name; @@ -476,7 +476,7 @@ namespace DMX2 } else { btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive = showAllAction.Sensitive = universAction.Sensitive = masterScale.Sensitive = - seqLinAction.Sensitive = circAction.Sensitive = saveAction.Sensitive = + seqLinAction.Sensitive = seqMacroAction.Sensitive = circAction.Sensitive = saveAction.Sensitive = saveAsAction.Sensitive = closeAction.Sensitive = false; openAction.Sensitive = newAction.Sensitive = true; this.Title = "DMX 2.0"; @@ -561,7 +561,11 @@ 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.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index 28634f6..b63001d 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -21,6 +21,7 @@ namespace DMX2 private global::Gtk.Action showAllAction; private global::Gtk.Action universAction; private global::Gtk.Action connectAction; + private global::Gtk.Action seqMacroAction; private global::Gtk.VBox vbox1; private global::Gtk.HBox hbox1; private global::Gtk.VBox vbox2; @@ -101,6 +102,9 @@ namespace DMX2 w1.Add (this.universAction, null); this.connectAction = new global::Gtk.Action ("connectAction", null, null, "gtk-connect"); w1.Add (this.connectAction, null); + this.seqMacroAction = new global::Gtk.Action ("seqMacroAction", null, null, "gtk-index"); + this.seqMacroAction.Sensitive = false; + w1.Add (this.seqMacroAction, null); this.UIManager.InsertActionGroup (w1, 0); this.AddAccelGroup (this.UIManager.AccelGroup); this.Name = "DMX2.MainWindow"; @@ -399,7 +403,7 @@ namespace DMX2 this.hbox4.Name = "hbox4"; this.hbox4.Spacing = 6; // Container child hbox4.Gtk.Box+BoxChild - this.UIManager.AddUiFromString (""); + this.UIManager.AddUiFromString (""); this.toolbar7 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar7"))); this.toolbar7.Name = "toolbar7"; this.toolbar7.ShowArrow = false; @@ -451,6 +455,7 @@ namespace DMX2 this.showAllAction.Activated += new global::System.EventHandler (this.OnShowAllActionActivated); this.universAction.Activated += new global::System.EventHandler (this.OnUniversActionActivated); this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated); + this.seqMacroAction.Activated += new global::System.EventHandler (this.OnSeqMacroActionActivated); this.btnGo.Clicked += new global::System.EventHandler (this.OnBtnGoClicked); this.btnGoBack.Clicked += new global::System.EventHandler (this.OnBtnGoBackClicked); this.btnAjoutLigne.Clicked += new global::System.EventHandler (this.OnBtnAjoutLigneClicked); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 62d2bc2..eb9a347 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -170,6 +170,13 @@ gtk-connect + + Action + + False + gtk-index + + MainWindow @@ -466,6 +473,7 @@ +