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

* DMX2.SeqMacroUI.cs:

Browse source 
* SeqMacroUI.cs:
* gui.stetic: Modif sur label macro
This commit is contained in:
tzim 2014-02-11 14:53:46 +00:00
parent 4090b74337
commit f7a7920bce
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
DMX-2.0/SeqMacroUI.cs
View file

@ -299,9 +299,9 @@ namespace DMX2
if (DateTime.Now > nextMaj ) { if (DateTime.Now > nextMaj ) {
nextMaj = DateTime.Now.AddMilliseconds(500); nextMaj = DateTime.Now.AddMilliseconds(500);
StringBuilder str = new StringBuilder (); StringBuilder str = new StringBuilder ();
bool a = false; bool a = false; int val;
foreach (Circuit c in sequenceur.Circuits) { foreach (Circuit c in sequenceur.Circuits) {
if (sequenceur.ValeurCircuit (c) > 0) { if ((val=sequenceur.ValeurCircuit (c)) > 0) {
if (sequenceur.EstActif (c) != a) { if (sequenceur.EstActif (c) != a) {
if(!a){ if(!a){
str.Append ("<span foreground='#FF8888'>"); str.Append ("<span foreground='#FF8888'>");
@ -311,7 +311,7 @@ namespace DMX2
a = false; a = false;
} }
} }
str.Append (c.ID); str.Append (' '); str.Append (string.Format("{0}({1}) ",c.ID,val));
} }
} }
if (a) { if (a) {
@ -422,8 +422,15 @@ namespace DMX2
{ {
sequenceur.CommandDirecte(txtCommand.Text ); sequenceur.CommandDirecte(txtCommand.Text );
}
protected void OnHbox2SizeAllocated (object o, SizeAllocatedArgs args)
{
actLabel.SetSizeRequest ( Math.Max(50, args.Allocation.Width - posLabel.Allocation.Width - timeLabel.Allocation.Width - 50),-1);
} }
} }
} }

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

@ -87,6 +87,7 @@ namespace DMX2
this.evBBox.Name = "evBBox"; this.evBBox.Name = "evBBox";
// Container child evBBox.Gtk.Container+ContainerChild // Container child evBBox.Gtk.Container+ContainerChild
this.hbox2 = new global::Gtk.HBox (); this.hbox2 = new global::Gtk.HBox ();
this.hbox2.WidthRequest = 300;
this.hbox2.Name = "hbox2"; this.hbox2.Name = "hbox2";
this.hbox2.Spacing = 6; this.hbox2.Spacing = 6;
// Container child hbox2.Gtk.Box+BoxChild // Container child hbox2.Gtk.Box+BoxChild
@ -257,6 +258,7 @@ namespace DMX2
this.mediaPauseAction.Activated += new global::System.EventHandler (this.OnMediaPauseActionActivated); this.mediaPauseAction.Activated += new global::System.EventHandler (this.OnMediaPauseActionActivated);
this.btnAjoutLigne.Activated += new global::System.EventHandler (this.OnBtnAjoutLigneActivated); this.btnAjoutLigne.Activated += new global::System.EventHandler (this.OnBtnAjoutLigneActivated);
this.btnRetireligne.Activated += new global::System.EventHandler (this.OnRemoveLigneActivated); this.btnRetireligne.Activated += new global::System.EventHandler (this.OnRemoveLigneActivated);
this.hbox2.SizeAllocated += new global::Gtk.SizeAllocatedHandler (this.OnHbox2SizeAllocated);
this.seqMasterScale.ValueChanged += new global::System.EventHandler (this.OnSeqMasterScaleValueChanged); this.seqMasterScale.ValueChanged += new global::System.EventHandler (this.OnSeqMasterScaleValueChanged);
this.btnCommand.Clicked += new global::System.EventHandler (this.OnBtnCommandClicked); this.btnCommand.Clicked += new global::System.EventHandler (this.OnBtnCommandClicked);
this.effetsListe.CursorChanged += new global::System.EventHandler (this.OnEffetsListeCursorChanged); this.effetsListe.CursorChanged += new global::System.EventHandler (this.OnEffetsListeCursorChanged);

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

@ -1668,7 +1668,9 @@ au sequenceur</property>
<child> <child>
<widget class="Gtk.HBox" id="hbox2"> <widget class="Gtk.HBox" id="hbox2">
<property name="MemberName" /> <property name="MemberName" />
<property name="WidthRequest">300</property>
<property name="Spacing">6</property> <property name="Spacing">6</property>
<signal name="SizeAllocated" handler="OnHbox2SizeAllocated" />
<child> <child>
<widget class="Gtk.Label" id="posLabel"> <widget class="Gtk.Label" id="posLabel">
<property name="MemberName" /> <property name="MemberName" />