Ajout Seq OSC
This commit is contained in:
parent
ec2ab96610
commit
281437c752
3 changed files with 259 additions and 8 deletions
|
|
@ -145,6 +145,9 @@
|
||||||
<Compile Include="SequenceurMidi.cs" />
|
<Compile Include="SequenceurMidi.cs" />
|
||||||
<Compile Include="SeqMidiUI.cs" />
|
<Compile Include="SeqMidiUI.cs" />
|
||||||
<Compile Include="gtk-gui\DMX2.SeqMidiUI.cs" />
|
<Compile Include="gtk-gui\DMX2.SeqMidiUI.cs" />
|
||||||
|
<Compile Include="SeqOscUI.cs" />
|
||||||
|
<Compile Include="gtk-gui\DMX2.SeqOscUI.cs" />
|
||||||
|
<Compile Include="SequenceurOSC.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,8 @@ namespace DMX2
|
||||||
int lastSaveHash=0;
|
int lastSaveHash=0;
|
||||||
bool nextChange=false;
|
bool nextChange=false;
|
||||||
|
|
||||||
|
Menu midioscMenu;
|
||||||
|
|
||||||
public string CurFolder{
|
public string CurFolder{
|
||||||
get;
|
get;
|
||||||
set;
|
set;
|
||||||
|
|
@ -71,6 +73,25 @@ namespace DMX2
|
||||||
hpaned2.Add2(seqCtn);
|
hpaned2.Add2(seqCtn);
|
||||||
hpaned2.ShowAll();
|
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)
|
protected void OnSeqMidiActionActivated (object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Sequenceur s = new SequenceurMidi();
|
/* Sequenceur s = new SequenceurMidi();
|
||||||
Conduite.Courante.AjoutSequenceur(s);
|
Conduite.Courante.AjoutSequenceur(s);
|
||||||
AddSeqUI(s);
|
AddSeqUI(s);
|
||||||
NextUpdateFull();
|
NextUpdateFull();*/
|
||||||
|
|
||||||
|
midioscMenu.Popup ();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
||||||
|
|
@ -2035,13 +2035,238 @@ au sequenceur</property>
|
||||||
<property name="Active">False</property>
|
<property name="Active">False</property>
|
||||||
<signal name="Activated" handler="OnCloseActionActivated" />
|
<signal name="Activated" handler="OnCloseActionActivated" />
|
||||||
</action>
|
</action>
|
||||||
<action id="circuitsAction">
|
<action id="goForwardAction">
|
||||||
<property name="Type">Action</property>
|
<property name="Type">Action</property>
|
||||||
<property name="Label" translatable="yes" />
|
<property name="Label" translatable="yes" />
|
||||||
<property name="StockId">circuits</property>
|
<property name="StockId">gtk-go-forward</property>
|
||||||
<property name="Tooltip" translatable="yes">Association des circuits
|
<signal name="Activated" handler="OnGoForwardActionActivated" />
|
||||||
au sequenceur</property>
|
</action>
|
||||||
<signal name="Activated" handler="OnCircuitsActionActivated" />
|
<action id="goBackAction">
|
||||||
|
<property name="Type">Action</property>
|
||||||
|
<property name="Label" translatable="yes" />
|
||||||
|
<property name="StockId">gtk-go-back</property>
|
||||||
|
<signal name="Activated" handler="OnGoBackActionActivated" />
|
||||||
|
</action>
|
||||||
|
<action id="mediaPauseAction">
|
||||||
|
<property name="Type">Action</property>
|
||||||
|
<property name="Label" translatable="yes" />
|
||||||
|
<property name="StockId">gtk-media-pause</property>
|
||||||
|
<signal name="Activated" handler="OnMediaPauseActionActivated" />
|
||||||
|
</action>
|
||||||
|
<action id="mediaNextAction">
|
||||||
|
<property name="Type">Action</property>
|
||||||
|
<property name="Label" translatable="yes" />
|
||||||
|
<property name="StockId">gtk-media-next</property>
|
||||||
|
</action>
|
||||||
|
<action id="btnAjoutLigne">
|
||||||
|
<property name="Type">Action</property>
|
||||||
|
<property name="Label" translatable="yes" />
|
||||||
|
<property name="StockId">gtk-add</property>
|
||||||
|
<signal name="Activated" handler="OnBtnAjoutLigneActivated" />
|
||||||
|
</action>
|
||||||
|
<action id="btnRetireligne">
|
||||||
|
<property name="Type">Action</property>
|
||||||
|
<property name="Label" translatable="yes" />
|
||||||
|
<property name="StockId">gtk-remove</property>
|
||||||
|
<signal name="Activated" handler="OnRemoveLigneActivated" />
|
||||||
|
</action>
|
||||||
|
<action id="Action">
|
||||||
|
<property name="Type">Action</property>
|
||||||
|
<property name="Label" translatable="yes" />
|
||||||
|
</action>
|
||||||
|
</action-group>
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="Visible">False</property>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Frame" id="frame1">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="ShadowType">In</property>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Alignment" id="GtkAlignment">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="Xalign">0</property>
|
||||||
|
<property name="Yalign">0</property>
|
||||||
|
<property name="LeftPadding">12</property>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Alignment" id="alignment1">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.VBox" id="vbox2">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="Spacing">6</property>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.HBox" id="hbox1">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="Spacing">6</property>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.VBox" id="vbox3">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.EventBox" id="evBBox">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.HBox" id="hbox2">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="WidthRequest">300</property>
|
||||||
|
<property name="Spacing">6</property>
|
||||||
|
<signal name="SizeAllocated" handler="OnHbox2SizeAllocated" />
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Label" id="posLabel">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="HeightRequest">33</property>
|
||||||
|
<property name="Xpad">15</property>
|
||||||
|
<property name="Xalign">0</property>
|
||||||
|
<property name="LabelProp" translatable="yes"><big>n° 0</big></property>
|
||||||
|
<property name="UseMarkup">True</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.Label" id="actLabel">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="UseMarkup">True</property>
|
||||||
|
<property name="Wrap">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="Position">1</property>
|
||||||
|
<property name="AutoSize">False</property>
|
||||||
|
<property name="Fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Label" id="timeLabel">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="HeightRequest">33</property>
|
||||||
|
<property name="Xpad">15</property>
|
||||||
|
<property name="LabelProp" translatable="yes"><big>00.0</big></property>
|
||||||
|
<property name="UseMarkup">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="PackType">End</property>
|
||||||
|
<property name="Position">2</property>
|
||||||
|
<property name="AutoSize">False</property>
|
||||||
|
<property name="Expand">False</property>
|
||||||
|
<property name="Fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</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.Toolbar" id="toolbar">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="ShowArrow">False</property>
|
||||||
|
<property name="ButtonStyle">Icons</property>
|
||||||
|
<property name="IconSize">SmallToolbar</property>
|
||||||
|
<node name="toolbar" type="Toolbar">
|
||||||
|
<node type="Toolitem" action="goForwardAction" />
|
||||||
|
<node type="Toolitem" action="goBackAction" />
|
||||||
|
<node type="Toolitem" action="mediaPauseAction" />
|
||||||
|
<node type="Toolitem" action="btnAjoutLigne" />
|
||||||
|
<node type="Toolitem" action="btnRetireligne" />
|
||||||
|
<node type="Toolitem" action="Action" />
|
||||||
|
</node>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="Position">1</property>
|
||||||
|
<property name="AutoSize">True</property>
|
||||||
|
<property name="Expand">False</property>
|
||||||
|
<property name="Fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="Position">0</property>
|
||||||
|
<property name="AutoSize">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Toolbar" id="toolbar1">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="Orientation">Vertical</property>
|
||||||
|
<property name="ShowArrow">False</property>
|
||||||
|
<property name="ButtonStyle">Icons</property>
|
||||||
|
<property name="IconSize">SmallToolbar</property>
|
||||||
|
<node name="toolbar1" type="Toolbar">
|
||||||
|
<node type="Toolitem" action="closeAction" />
|
||||||
|
</node>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="PackType">End</property>
|
||||||
|
<property name="Position">1</property>
|
||||||
|
<property name="AutoSize">True</property>
|
||||||
|
<property name="Expand">False</property>
|
||||||
|
<property name="Fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</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.ScrolledWindow" id="scrolledwindow1">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="CanFocus">True</property>
|
||||||
|
<property name="ShadowType">In</property>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.TreeView" id="cmdList">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="CanFocus">True</property>
|
||||||
|
<property name="RulesHint">True</property>
|
||||||
|
<signal name="CursorChanged" handler="OnCmdListeCursorChanged" />
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="Position">1</property>
|
||||||
|
<property name="AutoSize">True</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="Gtk.Label" id="titreLabel">
|
||||||
|
<property name="MemberName" />
|
||||||
|
<property name="LabelProp" translatable="yes">Séquenceur Midi</property>
|
||||||
|
<property name="UseMarkup">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="type">label_item</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<widget class="Gtk.Bin" id="DMX2.SeqOscUI" design-size="924 467">
|
||||||
|
<action-group name="Default">
|
||||||
|
<action id="closeAction">
|
||||||
|
<property name="Type">Toggle</property>
|
||||||
|
<property name="Label" translatable="yes"> </property>
|
||||||
|
<property name="ShortLabel" translatable="yes"> </property>
|
||||||
|
<property name="StockId">gtk-close</property>
|
||||||
|
<property name="DrawAsRadio">False</property>
|
||||||
|
<property name="Active">False</property>
|
||||||
|
<signal name="Activated" handler="OnCloseActionActivated" />
|
||||||
</action>
|
</action>
|
||||||
<action id="goForwardAction">
|
<action id="goForwardAction">
|
||||||
<property name="Type">Action</property>
|
<property name="Type">Action</property>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue