diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs index fbae8d9..fd5e846 100644 --- a/DMX-2.0/Conduite.cs +++ b/DMX-2.0/Conduite.cs @@ -230,6 +230,7 @@ namespace DMX2 } HashSet circuitTelecomande=new HashSet(); + int circuitTelecomandeVal=0; public HashSet CircuitTelecomande { diff --git a/DMX-2.0/GestionMidiUI.cs b/DMX-2.0/GestionMidiUI.cs index 47524aa..ad6cd88 100644 --- a/DMX-2.0/GestionMidiUI.cs +++ b/DMX-2.0/GestionMidiUI.cs @@ -47,6 +47,9 @@ namespace DMX2 spinNbPage.Value = Conduite.Courante.Midi.Maxpage; + spinPageDown.Value = Conduite.Courante.Midi.PageDownCC; + spinPageUp.Value = Conduite.Courante.Midi.PageUpCC; + chkFourteenBits.Active = Conduite.Courante.Midi.Fourteenbits; if (Conduite.Courante.Midi.UnpaginatedChannels.Count == 0) { spinUPCh.Sensitive = false; @@ -57,6 +60,8 @@ namespace DMX2 chkPg.Active = true; } + + } void HandleDestroyed (object sender, EventArgs e) @@ -159,7 +164,7 @@ namespace DMX2 } - protected void OnSpinNbPageValueChanged (object sender, EventArgs e) + protected void OnSpinPageUPValueChanged (object sender, EventArgs e) { Conduite.Courante.Midi.Maxpage = (uint) spinNbPage.ValueAsInt; } @@ -185,6 +190,20 @@ namespace DMX2 + protected void OnChkFourteenBitsToggled (object sender, EventArgs e) + { + Conduite.Courante.Midi.Fourteenbits = chkFourteenBits.Active; + } + + protected void OnSpinPageDownValueChanged (object sender, EventArgs e) + { + Conduite.Courante.Midi.PageDownCC = (uint)spinPageDown.ValueAsInt; + } + + protected void OnSpinPageUpValueChanged (object sender, EventArgs e) + { + Conduite.Courante.Midi.PageUpCC = (uint)spinPageUp.ValueAsInt; + } } } diff --git a/DMX-2.0/MidiEventProvider.cs b/DMX-2.0/MidiEventProvider.cs index 583364c..8447add 100644 --- a/DMX-2.0/MidiEventProvider.cs +++ b/DMX-2.0/MidiEventProvider.cs @@ -214,13 +214,18 @@ namespace DMX2 /// Soit recue, soit envoyée (feedback / changement de page) /// readonly Dictionary lastValueOfSrc = new Dictionary (); - EventData last; + // EventData last; internalEvent levent = null; bool connected = false; bool guirefreshflag = false; uint page = 1; uint maxpage = 8; + bool fourteenbits = false; + byte[] fbTmpData = new byte[512]; + uint pageUpCC = 127; + uint pageDownCC = 126; + public uint CurrentPage { get { return page; @@ -233,6 +238,24 @@ namespace DMX2 } } + public uint PageUpCC { + get { + return pageUpCC; + } + set { + pageUpCC = value; + } + } + + public uint PageDownCC { + get { + return pageDownCC; + } + set { + pageDownCC = value; + } + } + public uint Maxpage { get { return maxpage; @@ -248,6 +271,15 @@ namespace DMX2 } } + public bool Fourteenbits { + get { + return fourteenbits; + } + set { + fourteenbits = value; + } + } + public bool GuiRefreshFlag { get { if (guirefreshflag) { @@ -510,19 +542,33 @@ namespace DMX2 ); continue; case AlsaSeqLib.snd_seq_event_type_t.SND_SEQ_EVENT_CONTROLLER: - if (evS.data_ev_ctrl.param == 127 && evS.data_ev_ctrl.value > 0) { + if (evS.data_ev_ctrl.param == pageUpCC && evS.data_ev_ctrl.value > 0) { CurrentPage++; continue; } - if (evS.data_ev_ctrl.param == 126 && evS.data_ev_ctrl.value > 0) { + if (evS.data_ev_ctrl.param == pageDownCC && evS.data_ev_ctrl.value > 0) { CurrentPage--; continue; } - id = string.Format ("CTRL-C{0}P{1}", evS.data_ev_ctrl.channel, evS.data_ev_ctrl.param); + channel = evS.data_ev_ctrl.channel; - value = 255 * evS.data_ev_ctrl.value / 127; // Conversion {0,127} => {0,255} + if (fourteenbits && evS.data_ev_ctrl.param < 64) { + long msbAddr; + if (evS.data_ev_ctrl.param < 32) { + msbAddr = evS.data_ev_ctrl.channel * 32 + evS.data_ev_ctrl.param; + fbTmpData [msbAddr] = (byte)evS.data_ev_ctrl.value; + continue; + } + id = string.Format ("CTRL-C{0}P{1}", evS.data_ev_ctrl.channel, evS.data_ev_ctrl.param-32); + msbAddr = evS.data_ev_ctrl.channel * 32 + evS.data_ev_ctrl.param - 32; + value = ((fbTmpData [msbAddr] << 7) ^ evS.data_ev_ctrl.value) >> 6; + } else { + id = string.Format ("CTRL-C{0}P{1}", evS.data_ev_ctrl.channel, evS.data_ev_ctrl.param); + value = 255 * evS.data_ev_ctrl.value / 127; // Conversion {0,127} => {0,255} + } + break; case AlsaSeqLib.snd_seq_event_type_t.SND_SEQ_EVENT_NOTEON: id = string.Format ("NOTE-C{0}N{1}", evS.data_ev_note.channel, evS.data_ev_note.note); @@ -598,7 +644,7 @@ namespace DMX2 evData.prev_value = lastValueOfSrc [lnvk]; /*if (evData.Equals (last)) continue; */ - last = evData; + //last = evData; if (eventlist [id].Bound) { callback (evData); @@ -703,6 +749,9 @@ namespace DMX2 System.Xml.XmlElement el = parent.OwnerDocument.CreateElement ("Midi"); parent.AppendChild (el); el.SetAttribute ("maxpage", maxpage.ToString ()); + el.SetAttribute ("pageUpCC", pageUpCC.ToString ()); + el.SetAttribute ("pageDownCC", pageDownCC.ToString ()); + el.SetAttribute ("fourteenbits", fourteenbits?"true":"false"); System.Xml.XmlElement xmlEl; foreach (MidiDev dev in knowndevices.Values) { @@ -723,6 +772,9 @@ namespace DMX2 if (el == null) return; maxpage = uint.Parse (el.TryGetAttribute ("maxpage", "8")); + pageUpCC = uint.Parse (el.TryGetAttribute ("pageUpCC", "127")); + pageDownCC = uint.Parse (el.TryGetAttribute ("pageDownCC", "126")); + fourteenbits = el.TryGetAttribute ("fourteenbits", string.Empty).Equals ("true"); foreach (var xd in el.GetElementsByTagName("MidiDev")) { System.Xml.XmlElement xdev = xd as System.Xml.XmlElement; diff --git a/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs b/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs index b40f561..3a42cde 100644 --- a/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs @@ -7,12 +7,15 @@ namespace DMX2 private global::Gtk.Table table1; private global::Gtk.Frame frame2; private global::Gtk.Alignment GtkAlignment3; - private global::Gtk.VBox vbox4; - private global::Gtk.HBox hbox1; - private global::Gtk.Label label3; - private global::Gtk.SpinButton spinNbPage; - private global::Gtk.HBox hbox2; + private global::Gtk.Table table2; + private global::Gtk.CheckButton chkFourteenBits; private global::Gtk.CheckButton chkPg; + private global::Gtk.Label label3; + private global::Gtk.Label label4; + private global::Gtk.Label label5; + private global::Gtk.SpinButton spinNbPage; + private global::Gtk.SpinButton spinPageDown; + private global::Gtk.SpinButton spinPageUp; private global::Gtk.SpinButton spinUPCh; private global::Gtk.Label GtkLabel5; private global::Gtk.Frame frame3; @@ -58,24 +61,68 @@ namespace DMX2 this.GtkAlignment3.Name = "GtkAlignment3"; this.GtkAlignment3.LeftPadding = ((uint)(12)); // Container child GtkAlignment3.Gtk.Container+ContainerChild - this.vbox4 = new global::Gtk.VBox (); - this.vbox4.Name = "vbox4"; - this.vbox4.Spacing = 6; - // Container child vbox4.Gtk.Box+BoxChild - this.hbox1 = new global::Gtk.HBox (); - this.hbox1.Name = "hbox1"; - this.hbox1.Spacing = 6; - // Container child hbox1.Gtk.Box+BoxChild + this.table2 = new global::Gtk.Table (((uint)(5)), ((uint)(2)), false); + this.table2.Name = "table2"; + this.table2.RowSpacing = ((uint)(6)); + this.table2.ColumnSpacing = ((uint)(6)); + // Container child table2.Gtk.Table+TableChild + this.chkFourteenBits = new global::Gtk.CheckButton (); + this.chkFourteenBits.CanFocus = true; + this.chkFourteenBits.Name = "chkFourteenBits"; + this.chkFourteenBits.Label = "Mode 14bits (CC 1 à 32)"; + this.chkFourteenBits.DrawIndicator = true; + this.chkFourteenBits.UseUnderline = true; + this.table2.Add (this.chkFourteenBits); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2 [this.chkFourteenBits])); + w2.TopAttach = ((uint)(4)); + w2.BottomAttach = ((uint)(5)); + w2.XOptions = ((global::Gtk.AttachOptions)(4)); + w2.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild + this.chkPg = new global::Gtk.CheckButton (); + this.chkPg.CanFocus = true; + this.chkPg.Name = "chkPg"; + this.chkPg.Label = "ne pas paginer ce canal :"; + this.chkPg.DrawIndicator = true; + this.chkPg.UseUnderline = true; + this.table2.Add (this.chkPg); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2 [this.chkPg])); + w3.TopAttach = ((uint)(1)); + w3.BottomAttach = ((uint)(2)); + w3.XOptions = ((global::Gtk.AttachOptions)(4)); + w3.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild this.label3 = new global::Gtk.Label (); this.label3.Name = "label3"; this.label3.Xalign = 0F; this.label3.LabelProp = "Nombre de pages"; - this.hbox1.Add (this.label3); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label3])); - w2.Position = 0; - w2.Expand = false; - w2.Fill = false; - // Container child hbox1.Gtk.Box+BoxChild + this.table2.Add (this.label3); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.label3])); + w4.XOptions = ((global::Gtk.AttachOptions)(4)); + w4.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild + this.label4 = new global::Gtk.Label (); + this.label4.Name = "label4"; + this.label4.Xalign = 0F; + this.label4.LabelProp = "CC page suivante :"; + this.table2.Add (this.label4); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.label4])); + w5.TopAttach = ((uint)(2)); + w5.BottomAttach = ((uint)(3)); + w5.XOptions = ((global::Gtk.AttachOptions)(4)); + w5.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild + this.label5 = new global::Gtk.Label (); + this.label5.Name = "label5"; + this.label5.Xalign = 0F; + this.label5.LabelProp = "CC page précédente :"; + this.table2.Add (this.label5); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.label5])); + w6.TopAttach = ((uint)(3)); + w6.BottomAttach = ((uint)(4)); + w6.XOptions = ((global::Gtk.AttachOptions)(4)); + w6.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild this.spinNbPage = new global::Gtk.SpinButton (1, 99, 1); this.spinNbPage.CanFocus = true; this.spinNbPage.Name = "spinNbPage"; @@ -83,32 +130,45 @@ namespace DMX2 this.spinNbPage.ClimbRate = 1; this.spinNbPage.Numeric = true; this.spinNbPage.Value = 8; - this.hbox1.Add (this.spinNbPage); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.spinNbPage])); - w3.PackType = ((global::Gtk.PackType)(1)); - w3.Position = 1; - w3.Expand = false; - w3.Fill = false; - this.vbox4.Add (this.hbox1); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox1])); - w4.Position = 0; - w4.Expand = false; - w4.Fill = false; - // Container child vbox4.Gtk.Box+BoxChild - this.hbox2 = new global::Gtk.HBox (); - this.hbox2.Name = "hbox2"; - this.hbox2.Spacing = 6; - // Container child hbox2.Gtk.Box+BoxChild - this.chkPg = new global::Gtk.CheckButton (); - this.chkPg.CanFocus = true; - this.chkPg.Name = "chkPg"; - this.chkPg.Label = "ne pas paginer ce canal :"; - this.chkPg.DrawIndicator = true; - this.chkPg.UseUnderline = true; - this.hbox2.Add (this.chkPg); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.chkPg])); - w5.Position = 0; - // Container child hbox2.Gtk.Box+BoxChild + this.table2.Add (this.spinNbPage); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.spinNbPage])); + w7.LeftAttach = ((uint)(1)); + w7.RightAttach = ((uint)(2)); + w7.XOptions = ((global::Gtk.AttachOptions)(4)); + w7.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild + this.spinPageDown = new global::Gtk.SpinButton (1, 127, 1); + this.spinPageDown.CanFocus = true; + this.spinPageDown.Name = "spinPageDown"; + this.spinPageDown.Adjustment.PageIncrement = 10; + this.spinPageDown.ClimbRate = 1; + this.spinPageDown.Numeric = true; + this.spinPageDown.Value = 126; + this.table2.Add (this.spinPageDown); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.spinPageDown])); + w8.TopAttach = ((uint)(3)); + w8.BottomAttach = ((uint)(4)); + w8.LeftAttach = ((uint)(1)); + w8.RightAttach = ((uint)(2)); + w8.XOptions = ((global::Gtk.AttachOptions)(4)); + w8.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild + this.spinPageUp = new global::Gtk.SpinButton (1, 127, 1); + this.spinPageUp.CanFocus = true; + this.spinPageUp.Name = "spinPageUp"; + this.spinPageUp.Adjustment.PageIncrement = 10; + this.spinPageUp.ClimbRate = 1; + this.spinPageUp.Numeric = true; + this.spinPageUp.Value = 127; + this.table2.Add (this.spinPageUp); + global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2 [this.spinPageUp])); + w9.TopAttach = ((uint)(2)); + w9.BottomAttach = ((uint)(3)); + w9.LeftAttach = ((uint)(1)); + w9.RightAttach = ((uint)(2)); + w9.XOptions = ((global::Gtk.AttachOptions)(4)); + w9.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild this.spinUPCh = new global::Gtk.SpinButton (1, 16, 1); this.spinUPCh.CanFocus = true; this.spinUPCh.Name = "spinUPCh"; @@ -116,18 +176,15 @@ namespace DMX2 this.spinUPCh.ClimbRate = 1; this.spinUPCh.Numeric = true; this.spinUPCh.Value = 1; - this.hbox2.Add (this.spinUPCh); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.spinUPCh])); - w6.PackType = ((global::Gtk.PackType)(1)); - w6.Position = 1; - w6.Expand = false; - w6.Fill = false; - this.vbox4.Add (this.hbox2); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox2])); - w7.Position = 1; - w7.Expand = false; - w7.Fill = false; - this.GtkAlignment3.Add (this.vbox4); + this.table2.Add (this.spinUPCh); + global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2 [this.spinUPCh])); + w10.TopAttach = ((uint)(1)); + w10.BottomAttach = ((uint)(2)); + w10.LeftAttach = ((uint)(1)); + w10.RightAttach = ((uint)(2)); + w10.XOptions = ((global::Gtk.AttachOptions)(4)); + w10.YOptions = ((global::Gtk.AttachOptions)(4)); + this.GtkAlignment3.Add (this.table2); this.frame2.Add (this.GtkAlignment3); this.GtkLabel5 = new global::Gtk.Label (); this.GtkLabel5.Name = "GtkLabel5"; @@ -135,9 +192,9 @@ namespace DMX2 this.GtkLabel5.UseMarkup = true; this.frame2.LabelWidget = this.GtkLabel5; this.table1.Add (this.frame2); - global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.frame2])); - w10.XOptions = ((global::Gtk.AttachOptions)(4)); - w10.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.frame2])); + w13.XOptions = ((global::Gtk.AttachOptions)(4)); + w13.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.frame3 = new global::Gtk.Frame (); this.frame3.Name = "frame3"; @@ -159,10 +216,10 @@ namespace DMX2 this.chkFB.DrawIndicator = true; this.chkFB.UseUnderline = true; this.vbox5.Add (this.chkFB); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.chkFB])); - w11.Position = 0; - w11.Expand = false; - w11.Fill = false; + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.chkFB])); + w14.Position = 0; + w14.Expand = false; + w14.Fill = false; this.GtkAlignment2.Add (this.vbox5); this.frame3.Add (this.GtkAlignment2); this.GtkLabel3 = new global::Gtk.Label (); @@ -171,11 +228,11 @@ namespace DMX2 this.GtkLabel3.UseMarkup = true; this.frame3.LabelWidget = this.GtkLabel3; this.table1.Add (this.frame3); - global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.frame3])); - w14.TopAttach = ((uint)(2)); - w14.BottomAttach = ((uint)(3)); - w14.XOptions = ((global::Gtk.AttachOptions)(4)); - w14.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.frame3])); + w17.TopAttach = ((uint)(2)); + w17.BottomAttach = ((uint)(3)); + w17.XOptions = ((global::Gtk.AttachOptions)(4)); + w17.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.hbuttonbox2 = new global::Gtk.HButtonBox (); this.hbuttonbox2.Name = "hbuttonbox2"; @@ -186,25 +243,25 @@ namespace DMX2 this.btnActiv.Name = "btnActiv"; this.btnActiv.UseUnderline = true; // Container child btnActiv.Gtk.Container+ContainerChild - global::Gtk.Alignment w15 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); + global::Gtk.Alignment w18 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w16 = new global::Gtk.HBox (); - w16.Spacing = 2; + global::Gtk.HBox w19 = new global::Gtk.HBox (); + w19.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w17 = new global::Gtk.Image (); - w17.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-down", global::Gtk.IconSize.Menu); - w16.Add (w17); + global::Gtk.Image w20 = new global::Gtk.Image (); + w20.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-down", global::Gtk.IconSize.Menu); + w19.Add (w20); // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w19 = new global::Gtk.Label (); - w19.LabelProp = "Activer"; - w19.UseUnderline = true; - w16.Add (w19); - w15.Add (w16); - this.btnActiv.Add (w15); + global::Gtk.Label w22 = new global::Gtk.Label (); + w22.LabelProp = "Activer"; + w22.UseUnderline = true; + w19.Add (w22); + w18.Add (w19); + this.btnActiv.Add (w18); this.hbuttonbox2.Add (this.btnActiv); - global::Gtk.ButtonBox.ButtonBoxChild w23 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.btnActiv])); - w23.Expand = false; - w23.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w26 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.btnActiv])); + w26.Expand = false; + w26.Fill = false; // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild this.btnDesactiv = new global::Gtk.Button (); this.btnDesactiv.Sensitive = false; @@ -212,34 +269,34 @@ namespace DMX2 this.btnDesactiv.Name = "btnDesactiv"; this.btnDesactiv.UseUnderline = true; // Container child btnDesactiv.Gtk.Container+ContainerChild - global::Gtk.Alignment w24 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); + global::Gtk.Alignment w27 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w25 = new global::Gtk.HBox (); - w25.Spacing = 2; + global::Gtk.HBox w28 = new global::Gtk.HBox (); + w28.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w26 = new global::Gtk.Image (); - w26.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-up", global::Gtk.IconSize.Menu); - w25.Add (w26); + global::Gtk.Image w29 = new global::Gtk.Image (); + w29.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-up", global::Gtk.IconSize.Menu); + w28.Add (w29); // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w28 = new global::Gtk.Label (); - w28.LabelProp = "Désactiver"; - w28.UseUnderline = true; - w25.Add (w28); - w24.Add (w25); - this.btnDesactiv.Add (w24); + global::Gtk.Label w31 = new global::Gtk.Label (); + w31.LabelProp = "Désactiver"; + w31.UseUnderline = true; + w28.Add (w31); + w27.Add (w28); + this.btnDesactiv.Add (w27); this.hbuttonbox2.Add (this.btnDesactiv); - global::Gtk.ButtonBox.ButtonBoxChild w32 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.btnDesactiv])); - w32.Position = 1; - w32.Expand = false; - w32.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w35 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.btnDesactiv])); + w35.Position = 1; + w35.Expand = false; + w35.Fill = false; this.table1.Add (this.hbuttonbox2); - global::Gtk.Table.TableChild w33 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbuttonbox2])); - w33.TopAttach = ((uint)(1)); - w33.BottomAttach = ((uint)(2)); - w33.LeftAttach = ((uint)(1)); - w33.RightAttach = ((uint)(2)); - w33.XOptions = ((global::Gtk.AttachOptions)(0)); - w33.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w36 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbuttonbox2])); + w36.TopAttach = ((uint)(1)); + w36.BottomAttach = ((uint)(2)); + w36.LeftAttach = ((uint)(1)); + w36.RightAttach = ((uint)(2)); + w36.XOptions = ((global::Gtk.AttachOptions)(0)); + w36.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.vbox2 = new global::Gtk.VBox (); this.vbox2.Name = "vbox2"; @@ -250,10 +307,10 @@ namespace DMX2 this.label1.Xalign = 0F; this.label1.LabelProp = "Interfaces disponibles :"; this.vbox2.Add (this.label1); - global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1])); - w34.Position = 0; - w34.Expand = false; - w34.Fill = false; + global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label1])); + w37.Position = 0; + w37.Expand = false; + w37.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow.Name = "GtkScrolledWindow"; @@ -265,12 +322,12 @@ namespace DMX2 this.listDetect.HeadersVisible = false; this.GtkScrolledWindow.Add (this.listDetect); this.vbox2.Add (this.GtkScrolledWindow); - global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow])); - w36.Position = 1; + global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow])); + w39.Position = 1; this.table1.Add (this.vbox2); - global::Gtk.Table.TableChild w37 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox2])); - w37.LeftAttach = ((uint)(1)); - w37.RightAttach = ((uint)(2)); + global::Gtk.Table.TableChild w40 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox2])); + w40.LeftAttach = ((uint)(1)); + w40.RightAttach = ((uint)(2)); // Container child table1.Gtk.Table+TableChild this.vbox3 = new global::Gtk.VBox (); this.vbox3.Name = "vbox3"; @@ -281,10 +338,10 @@ namespace DMX2 this.label2.Xalign = 0F; this.label2.LabelProp = "Interfaces selectionnées : "; this.vbox3.Add (this.label2); - global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label2])); - w38.Position = 0; - w38.Expand = false; - w38.Fill = false; + global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label2])); + w41.Position = 0; + w41.Expand = false; + w41.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow1.Name = "GtkScrolledWindow1"; @@ -296,23 +353,23 @@ namespace DMX2 this.listKnown.HeadersVisible = false; this.GtkScrolledWindow1.Add (this.listKnown); this.vbox3.Add (this.GtkScrolledWindow1); - global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.GtkScrolledWindow1])); - w40.Position = 1; + global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.GtkScrolledWindow1])); + w43.Position = 1; this.table1.Add (this.vbox3); - global::Gtk.Table.TableChild w41 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox3])); - w41.TopAttach = ((uint)(2)); - w41.BottomAttach = ((uint)(3)); - w41.LeftAttach = ((uint)(1)); - w41.RightAttach = ((uint)(2)); + global::Gtk.Table.TableChild w44 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox3])); + w44.TopAttach = ((uint)(2)); + w44.BottomAttach = ((uint)(3)); + w44.LeftAttach = ((uint)(1)); + w44.RightAttach = ((uint)(2)); w1.Add (this.table1); - global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); - w42.Position = 0; + global::Gtk.Box.BoxChild w45 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); + w45.Position = 0; // Internal child DMX2.GestionMidiUI.ActionArea - global::Gtk.HButtonBox w43 = this.ActionArea; - w43.Name = "dialog1_ActionArea"; - w43.Spacing = 10; - w43.BorderWidth = ((uint)(5)); - w43.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + global::Gtk.HButtonBox w46 = this.ActionArea; + w46.Name = "dialog1_ActionArea"; + w46.Spacing = 10; + w46.BorderWidth = ((uint)(5)); + w46.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.buttonClose = new global::Gtk.Button (); this.buttonClose.CanDefault = true; @@ -322,23 +379,25 @@ namespace DMX2 this.buttonClose.UseUnderline = true; this.buttonClose.Label = "gtk-close"; this.AddActionWidget (this.buttonClose, -7); - global::Gtk.ButtonBox.ButtonBoxChild w44 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w43 [this.buttonClose])); - w44.Expand = false; - w44.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w47 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w46 [this.buttonClose])); + w47.Expand = false; + w47.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } - this.DefaultWidth = 587; - this.DefaultHeight = 503; + this.DefaultWidth = 838; + this.DefaultHeight = 567; this.Show (); this.listKnown.CursorChanged += new global::System.EventHandler (this.OnListKnownCursorChanged); this.listDetect.CursorChanged += new global::System.EventHandler (this.OnListDetectCursorChanged); this.btnActiv.Clicked += new global::System.EventHandler (this.OnBtnActivClicked); this.btnDesactiv.Clicked += new global::System.EventHandler (this.OnBtnDesactivClicked); this.chkFB.Toggled += new global::System.EventHandler (this.OnChkFBToggled); - this.spinNbPage.ValueChanged += new global::System.EventHandler (this.OnSpinNbPageValueChanged); - this.chkPg.Toggled += new global::System.EventHandler (this.OnChkPgToggled); this.spinUPCh.ValueChanged += new global::System.EventHandler (this.OnSpinUPChValueChanged); + this.spinPageUp.ValueChanged += new global::System.EventHandler (this.OnSpinPageUpValueChanged); + this.spinPageDown.ValueChanged += new global::System.EventHandler (this.OnSpinPageDownValueChanged); + this.chkPg.Toggled += new global::System.EventHandler (this.OnChkPgToggled); + this.chkFourteenBits.Toggled += new global::System.EventHandler (this.OnChkFourteenBitsToggled); this.buttonClose.Clicked += new global::System.EventHandler (this.OnButtonCloseClicked); } } diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 7c598d1..c25fe28 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -5,7 +5,7 @@ 2.12 - + @@ -3184,7 +3184,7 @@ trames DMX (ms) - + Connexions Midi CenterOnParent @@ -3215,106 +3215,234 @@ trames DMX (ms) 0 12 - + - 6 - - - - 6 - - - - 0 - Nombre de pages - - - 0 - False - False - False - - - - - - True - 1 - 99 - 10 - 1 - 1 - True - 8 - - - - End - 1 - True - False - False - - - - - 0 - True - False - False - - - - - - 6 - - - - True - ne pas paginer ce canal : - True - True - True - - - - 0 - True - - - - - - True - 1 - 16 - 1 - 1 - 1 - True - 1 - - - - End - 1 - True - False - False - - - - - 1 - True - False - False - - + 5 + 2 + 6 + 6 + + + + True + Mode 14bits (CC 1 à 32) + True + True + True + + + + 4 + 5 + True + Fill + Fill + False + True + False + False + True + False + + + + + + True + ne pas paginer ce canal : + True + True + True + + + + 1 + 2 + True + Fill + Fill + False + True + False + False + True + False + + + + + + 0 + Nombre de pages + + + True + Fill + Fill + False + True + False + False + True + False + + + + + + 0 + CC page suivante : + + + 2 + 3 + True + Fill + Fill + False + True + False + False + True + False + + + + + + 0 + CC page précédente : + + + 3 + 4 + True + Fill + Fill + False + True + False + False + True + False + + + + + + True + 1 + 99 + 10 + 1 + 1 + True + 8 + + + 1 + 2 + True + Fill + Fill + False + True + False + False + True + False + + + + + + True + 1 + 127 + 10 + 1 + 1 + True + 126 + + + + 3 + 4 + 1 + 2 + True + Fill + Fill + False + True + False + False + True + False + + + + + + True + 1 + 127 + 10 + 1 + 1 + True + 127 + + + + 2 + 3 + 1 + 2 + True + Fill + Fill + False + True + False + False + True + False + + + + + + True + 1 + 16 + 1 + 1 + 1 + True + 1 + + + + 1 + 2 + 1 + 2 + True + Fill + Fill + False + True + False + False + True + False + +