From a21b917e94a97f8a478a0219ec7ca994550c8bbe Mon Sep 17 00:00:00 2001
From: tzim <tzim@tzim.net>
Date: Mon, 8 Oct 2018 08:42:56 +0200
Subject: [PATCH] Suite Combo

---
 DMX-2.0/SeqMidiUI.cs       | 46 +++++---------------------------------
 DMX-2.0/SequenceurMidi.cs  | 33 ++++++++++++++++++++++-----
 DMX-2.0/gtk-gui/gui.stetic | 44 +++++++++++++++++++++++++++++++-----
 3 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/DMX-2.0/SeqMidiUI.cs b/DMX-2.0/SeqMidiUI.cs
index f4f910a..da8c0d6 100644
--- a/DMX-2.0/SeqMidiUI.cs
+++ b/DMX-2.0/SeqMidiUI.cs
@@ -210,13 +210,14 @@ namespace DMX2
 			new ContextMenuHelper(frame1,RenamePopup);
 			new ContextMenuHelper(evBBox,CompteurPopup);
 
-			lsDest = new ListStore(typeof(string));
+			/*lsDest = new ListStore(typeof(string));
 			lsDest.AppendValues("TEST 1");
 			lsDest.AppendValues("TEST 2");
 
 			cbDest.Model = lsDest;
 
-			cbDest.SetCellDataFunc(cbDest.Cells[0], HandleCellLayoutDataFunc);
+			cbDest.SetCellDataFunc(cbDest.Cells[0], HandleCellLayoutDataFunc);*/
+
 
 		}
 
@@ -246,11 +247,7 @@ namespace DMX2
 			item = new Gtk.SeparatorMenuItem ();
 			m.Add(item);
 
-			item = new MenuItem("Connecter");
-			item.Submenu = EnumMidiDevices ();
-			m.Add(item);
-
-			m.ShowAll();
+            m.ShowAll();
 			m.Popup();
 
 		}
@@ -258,32 +255,7 @@ namespace DMX2
 
 		static public object PortKey = new object();	
 
-		Gtk.Menu EnumMidiDevices(){
-
-			Gtk.Menu m = new Menu ();
-
-			Gtk.MenuItem item;
-
-			foreach (var dev in AlsaSeqLib.EnumClients ()) {
-				if(dev.Id== AlsaSeqLib.ClientId || dev.Id == 0 || dev.Id == 14 ) continue;
-				foreach(var port in dev.Ports){
-					if((port.Caps & AlsaSeqLib.SND_SEQ_PORT_CAP_WRITE) == AlsaSeqLib.SND_SEQ_PORT_CAP_WRITE){
-						string name = dev.Name+":"+port.Name;
-
-						item = new MenuItem (name);
-						item.Data[PortKey] = port;
-						item.ButtonPressEvent+= ConnectMidiDevEvent;
-						m.Add (item);
-
-					}
-				}
-			}
-
-			return m;
-		}
-
-
-		public override void Update (bool full)
+        public override void Update (bool full)
 		{
 			if (fullUpdFlag || full)
 				FullUpdate ();
@@ -304,13 +276,7 @@ namespace DMX2
 			}
 		}
 
-		void ConnectMidiDevEvent (object o, ButtonPressEventArgs args)
-		{
-			Gtk.MenuItem item = o as Gtk.MenuItem;
-			AlsaSeqLib.Port port = item.Data [PortKey] as AlsaSeqLib.Port;
-			sequenceur.Connect (port);
-		}
-
+      
 
 		void SelectionneEffet (int index)
 		{
diff --git a/DMX-2.0/SequenceurMidi.cs b/DMX-2.0/SequenceurMidi.cs
index a5c2e2a..227b187 100644
--- a/DMX-2.0/SequenceurMidi.cs
+++ b/DMX-2.0/SequenceurMidi.cs
@@ -108,7 +108,32 @@ namespace DMX2
 		AlsaSeqLib.MidiPort midiport;
 		static int portnum=0;
 
-		List<AlsaSeqLib.Port> mididests = new List<AlsaSeqLib.Port>();
+        public class DestListItem {
+			public DestListItem(string _name, AlsaSeqLib.Port _port){
+				name = _name;
+				port = _port;
+			}
+			string name;
+			public string Name{
+				get { return name; }
+			}
+			AlsaSeqLib.Port port;
+			public AlsaSeqLib.Port Port{
+				get { return port; }
+			}
+		}
+
+		DestListItem destination;
+		public DestListItem Destination
+		{
+			get{
+				return destination;
+			}
+			set{
+                destination = value;
+
+			}
+		}
 
 		public bool Paused {
 			get {
@@ -173,11 +198,7 @@ namespace DMX2
 			}
 		}
 
-		public void Connect (AlsaSeqLib.Port port){
-			midiport.ConnectTo (port);
-		}
-
-		public int IndexLigneaSuivre 
+        public int IndexLigneaSuivre 
 		{
 			get {
 				if (aSuivre == null)
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index 994e535..1057039 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -2165,16 +2165,48 @@ au sequenceur</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.ComboBox" id="cbDest">
+                              <widget class="Gtk.HBox" id="hbox3">
                                 <property name="MemberName" />
-                                <property name="IsTextCombo">True</property>
-                                <property name="Items" translatable="yes" />
+                                <property name="Spacing">6</property>
+                                <child>
+                                  <widget class="Gtk.Label" id="label1">
+                                    <property name="MemberName" />
+                                    <property name="LabelProp" translatable="yes">label1</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">0</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.ComboBoxEntry" id="comboboxentry2">
+                                    <property name="MemberName" />
+                                    <property name="IsTextCombo">True</property>
+                                    <property name="Items" translatable="yes" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">1</property>
+                                    <property name="AutoSize">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Label" id="label2">
+                                    <property name="MemberName" />
+                                    <property name="LabelProp" translatable="yes">label2</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">2</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
                                 <property name="Position">1</property>
-                                <property name="AutoSize">True</property>
-                                <property name="Expand">False</property>
-                                <property name="Fill">False</property>
+                                <property name="AutoSize">False</property>
                               </packing>
                             </child>
                             <child>