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

Change couleur barre en bas pour état specifiques : moins moche

Browse source
This commit is contained in:
tzim 2013-11-04 16:19:30 +00:00
parent 5f5447cba8
commit 29f3503d0c
4 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
DMX-2.0/MainWindow.cs
View file

@ -200,6 +200,7 @@ namespace DMX2
protected void OnBtnRetireLigneClicked (object sender, EventArgs e) protected void OnBtnRetireLigneClicked (object sender, EventArgs e)
{ {
if(IndexEffetSelectionne()==-1) return;
Conduite.Courante.SequenceurMaitre.RetireLigne(IndexEffetSelectionne()); Conduite.Courante.SequenceurMaitre.RetireLigne(IndexEffetSelectionne());
FillMatrice(); FillMatrice();
} }
@ -597,21 +598,21 @@ namespace DMX2
if (Conduite.Courante.BlackOut) { if (Conduite.Courante.BlackOut) {
ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 100, 100)); evInfo.ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 100, 100));
return; return;
} }
if (Conduite.Courante.Pause) { if (Conduite.Courante.Pause) {
ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 255, 100)); evInfo.ModifyBg (Gtk.StateType.Normal,new Gdk.Color (255, 255, 100));
return; return;
} }
if (Conduite.Courante.Master != 100) { if (Conduite.Courante.Master != 100) {
ModifyBg (Gtk.StateType.Normal,new Gdk.Color (205, 205, 255)); evInfo.ModifyBg (Gtk.StateType.Normal,new Gdk.Color (205, 205, 255));
return; return;
} }
ModifyBg (Gtk.StateType.Normal, defStyle.Background(StateType.Normal) ); evInfo.ModifyBg (Gtk.StateType.Normal, defStyle.Background(StateType.Normal) );
} }

1
DMX-2.0/SequenceurMaitre.cs
View file

@ -198,6 +198,7 @@ namespace DMX2
public void RetireLigne (int pos) public void RetireLigne (int pos)
{ {
lock (this) { lock (this) {
if(pos<0 || pos >= lignes.Count) return;
if(lignes[pos]== enCours) if(lignes[pos]== enCours)
{ {
enCours=null; enCours=null;

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

@ -44,7 +44,8 @@ namespace DMX2
private global::Gtk.HSeparator hseparator1; private global::Gtk.HSeparator hseparator1;
private global::Gtk.HBox hbox4; private global::Gtk.HBox hbox4;
private global::Gtk.Toolbar toolbar7; private global::Gtk.Toolbar toolbar7;
private global::Gtk.Fixed fixed5; private global::Gtk.EventBox evInfo;
private global::Gtk.Label label2;
private global::Gtk.Toolbar toolbar8; private global::Gtk.Toolbar toolbar8;
protected virtual void Build () protected virtual void Build ()
@ -387,12 +388,16 @@ namespace DMX2
w71.Expand = false; w71.Expand = false;
w71.Fill = false; w71.Fill = false;
// Container child hbox4.Gtk.Box+BoxChild // Container child hbox4.Gtk.Box+BoxChild
this.fixed5 = new global::Gtk.Fixed (); this.evInfo = new global::Gtk.EventBox ();
this.fixed5.Name = "fixed5"; this.evInfo.Name = "evInfo";
this.fixed5.HasWindow = false; // Container child evInfo.Gtk.Container+ContainerChild
this.hbox4.Add (this.fixed5); this.label2 = new global::Gtk.Label ();
global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.fixed5])); this.label2.Name = "label2";
w72.Position = 1; this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("info");
this.evInfo.Add (this.label2);
this.hbox4.Add (this.evInfo);
global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
w73.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")));
@ -400,15 +405,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 w73 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8])); global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
w73.Position = 2;
w73.Expand = false;
w73.Fill = false;
this.vbox1.Add (this.hbox4);
global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
w74.Position = 2; w74.Position = 2;
w74.Expand = false; w74.Expand = false;
w74.Fill = false; w74.Fill = false;
this.vbox1.Add (this.hbox4);
global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
w75.Position = 2;
w75.Expand = false;
w75.Fill = false;
this.Add (this.vbox1); this.Add (this.vbox1);
if ((this.Child != null)) { if ((this.Child != null)) {
this.Child.ShowAll (); this.Child.ShowAll ();

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

@ -474,9 +474,14 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="Gtk.Fixed" id="fixed5"> <widget class="Gtk.EventBox" id="evInfo">
<property name="MemberName" /> <property name="MemberName" />
<property name="HasWindow">False</property> <child>
<widget class="Gtk.Label" id="label2">
<property name="MemberName" />
<property name="LabelProp" translatable="yes">info</property>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="Position">1</property> <property name="Position">1</property>