tzim/loupiottes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

macro

Browse source
This commit is contained in:
manu 2013-10-20 19:55:25 +00:00
parent a9983c69bf
commit f0551512bc
4 changed files with 237 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DMX-2.0/DMX-2.0.csproj
View file

@ -108,6 +108,9 @@
<Compile Include="DriverBoitierV1.cs" /> <Compile Include="DriverBoitierV1.cs" />
<Compile Include="SequenceurMaitre.cs" /> <Compile Include="SequenceurMaitre.cs" />
<Compile Include="ErreurLectureFichier.cs" /> <Compile Include="ErreurLectureFichier.cs" />
<Compile Include="SequenceurMacro.cs" />
<Compile Include="SeqMacroUI.cs" />
<Compile Include="gtk-gui\DMX2.SeqMacroUI.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>

12
DMX-2.0/MainWindow.cs
View file

@ -37,7 +37,6 @@ namespace DMX2
idCol.Title = "Num"; idCol.Title = "Num";
idCol.PackStart (idCell, true); idCol.PackStart (idCell, true);
idCol.SetCellDataFunc (idCell, new Gtk.TreeCellDataFunc (RenderMatriceNum)); idCol.SetCellDataFunc (idCell, new Gtk.TreeCellDataFunc (RenderMatriceNum));
this.MatriceUI.AppendColumn (idCol); this.MatriceUI.AppendColumn (idCol);
var nomCol = new Gtk.TreeViewColumn (); var nomCol = new Gtk.TreeViewColumn ();
@ -423,6 +422,14 @@ namespace DMX2
AddSeqUI(s); AddSeqUI(s);
} }
protected void OnSeqMacroActionActivated (object sender, EventArgs e)
{
Sequenceur s = new SequenceurMacro();
Conduite.Courante.AjoutSequenceur(s);
AddSeqUI(s);
NextUpdateFull();
}
#endregion #endregion
#region Gestion de l'affichage #region Gestion de l'affichage
@ -561,9 +568,6 @@ namespace DMX2
Conduite.Courante.Drivers.Add( new DriverBoitierV1()); Conduite.Courante.Drivers.Add( new DriverBoitierV1());
} protected void OnSeqMacroActionActivated (object sender, EventArgs e)
{
throw new System.NotImplementedException ();
} }

2
DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs
View file

@ -131,7 +131,7 @@ namespace DMX2
this.seqMasterScale.Adjustment.Upper = 100; this.seqMasterScale.Adjustment.Upper = 100;
this.seqMasterScale.Adjustment.PageIncrement = 10; this.seqMasterScale.Adjustment.PageIncrement = 10;
this.seqMasterScale.Adjustment.StepIncrement = 1; this.seqMasterScale.Adjustment.StepIncrement = 1;
this.seqMasterScale.Adjustment.Value = 100; this.seqMasterScale.Adjustment.Value = 87;
this.seqMasterScale.DrawValue = true; this.seqMasterScale.DrawValue = true;
this.seqMasterScale.Digits = 0; this.seqMasterScale.Digits = 0;
this.seqMasterScale.ValuePos = ((global::Gtk.PositionType)(1)); this.seqMasterScale.ValuePos = ((global::Gtk.PositionType)(1));

225
DMX-2.0/gtk-gui/gui.stetic
View file

@ -785,7 +785,7 @@
<property name="Upper">100</property> <property name="Upper">100</property>
<property name="PageIncrement">10</property> <property name="PageIncrement">10</property>
<property name="StepIncrement">1</property> <property name="StepIncrement">1</property>
<property name="Value">100</property> <property name="Value">87</property>
<property name="DrawValue">True</property> <property name="DrawValue">True</property>
<property name="Digits">0</property> <property name="Digits">0</property>
<property name="ValuePos">Right</property> <property name="ValuePos">Right</property>
@ -1538,4 +1538,227 @@
</widget> </widget>
</child> </child>
</widget> </widget>
<widget class="Gtk.Bin" id="DMX2.SeqMacroUI" design-size="474 402">
<action-group name="Default">
<action id="goForwardAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-go-forward</property>
</action>
<action id="goBackAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-go-back</property>
</action>
<action id="mediaPauseAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-media-pause</property>
</action>
<action id="mediaNextAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-media-next</property>
</action>
<action id="closeAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes"> </property>
<property name="ShortLabel" translatable="yes">_</property>
<property name="StockId">gtk-close</property>
</action>
<action id="circuitsAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">circuits</property>
</action>
<action id="addAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-add</property>
</action>
<action id="removeAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-remove</property>
</action>
</action-group>
<property name="MemberName" />
<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.VBox" id="vbox2">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
<widget class="Gtk.HBox" id="hbox146">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
<widget class="Gtk.VBox" id="vbox3">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
<widget class="Gtk.HBox" id="hbox2">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
<widget class="Gtk.Label" id="posLabel">
<property name="MemberName" />
<property name="LabelProp" translatable="yes">n° 0</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="label3">
<property name="MemberName" />
<property name="LabelProp" translatable="yes">0.00</property>
</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.HScale" id="hscale1">
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Upper">100</property>
<property name="PageIncrement">10</property>
<property name="StepIncrement">1</property>
<property name="Value">100</property>
<property name="DrawValue">True</property>
<property name="Digits">0</property>
<property name="ValuePos">Right</property>
</widget>
<packing>
<property name="Position">1</property>
<property name="AutoSize">True</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
</packing>
</child>
<child>
<widget class="Gtk.ProgressBar" id="progressbar1">
<property name="MemberName" />
</widget>
<packing>
<property name="Position">2</property>
<property name="AutoSize">True</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
</packing>
</child>
<child>
<widget class="Gtk.Toolbar" id="toolbar1">
<property name="MemberName" />
<property name="ShowArrow">False</property>
<node name="toolbar1" type="Toolbar">
<node type="Toolitem" action="goForwardAction" />
<node type="Toolitem" action="goBackAction" />
<node type="Toolitem" action="mediaPauseAction" />
<node type="Toolitem" action="mediaNextAction" />
<node type="Toolitem" action="addAction" />
<node type="Toolitem" action="removeAction" />
</node>
</widget>
<packing>
<property name="PackType">End</property>
<property name="Position">3</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.Toolbar" id="toolbar2">
<property name="MemberName" />
<property name="Orientation">Vertical</property>
<property name="ShowArrow">False</property>
<node name="toolbar2" type="Toolbar">
<node type="Toolitem" action="closeAction" />
<node type="Toolitem" action="circuitsAction" />
</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="scrolledwindow5">
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="ShadowType">In</property>
<child>
<widget class="Gtk.TreeView" id="MatriceUI">
<property name="MemberName" />
<property name="CanFocus">True</property>
</widget>
</child>
</widget>
<packing>
<property name="Position">1</property>
<property name="AutoSize">True</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="Gtk.Label" id="GtkLabel3">
<property name="MemberName" />
<property name="LabelProp" translatable="yes">Séquenceur Macro</property>
<property name="UseMarkup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget>
</child>
</widget>
</stetic-interface> </stetic-interface>