diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs index 8127d66..ddc9a95 100644 --- a/DMX-2.0/Conduite.cs +++ b/DMX-2.0/Conduite.cs @@ -149,6 +149,9 @@ namespace DMX2 dernierTick = tickTime; lock (this) { + + seqmaitre.Tick(deltaT); + // 'Actionne' les sequenceurs foreach (var seq in sequenceurs) { seq.Tick (deltaT); diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index a9ca4de..1b3ca14 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -70,6 +70,7 @@ 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 (); @@ -126,8 +127,14 @@ namespace DMX2 void RenderMatriceNum (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) { + + string num=string.Empty; SequenceurMaitre.Ligne l = tree_model.GetValue (iter, 0) as SequenceurMaitre.Ligne; - (cell as Gtk.CellRendererText).Text = (Conduite.Courante.SequenceurMaitre.Lignes.IndexOf(l)+1).ToString(); + if( Conduite.Courante.SequenceurMaitre.IndexLigneEnCours == Conduite.Courante.SequenceurMaitre.Lignes.IndexOf(l) ) + num+= "->"; + if( Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre == Conduite.Courante.SequenceurMaitre.Lignes.IndexOf(l) ) + num+= "* "; + (cell as Gtk.CellRendererText).Text = num + (Conduite.Courante.SequenceurMaitre.Lignes.IndexOf(l)+1).ToString(); } void RenderMatriceNom (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) @@ -280,6 +287,7 @@ namespace DMX2 MajCircuits(fullUpdateFlag); fullUpdateFlag=false; updScheduled=false; + if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw(); } protected void OnMasterScaleValueChanged (object sender, EventArgs e) @@ -457,8 +465,72 @@ namespace DMX2 } MajWidgets(); NextUpdateFull(); + } + + int IndexEffetSelectionne() + { + var sel = MatriceUI.Selection.GetSelectedRows(); + if(sel.Length ==0) return -1; + return MatriceUI.Selection.GetSelectedRows()[0].Indices[0]; } + void SelectionneEffet (int index) + { + if(index <0 ) return; + MatriceUI.SetCursor( new TreePath( new int[1] {index }) ,null,false); + } + + protected void OnBtnAjoutLigneClicked (object sender, EventArgs e) + { + int pos=IndexEffetSelectionne() + 1; + Conduite.Courante.SequenceurMaitre.AjoutLigne(pos); + FillMatrice(); + SelectionneEffet(pos); + } + void OnMatriceNumColClicked (object sender, EventArgs e) + { + throw new NotImplementedException (); + } + + + + protected void OnBtnRetireLigneClicked (object sender, EventArgs e) + { + throw new System.NotImplementedException (); + } + + protected void OnBtnGoBackClicked (object sender, EventArgs e) + { + Conduite.Courante.SequenceurMaitre.EffetPrecedent(); + //FillMatrice(); + } + + protected void OnBtnGoClicked (object sender, EventArgs e) + { + Conduite.Courante.SequenceurMaitre.EffetSuivant(); + //FillMatrice(); + } + + protected void OnMatriceUICursorChanged (object sender, EventArgs e) + { + TreeViewColumn col; + TreePath path; + MatriceUI.GetCursor (out path, out col); + + if (MatriceUI.Columns [0] == col) { + Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre = IndexEffetSelectionne(); + } + + } + + + + + + + + + } } \ No newline at end of file diff --git a/DMX-2.0/SequenceurMaitre.cs b/DMX-2.0/SequenceurMaitre.cs index 551c5ff..31df68a 100644 --- a/DMX-2.0/SequenceurMaitre.cs +++ b/DMX-2.0/SequenceurMaitre.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Xml; +using System.Collections.ObjectModel; namespace DMX2 { @@ -80,19 +81,94 @@ namespace DMX2 List lignes = new List(); + Ligne enCours = null; + TimeSpan timeStamp = TimeSpan.Zero; - public List Lignes { + bool change = false; + + public int IndexLigneEnCours + { get { - return lignes; + if (enCours == null) return -1; + return lignes.IndexOf(enCours); + } + } + + Ligne aSuivre = null; + + public int IndexLigneaSuivre + { + get { + if (aSuivre == null) + return -1; + return lignes.IndexOf (aSuivre); + } + set { + aSuivre = lignes[value]; + } + } + + public void EffetSuivant () + { + if (aSuivre == null) { + if (IndexLigneEnCours+1 < lignes.Count) + enCours = lignes [IndexLigneEnCours + 1]; + else + enCours = lignes [0]; + } else { + enCours = aSuivre; + } + aSuivre=null; + timeStamp = TimeSpan.Zero; + change = true; + } + + public void EffetPrecedent () + { + if (IndexLigneEnCours > 0) + enCours = lignes [IndexLigneEnCours - 1]; + else + enCours = lignes [0]; + aSuivre=null; + timeStamp = TimeSpan.Zero; + change = true; + } + + public ReadOnlyCollection Lignes { + get { + return lignes.AsReadOnly(); } } public SequenceurMaitre () { - lignes.Add(new Ligne()); + //lignes.Add(new Ligne()); } + public int AjoutLigne (int pos) + { + lignes.Insert(pos,new Ligne()); + return pos; + } + + public void Tick (TimeSpan deltaT) + { + timeStamp += deltaT; + if(enCours != null) + if (enCours.Duree != TimeSpan.Zero && enCours.Duree <= timeStamp ) { + EffetSuivant(); + } + } + + public bool EffetChange () + { + if (change) { + change = false; + return true; + } + return false; + } public void Save (XmlElement parent) { XmlElement el = parent.OwnerDocument.CreateElement("SequenceurMaitre"); @@ -109,7 +185,7 @@ namespace DMX2 SequenceurMaitre seq = new SequenceurMaitre (); foreach (var xl in el.GetElementsByTagName("Ligne")) { - seq.Lignes.Add(Ligne.Load(c,xl as XmlElement)); + seq.lignes.Add(Ligne.Load(c,xl as XmlElement)); } return seq; diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index ca97e7b..e3c237b 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -24,8 +24,10 @@ namespace DMX2 private global::Gtk.VBox vbox1; private global::Gtk.HBox hbox1; private global::Gtk.VBox vbox2; - private global::Gtk.Button button172; - private global::Gtk.Button button186; + private global::Gtk.Button btnGo; + private global::Gtk.Button btnGoBack; + private global::Gtk.Button btnAjoutLigne; + private global::Gtk.Button btnRetireLigne; private global::Gtk.ToggleButton togglebutton2; private global::Gtk.ToggleButton togglebutton1; private global::Gtk.ToggleButton togglebutton3; @@ -117,11 +119,11 @@ namespace DMX2 this.vbox2.Name = "vbox2"; this.vbox2.Spacing = 6; // Container child vbox2.Gtk.Box+BoxChild - this.button172 = new global::Gtk.Button (); - this.button172.CanFocus = true; - this.button172.Name = "button172"; - this.button172.UseUnderline = true; - // Container child button172.Gtk.Container+ContainerChild + this.btnGo = new global::Gtk.Button (); + this.btnGo.CanFocus = true; + this.btnGo.Name = "btnGo"; + this.btnGo.UseUnderline = true; + // Container child btnGo.Gtk.Container+ContainerChild global::Gtk.Alignment w2 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild global::Gtk.HBox w3 = new global::Gtk.HBox (); @@ -134,18 +136,18 @@ namespace DMX2 global::Gtk.Label w6 = new global::Gtk.Label (); w3.Add (w6); w2.Add (w3); - this.button172.Add (w2); - this.vbox2.Add (this.button172); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.button172])); + this.btnGo.Add (w2); + this.vbox2.Add (this.btnGo); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.btnGo])); w10.Position = 0; w10.Expand = false; w10.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.button186 = new global::Gtk.Button (); - this.button186.CanFocus = true; - this.button186.Name = "button186"; - this.button186.UseUnderline = true; - // Container child button186.Gtk.Container+ContainerChild + this.btnGoBack = new global::Gtk.Button (); + this.btnGoBack.CanFocus = true; + this.btnGoBack.Name = "btnGoBack"; + this.btnGoBack.UseUnderline = true; + // Container child btnGoBack.Gtk.Container+ContainerChild global::Gtk.Alignment w11 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild global::Gtk.HBox w12 = new global::Gtk.HBox (); @@ -158,85 +160,133 @@ namespace DMX2 global::Gtk.Label w15 = new global::Gtk.Label (); w12.Add (w15); w11.Add (w12); - this.button186.Add (w11); - this.vbox2.Add (this.button186); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.button186])); + this.btnGoBack.Add (w11); + this.vbox2.Add (this.btnGoBack); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.btnGoBack])); w19.Position = 1; w19.Expand = false; w19.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.togglebutton2 = new global::Gtk.ToggleButton (); - this.togglebutton2.CanFocus = true; - this.togglebutton2.Name = "togglebutton2"; - this.togglebutton2.UseUnderline = true; - // Container child togglebutton2.Gtk.Container+ContainerChild + this.btnAjoutLigne = new global::Gtk.Button (); + this.btnAjoutLigne.CanFocus = true; + this.btnAjoutLigne.Name = "btnAjoutLigne"; + this.btnAjoutLigne.UseUnderline = true; + // Container child btnAjoutLigne.Gtk.Container+ContainerChild global::Gtk.Alignment w20 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild global::Gtk.HBox w21 = new global::Gtk.HBox (); w21.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Image w22 = new global::Gtk.Image (); - w22.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-no", global::Gtk.IconSize.Dnd); + w22.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Dnd); w21.Add (w22); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w24 = new global::Gtk.Label (); w21.Add (w24); w20.Add (w21); - this.togglebutton2.Add (w20); - this.vbox2.Add (this.togglebutton2); - global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.togglebutton2])); + this.btnAjoutLigne.Add (w20); + this.vbox2.Add (this.btnAjoutLigne); + global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.btnAjoutLigne])); w28.Position = 2; w28.Expand = false; w28.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.togglebutton1 = new global::Gtk.ToggleButton (); - this.togglebutton1.CanFocus = true; - this.togglebutton1.Name = "togglebutton1"; - this.togglebutton1.UseUnderline = true; - // Container child togglebutton1.Gtk.Container+ContainerChild + this.btnRetireLigne = new global::Gtk.Button (); + this.btnRetireLigne.CanFocus = true; + this.btnRetireLigne.Name = "btnRetireLigne"; + this.btnRetireLigne.UseUnderline = true; + // Container child btnRetireLigne.Gtk.Container+ContainerChild global::Gtk.Alignment w29 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild global::Gtk.HBox w30 = new global::Gtk.HBox (); w30.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Image w31 = new global::Gtk.Image (); - w31.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-media-pause", global::Gtk.IconSize.Dnd); + w31.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Dnd); w30.Add (w31); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w33 = new global::Gtk.Label (); w30.Add (w33); w29.Add (w30); - this.togglebutton1.Add (w29); - this.vbox2.Add (this.togglebutton1); - global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.togglebutton1])); + this.btnRetireLigne.Add (w29); + this.vbox2.Add (this.btnRetireLigne); + global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.btnRetireLigne])); w37.Position = 3; w37.Expand = false; w37.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.togglebutton3 = new global::Gtk.ToggleButton (); - this.togglebutton3.CanFocus = true; - this.togglebutton3.Name = "togglebutton3"; - this.togglebutton3.UseUnderline = true; - // Container child togglebutton3.Gtk.Container+ContainerChild + this.togglebutton2 = new global::Gtk.ToggleButton (); + this.togglebutton2.CanFocus = true; + this.togglebutton2.Name = "togglebutton2"; + this.togglebutton2.UseUnderline = true; + // Container child togglebutton2.Gtk.Container+ContainerChild global::Gtk.Alignment w38 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild global::Gtk.HBox w39 = new global::Gtk.HBox (); w39.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Image w40 = new global::Gtk.Image (); - w40.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-justify-fill", global::Gtk.IconSize.Dnd); + w40.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-no", global::Gtk.IconSize.Dnd); w39.Add (w40); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w42 = new global::Gtk.Label (); w39.Add (w42); w38.Add (w39); - this.togglebutton3.Add (w38); - this.vbox2.Add (this.togglebutton3); - global::Gtk.Box.BoxChild w46 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.togglebutton3])); + this.togglebutton2.Add (w38); + this.vbox2.Add (this.togglebutton2); + global::Gtk.Box.BoxChild w46 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.togglebutton2])); w46.Position = 4; w46.Expand = false; w46.Fill = false; // Container child vbox2.Gtk.Box+BoxChild + this.togglebutton1 = new global::Gtk.ToggleButton (); + this.togglebutton1.CanFocus = true; + this.togglebutton1.Name = "togglebutton1"; + this.togglebutton1.UseUnderline = true; + // Container child togglebutton1.Gtk.Container+ContainerChild + global::Gtk.Alignment w47 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); + // Container child GtkAlignment.Gtk.Container+ContainerChild + global::Gtk.HBox w48 = new global::Gtk.HBox (); + w48.Spacing = 2; + // Container child GtkHBox.Gtk.Container+ContainerChild + global::Gtk.Image w49 = new global::Gtk.Image (); + w49.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-media-pause", global::Gtk.IconSize.Dnd); + w48.Add (w49); + // Container child GtkHBox.Gtk.Container+ContainerChild + global::Gtk.Label w51 = new global::Gtk.Label (); + w48.Add (w51); + w47.Add (w48); + this.togglebutton1.Add (w47); + this.vbox2.Add (this.togglebutton1); + global::Gtk.Box.BoxChild w55 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.togglebutton1])); + w55.Position = 5; + w55.Expand = false; + w55.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild + this.togglebutton3 = new global::Gtk.ToggleButton (); + this.togglebutton3.CanFocus = true; + this.togglebutton3.Name = "togglebutton3"; + this.togglebutton3.UseUnderline = true; + // Container child togglebutton3.Gtk.Container+ContainerChild + global::Gtk.Alignment w56 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); + // Container child GtkAlignment.Gtk.Container+ContainerChild + global::Gtk.HBox w57 = new global::Gtk.HBox (); + w57.Spacing = 2; + // Container child GtkHBox.Gtk.Container+ContainerChild + global::Gtk.Image w58 = new global::Gtk.Image (); + w58.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-justify-fill", global::Gtk.IconSize.Dnd); + w57.Add (w58); + // Container child GtkHBox.Gtk.Container+ContainerChild + global::Gtk.Label w60 = new global::Gtk.Label (); + w57.Add (w60); + w56.Add (w57); + this.togglebutton3.Add (w56); + this.vbox2.Add (this.togglebutton3); + global::Gtk.Box.BoxChild w64 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.togglebutton3])); + w64.Position = 6; + w64.Expand = false; + w64.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild this.masterScale = new global::Gtk.VScale (null); this.masterScale.HeightRequest = 260; this.masterScale.Name = "masterScale"; @@ -249,23 +299,23 @@ namespace DMX2 this.masterScale.Digits = 0; this.masterScale.ValuePos = ((global::Gtk.PositionType)(2)); this.vbox2.Add (this.masterScale); - global::Gtk.Box.BoxChild w47 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale])); - w47.Position = 5; - w47.Expand = false; - w47.Fill = false; + 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 w48 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2])); - w48.Position = 0; - w48.Expand = false; - w48.Fill = false; + global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2])); + w66.Position = 0; + w66.Expand = false; + w66.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 w49 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1])); - w49.Position = 1; - w49.Expand = false; - w49.Fill = false; + global::Gtk.Box.BoxChild w67 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1])); + w67.Position = 1; + w67.Expand = false; + w67.Fill = false; // Container child hbox1.Gtk.Box+BoxChild this.hpaned1 = new global::Gtk.HPaned (); this.hpaned1.CanFocus = true; @@ -286,17 +336,17 @@ namespace DMX2 this.MatriceUI.Name = "MatriceUI"; this.GtkScrolledWindow2.Add (this.MatriceUI); this.hpaned2.Add (this.GtkScrolledWindow2); - global::Gtk.Paned.PanedChild w51 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2])); - w51.Resize = false; + global::Gtk.Paned.PanedChild w69 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2])); + w69.Resize = false; // Container child hpaned2.Gtk.Paned+PanedChild this.onglets = new global::Gtk.Notebook (); this.onglets.CanFocus = true; this.onglets.Name = "onglets"; - this.onglets.CurrentPage = 0; + this.onglets.CurrentPage = 1; this.hpaned2.Add (this.onglets); this.hpaned1.Add (this.hpaned2); - global::Gtk.Paned.PanedChild w53 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); - w53.Resize = false; + global::Gtk.Paned.PanedChild w71 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); + w71.Resize = false; // Container child hpaned1.Gtk.Paned+PanedChild this.scrolledwindow2 = new global::Gtk.ScrolledWindow (); this.scrolledwindow2.WidthRequest = 150; @@ -304,32 +354,32 @@ namespace DMX2 this.scrolledwindow2.Name = "scrolledwindow2"; this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child scrolledwindow2.Gtk.Container+ContainerChild - global::Gtk.Viewport w54 = new global::Gtk.Viewport (); - w54.ShadowType = ((global::Gtk.ShadowType)(0)); + global::Gtk.Viewport w72 = new global::Gtk.Viewport (); + w72.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; - w54.Add (this.vboxCircuits); - this.scrolledwindow2.Add (w54); + w72.Add (this.vboxCircuits); + this.scrolledwindow2.Add (w72); this.hpaned1.Add (this.scrolledwindow2); - global::Gtk.Paned.PanedChild w57 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); - w57.Resize = false; - w57.Shrink = false; + global::Gtk.Paned.PanedChild w75 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); + w75.Resize = false; + w75.Shrink = false; this.hbox1.Add (this.hpaned1); - global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); - w58.Position = 2; + global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); + w76.Position = 2; this.vbox1.Add (this.hbox1); - global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); - w59.Position = 0; + global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); + w77.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 w60 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); - w60.Position = 1; - w60.Expand = false; - w60.Fill = false; + global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); + w78.Position = 1; + w78.Expand = false; + w78.Fill = false; // Container child vbox1.Gtk.Box+BoxChild this.hbox4 = new global::Gtk.HBox (); this.hbox4.Name = "hbox4"; @@ -340,17 +390,17 @@ namespace DMX2 this.toolbar7.Name = "toolbar7"; this.toolbar7.ShowArrow = false; this.hbox4.Add (this.toolbar7); - global::Gtk.Box.BoxChild w61 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); - w61.Position = 0; - w61.Expand = false; - w61.Fill = false; + global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); + w79.Position = 0; + w79.Expand = false; + w79.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 w62 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5])); - w62.Position = 1; + global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5])); + w80.Position = 1; // Container child hbox4.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8"))); @@ -358,15 +408,15 @@ namespace DMX2 this.toolbar8.ShowArrow = false; this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.hbox4.Add (this.toolbar8); - global::Gtk.Box.BoxChild w63 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8])); - w63.Position = 2; - w63.Expand = false; - w63.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 w64 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4])); - w64.Position = 2; - w64.Expand = false; - w64.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 (); @@ -387,7 +437,12 @@ 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.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); + this.btnRetireLigne.Clicked += new global::System.EventHandler (this.OnBtnRetireLigneClicked); this.masterScale.ValueChanged += new global::System.EventHandler (this.OnMasterScaleValueChanged); + this.MatriceUI.CursorChanged += new global::System.EventHandler (this.OnMatriceUICursorChanged); } } } diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 91aba44..424a86a 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -189,13 +189,14 @@ 6 - + True TextAndIcon stock:gtk-goto-last Dnd True + 0 @@ -205,13 +206,14 @@ - + True TextAndIcon stock:gtk-goto-first Dnd True + 1 @@ -220,6 +222,40 @@ False + + + + True + TextAndIcon + stock:gtk-add Dnd + + True + + + + 2 + True + False + False + + + + + + True + TextAndIcon + stock:gtk-remove Dnd + + True + + + + 3 + True + False + False + + @@ -230,7 +266,7 @@ True - 2 + 4 True False False @@ -246,7 +282,7 @@ True - 3 + 5 True False False @@ -262,7 +298,7 @@ True - 4 + 6 True False False @@ -283,7 +319,7 @@ - 5 + 7 False False False @@ -327,6 +363,7 @@ True True + @@ -338,7 +375,7 @@ True - 0 + 1