diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj
index 5b55327..82cd163 100644
--- a/DMX-2.0/DMX-2.0.csproj
+++ b/DMX-2.0/DMX-2.0.csproj
@@ -145,6 +145,9 @@
+
+
+
diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index f0c1dd9..6725fe9 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -34,6 +34,8 @@ namespace DMX2
int lastSaveHash=0;
bool nextChange=false;
+ Menu midioscMenu;
+
public string CurFolder{
get;
set;
@@ -71,6 +73,25 @@ namespace DMX2
hpaned2.Add2(seqCtn);
hpaned2.ShowAll();
+ midioscMenu = new Menu ();
+ MenuItem midiItem = new MenuItem ("Sequenceur Midi");
+ MenuItem oscItem = new MenuItem ("Sequenceur OSC");
+ midiItem.ButtonPressEvent+= delegate(object o, ButtonPressEventArgs args) {
+ Sequenceur s = new SequenceurMidi();
+ Conduite.Courante.AjoutSequenceur(s);
+ AddSeqUI(s);
+ NextUpdateFull();
+ };
+ oscItem.ButtonPressEvent+= delegate(object o, ButtonPressEventArgs args) {
+ Sequenceur s = new SequenceurOSC();
+ Conduite.Courante.AjoutSequenceur(s);
+ AddSeqUI(s);
+ NextUpdateFull();
+ };
+ midioscMenu.Add (midiItem);
+ midioscMenu.Add (oscItem);
+ midioscMenu.ShowAll ();
+
}
@@ -567,10 +588,12 @@ namespace DMX2
protected void OnSeqMidiActionActivated (object sender, EventArgs e)
{
- Sequenceur s = new SequenceurMidi();
+ /* Sequenceur s = new SequenceurMidi();
Conduite.Courante.AjoutSequenceur(s);
AddSeqUI(s);
- NextUpdateFull();
+ NextUpdateFull();*/
+
+ midioscMenu.Popup ();
}
#endregion
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index 189c3a6..9c852c5 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -2035,13 +2035,238 @@ au sequenceur
False
-
+
Action
- circuits
- Association des circuits
-au sequenceur
-
+ gtk-go-forward
+
+
+
+ Action
+
+ gtk-go-back
+
+
+
+ Action
+
+ gtk-media-pause
+
+
+
+ Action
+
+ gtk-media-next
+
+
+ Action
+
+ gtk-add
+
+
+
+ Action
+
+ gtk-remove
+
+
+
+ Action
+
+
+
+
+ False
+
+
+
+ In
+
+
+
+ 0
+ 0
+ 12
+
+
+
+
+
+
+ 6
+
+
+
+ 6
+
+
+
+
+
+
+
+
+
+ 300
+ 6
+
+
+
+
+ 33
+ 15
+ 0
+ <big>n° 0</big>
+ True
+
+
+ 0
+ True
+ False
+ False
+
+
+
+
+
+ True
+ True
+
+
+ 1
+ False
+ False
+
+
+
+
+
+ 33
+ 15
+ <big>00.0</big>
+ True
+
+
+ End
+ 2
+ False
+ False
+ False
+
+
+
+
+
+
+ 0
+ True
+ False
+ False
+
+
+
+
+
+ False
+ Icons
+ SmallToolbar
+
+
+
+
+
+
+
+
+
+
+ 1
+ True
+ False
+ False
+
+
+
+
+ 0
+ False
+
+
+
+
+
+ Vertical
+ False
+ Icons
+ SmallToolbar
+
+
+
+
+
+ End
+ 1
+ True
+ False
+ False
+
+
+
+
+ 0
+ True
+ False
+ False
+
+
+
+
+
+ True
+ In
+
+
+
+ True
+ True
+
+
+
+
+
+ 1
+ True
+
+
+
+
+
+
+
+
+
+
+
+ Séquenceur Midi
+ True
+
+
+ label_item
+
+
+
+
+
+
+
+
+ Toggle
+
+
+ gtk-close
+ False
+ False
+
Action
@@ -4486,4 +4711,4 @@ trames DMX (ms)
-
\ No newline at end of file
+