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

Browse source
This commit is contained in:
manu 2013-10-17 19:24:11 +00:00
parent 9775cd0bbe
commit 3f5a3aaf94
4 changed files with 80 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DMX-2.0/MainWindow.cs
View file

@ -455,6 +455,7 @@ namespace DMX2
if(sequi != null) sequi.Update(fullUpdateFlag); if(sequi != null) sequi.Update(fullUpdateFlag);
} }
MajCircuits(fullUpdateFlag); MajCircuits(fullUpdateFlag);
timeLabel.LabelProp = string.Format (@"<big>{0:0\.0}</big>", Conduite.Courante.SequenceurMaitre.TimeStamp.TotalMilliseconds / 100);
if(fullUpdateFlag) ConstruitMatriceSeqColumns(); if(fullUpdateFlag) ConstruitMatriceSeqColumns();
if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw(); if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw();
fullUpdateFlag=false; fullUpdateFlag=false;

6
DMX-2.0/SequenceurMaitre.cs
View file

@ -85,6 +85,12 @@ namespace DMX2
bool change = false; bool change = false;
public TimeSpan TimeStamp {
get {
return timeStamp;
}
}
public int IndexLigneEnCours public int IndexLigneEnCours
{ {
get { get {

98
DMX-2.0/gtk-gui/DMX2.MainWindow.cs
View file

@ -31,6 +31,7 @@ namespace DMX2
private global::Gtk.ToggleButton togglebutton2; private global::Gtk.ToggleButton togglebutton2;
private global::Gtk.ToggleButton togglebutton1; private global::Gtk.ToggleButton togglebutton1;
private global::Gtk.ToggleButton togglebutton3; private global::Gtk.ToggleButton togglebutton3;
private global::Gtk.Label timeLabel;
private global::Gtk.VScale masterScale; private global::Gtk.VScale masterScale;
private global::Gtk.VSeparator vseparator1; private global::Gtk.VSeparator vseparator1;
private global::Gtk.HPaned hpaned1; private global::Gtk.HPaned hpaned1;
@ -287,6 +288,19 @@ namespace DMX2
w64.Expand = false; w64.Expand = false;
w64.Fill = false; w64.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild // Container child vbox2.Gtk.Box+BoxChild
this.timeLabel = new global::Gtk.Label ();
this.timeLabel.Name = "timeLabel";
this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<big>0.00</big>");
this.timeLabel.UseMarkup = true;
this.timeLabel.Justify = ((global::Gtk.Justification)(2));
this.timeLabel.Angle = 90;
this.vbox2.Add (this.timeLabel);
global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.timeLabel]));
w65.Position = 7;
w65.Expand = false;
w65.Fill = false;
w65.Padding = ((uint)(10));
// Container child vbox2.Gtk.Box+BoxChild
this.masterScale = new global::Gtk.VScale (null); this.masterScale = new global::Gtk.VScale (null);
this.masterScale.HeightRequest = 150; this.masterScale.HeightRequest = 150;
this.masterScale.Name = "masterScale"; this.masterScale.Name = "masterScale";
@ -299,23 +313,23 @@ namespace DMX2
this.masterScale.Digits = 0; this.masterScale.Digits = 0;
this.masterScale.ValuePos = ((global::Gtk.PositionType)(2)); this.masterScale.ValuePos = ((global::Gtk.PositionType)(2));
this.vbox2.Add (this.masterScale); this.vbox2.Add (this.masterScale);
global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale])); global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale]));
w65.Position = 7; w66.Position = 8;
w65.Expand = false;
w65.Fill = false;
this.hbox1.Add (this.vbox2);
global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
w66.Position = 0;
w66.Expand = false; w66.Expand = false;
w66.Fill = false; w66.Fill = false;
this.hbox1.Add (this.vbox2);
global::Gtk.Box.BoxChild w67 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2]));
w67.Position = 0;
w67.Expand = false;
w67.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild // Container child hbox1.Gtk.Box+BoxChild
this.vseparator1 = new global::Gtk.VSeparator (); this.vseparator1 = new global::Gtk.VSeparator ();
this.vseparator1.Name = "vseparator1"; this.vseparator1.Name = "vseparator1";
this.hbox1.Add (this.vseparator1); this.hbox1.Add (this.vseparator1);
global::Gtk.Box.BoxChild w67 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1])); global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1]));
w67.Position = 1; w68.Position = 1;
w67.Expand = false; w68.Expand = false;
w67.Fill = false; w68.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild // Container child hbox1.Gtk.Box+BoxChild
this.hpaned1 = new global::Gtk.HPaned (); this.hpaned1 = new global::Gtk.HPaned ();
this.hpaned1.CanFocus = true; this.hpaned1.CanFocus = true;
@ -336,8 +350,8 @@ namespace DMX2
this.MatriceUI.Name = "MatriceUI"; this.MatriceUI.Name = "MatriceUI";
this.GtkScrolledWindow2.Add (this.MatriceUI); this.GtkScrolledWindow2.Add (this.MatriceUI);
this.hpaned2.Add (this.GtkScrolledWindow2); this.hpaned2.Add (this.GtkScrolledWindow2);
global::Gtk.Paned.PanedChild w69 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2])); global::Gtk.Paned.PanedChild w70 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2]));
w69.Resize = false; w70.Resize = false;
// Container child hpaned2.Gtk.Paned+PanedChild // Container child hpaned2.Gtk.Paned+PanedChild
this.onglets = new global::Gtk.Notebook (); this.onglets = new global::Gtk.Notebook ();
this.onglets.CanFocus = true; this.onglets.CanFocus = true;
@ -345,8 +359,8 @@ namespace DMX2
this.onglets.CurrentPage = 1; this.onglets.CurrentPage = 1;
this.hpaned2.Add (this.onglets); this.hpaned2.Add (this.onglets);
this.hpaned1.Add (this.hpaned2); this.hpaned1.Add (this.hpaned2);
global::Gtk.Paned.PanedChild w71 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); global::Gtk.Paned.PanedChild w72 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
w71.Resize = false; w72.Resize = false;
// Container child hpaned1.Gtk.Paned+PanedChild // Container child hpaned1.Gtk.Paned+PanedChild
this.scrolledwindow2 = new global::Gtk.ScrolledWindow (); this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
this.scrolledwindow2.WidthRequest = 150; this.scrolledwindow2.WidthRequest = 150;
@ -354,32 +368,32 @@ namespace DMX2
this.scrolledwindow2.Name = "scrolledwindow2"; this.scrolledwindow2.Name = "scrolledwindow2";
this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1)); this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child scrolledwindow2.Gtk.Container+ContainerChild // Container child scrolledwindow2.Gtk.Container+ContainerChild
global::Gtk.Viewport w72 = new global::Gtk.Viewport (); global::Gtk.Viewport w73 = new global::Gtk.Viewport ();
w72.ShadowType = ((global::Gtk.ShadowType)(0)); w73.ShadowType = ((global::Gtk.ShadowType)(0));
// Container child GtkViewport1.Gtk.Container+ContainerChild // Container child GtkViewport1.Gtk.Container+ContainerChild
this.vboxCircuits = new global::Gtk.VBox (); this.vboxCircuits = new global::Gtk.VBox ();
this.vboxCircuits.Name = "vboxCircuits"; this.vboxCircuits.Name = "vboxCircuits";
this.vboxCircuits.Spacing = 2; this.vboxCircuits.Spacing = 2;
w72.Add (this.vboxCircuits); w73.Add (this.vboxCircuits);
this.scrolledwindow2.Add (w72); this.scrolledwindow2.Add (w73);
this.hpaned1.Add (this.scrolledwindow2); this.hpaned1.Add (this.scrolledwindow2);
global::Gtk.Paned.PanedChild w75 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); global::Gtk.Paned.PanedChild w76 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
w75.Resize = false; w76.Resize = false;
w75.Shrink = false; w76.Shrink = false;
this.hbox1.Add (this.hpaned1); this.hbox1.Add (this.hpaned1);
global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
w76.Position = 2; w77.Position = 2;
this.vbox1.Add (this.hbox1); this.vbox1.Add (this.hbox1);
global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
w77.Position = 0; w78.Position = 0;
// Container child vbox1.Gtk.Box+BoxChild // Container child vbox1.Gtk.Box+BoxChild
this.hseparator1 = new global::Gtk.HSeparator (); this.hseparator1 = new global::Gtk.HSeparator ();
this.hseparator1.Name = "hseparator1"; this.hseparator1.Name = "hseparator1";
this.vbox1.Add (this.hseparator1); this.vbox1.Add (this.hseparator1);
global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
w78.Position = 1; w79.Position = 1;
w78.Expand = false; w79.Expand = false;
w78.Fill = false; w79.Fill = false;
// Container child vbox1.Gtk.Box+BoxChild // Container child vbox1.Gtk.Box+BoxChild
this.hbox4 = new global::Gtk.HBox (); this.hbox4 = new global::Gtk.HBox ();
this.hbox4.Name = "hbox4"; this.hbox4.Name = "hbox4";
@ -390,17 +404,17 @@ namespace DMX2
this.toolbar7.Name = "toolbar7"; this.toolbar7.Name = "toolbar7";
this.toolbar7.ShowArrow = false; this.toolbar7.ShowArrow = false;
this.hbox4.Add (this.toolbar7); this.hbox4.Add (this.toolbar7);
global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
w79.Position = 0; w80.Position = 0;
w79.Expand = false; w80.Expand = false;
w79.Fill = false; w80.Fill = false;
// Container child hbox4.Gtk.Box+BoxChild // Container child hbox4.Gtk.Box+BoxChild
this.fixed5 = new global::Gtk.Fixed (); this.fixed5 = new global::Gtk.Fixed ();
this.fixed5.Name = "fixed5"; this.fixed5.Name = "fixed5";
this.fixed5.HasWindow = false; this.fixed5.HasWindow = false;
this.hbox4.Add (this.fixed5); this.hbox4.Add (this.fixed5);
global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5])); global::Gtk.Box.BoxChild w81 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5]));
w80.Position = 1; w81.Position = 1;
// Container child hbox4.Gtk.Box+BoxChild // Container child hbox4.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar8'><toolitem name='newAction' action='newAction'/><toolitem name='openAction' action='openAction'/><toolitem name='saveAction' action='saveAction'/><toolitem name='saveAsAction' action='saveAsAction'/><toolitem name='closeAction' action='closeAction'/><toolitem name='quitAction' action='quitAction'/></toolbar></ui>"); this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar8'><toolitem name='newAction' action='newAction'/><toolitem name='openAction' action='openAction'/><toolitem name='saveAction' action='saveAction'/><toolitem name='saveAsAction' action='saveAsAction'/><toolitem name='closeAction' action='closeAction'/><toolitem name='quitAction' action='quitAction'/></toolbar></ui>");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8"))); this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
@ -408,15 +422,15 @@ namespace DMX2
this.toolbar8.ShowArrow = false; this.toolbar8.ShowArrow = false;
this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
this.hbox4.Add (this.toolbar8); this.hbox4.Add (this.toolbar8);
global::Gtk.Box.BoxChild w81 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8])); global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
w81.Position = 2;
w81.Expand = false;
w81.Fill = false;
this.vbox1.Add (this.hbox4);
global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
w82.Position = 2; w82.Position = 2;
w82.Expand = false; w82.Expand = false;
w82.Fill = false; w82.Fill = false;
this.vbox1.Add (this.hbox4);
global::Gtk.Box.BoxChild w83 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
w83.Position = 2;
w83.Expand = false;
w83.Fill = false;
this.Add (this.vbox1); this.Add (this.vbox1);
if ((this.Child != null)) { if ((this.Child != null)) {
this.Child.ShowAll (); this.Child.ShowAll ();

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

@ -304,6 +304,22 @@
<property name="Fill">False</property> <property name="Fill">False</property>
</packing> </packing>
</child> </child>
<child>
<widget class="Gtk.Label" id="timeLabel">
<property name="MemberName" />
<property name="LabelProp" translatable="yes">&lt;big&gt;0.00&lt;/big&gt;</property>
<property name="UseMarkup">True</property>
<property name="Justify">Center</property>
<property name="Angle">90</property>
</widget>
<packing>
<property name="Position">7</property>
<property name="AutoSize">True</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
<property name="Padding">10</property>
</packing>
</child>
<child> <child>
<widget class="Gtk.VScale" id="masterScale"> <widget class="Gtk.VScale" id="masterScale">
<property name="MemberName" /> <property name="MemberName" />
@ -319,7 +335,7 @@
<signal name="ValueChanged" handler="OnMasterScaleValueChanged" /> <signal name="ValueChanged" handler="OnMasterScaleValueChanged" />
</widget> </widget>
<packing> <packing>
<property name="Position">7</property> <property name="Position">8</property>
<property name="AutoSize">False</property> <property name="AutoSize">False</property>
<property name="Expand">False</property> <property name="Expand">False</property>
<property name="Fill">False</property> <property name="Fill">False</property>