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

Ajout rappel seq maitre en cours

Browse source
This commit is contained in:
tzim 2015-04-11 21:41:44 +00:00
parent 89cc575322
commit 855d31fa84
4 changed files with 112 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
DMX-2.0/MainWindow.cs
View file

@ -598,7 +598,15 @@ namespace DMX2
lblPage.LabelProp = Conduite.Courante.Midi.CurrentPage.ToString(); lblPage.LabelProp = Conduite.Courante.Midi.CurrentPage.ToString();
if(fullUpdateFlag) ConstruitMatriceSeqColumns(); if(fullUpdateFlag) ConstruitMatriceSeqColumns();
if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw(); if (Conduite.Courante.SequenceurMaitre.EffetChange ()) {
MatriceUI.QueueDraw ();
int l = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours;
if (l < Conduite.Courante.SequenceurMaitre.Lignes.Count && l >= 0) {
labelMasterPos.LabelProp =
(l + 1).ToString () + " - " +
Conduite.Courante.SequenceurMaitre.Lignes[l].Nom;
}
}
fullUpdateFlag=false; fullUpdateFlag=false;
masterScale.Value = Conduite.Courante.Master; masterScale.Value = Conduite.Courante.Master;
updScheduled=false; updScheduled=false;

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

@ -48,6 +48,9 @@ namespace DMX2
private global::Gtk.VSeparator vseparator1; private global::Gtk.VSeparator vseparator1;
private global::Gtk.HPaned hpaned1; private global::Gtk.HPaned hpaned1;
private global::Gtk.HPaned hpaned2; private global::Gtk.HPaned hpaned2;
private global::Gtk.VBox vbox4;
private global::Gtk.EventBox evBBox2;
private global::Gtk.Label labelMasterPos;
private global::Gtk.ScrolledWindow GtkScrolledWindow2; private global::Gtk.ScrolledWindow GtkScrolledWindow2;
private global::Gtk.NodeView MatriceUI; private global::Gtk.NodeView MatriceUI;
private global::Gtk.ScrolledWindow scrolledwindow2; private global::Gtk.ScrolledWindow scrolledwindow2;
@ -392,6 +395,25 @@ namespace DMX2
this.hpaned2.Name = "hpaned2"; this.hpaned2.Name = "hpaned2";
this.hpaned2.Position = 177; this.hpaned2.Position = 177;
// Container child hpaned2.Gtk.Paned+PanedChild // Container child hpaned2.Gtk.Paned+PanedChild
this.vbox4 = new global::Gtk.VBox ();
this.vbox4.Name = "vbox4";
this.vbox4.Spacing = 6;
// Container child vbox4.Gtk.Box+BoxChild
this.evBBox2 = new global::Gtk.EventBox ();
this.evBBox2.Name = "evBBox2";
// Container child evBBox2.Gtk.Container+ContainerChild
this.labelMasterPos = new global::Gtk.Label ();
this.labelMasterPos.Name = "labelMasterPos";
this.labelMasterPos.Xpad = 4;
this.labelMasterPos.Ypad = 4;
this.labelMasterPos.Xalign = 0F;
this.evBBox2.Add (this.labelMasterPos);
this.vbox4.Add (this.evBBox2);
global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.evBBox2]));
w66.Position = 0;
w66.Expand = false;
w66.Fill = false;
// Container child vbox4.Gtk.Box+BoxChild
this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow ();
this.GtkScrolledWindow2.Name = "GtkScrolledWindow2"; this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1)); this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
@ -401,12 +423,15 @@ namespace DMX2
this.MatriceUI.Name = "MatriceUI"; this.MatriceUI.Name = "MatriceUI";
this.MatriceUI.RulesHint = true; this.MatriceUI.RulesHint = true;
this.GtkScrolledWindow2.Add (this.MatriceUI); this.GtkScrolledWindow2.Add (this.MatriceUI);
this.hpaned2.Add (this.GtkScrolledWindow2); this.vbox4.Add (this.GtkScrolledWindow2);
global::Gtk.Paned.PanedChild w66 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2])); global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkScrolledWindow2]));
w66.Resize = false; w68.Position = 1;
this.hpaned2.Add (this.vbox4);
global::Gtk.Paned.PanedChild w69 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.vbox4]));
w69.Resize = false;
this.hpaned1.Add (this.hpaned2); this.hpaned1.Add (this.hpaned2);
global::Gtk.Paned.PanedChild w67 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); global::Gtk.Paned.PanedChild w70 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
w67.Resize = false; w70.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;
@ -414,32 +439,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 w68 = new global::Gtk.Viewport (); global::Gtk.Viewport w71 = new global::Gtk.Viewport ();
w68.ShadowType = ((global::Gtk.ShadowType)(0)); w71.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;
w68.Add (this.vboxCircuits); w71.Add (this.vboxCircuits);
this.scrolledwindow2.Add (w68); this.scrolledwindow2.Add (w71);
this.hpaned1.Add (this.scrolledwindow2); this.hpaned1.Add (this.scrolledwindow2);
global::Gtk.Paned.PanedChild w71 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); global::Gtk.Paned.PanedChild w74 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
w71.Resize = false; w74.Resize = false;
w71.Shrink = false; w74.Shrink = false;
this.hbox1.Add (this.hpaned1); this.hbox1.Add (this.hpaned1);
global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
w72.Position = 2; w75.Position = 2;
this.vbox1.Add (this.hbox1); this.vbox1.Add (this.hbox1);
global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
w73.Position = 0; w76.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 w74 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
w74.Position = 1; w77.Position = 1;
w74.Expand = false; w77.Expand = false;
w74.Fill = false; w77.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";
@ -450,10 +475,10 @@ 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 w75 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
w75.Position = 0; w78.Position = 0;
w75.Expand = false; w78.Expand = false;
w75.Fill = false; w78.Fill = false;
// Container child hbox4.Gtk.Box+BoxChild // Container child hbox4.Gtk.Box+BoxChild
this.evInfo = new global::Gtk.EventBox (); this.evInfo = new global::Gtk.EventBox ();
this.evInfo.Name = "evInfo"; this.evInfo.Name = "evInfo";
@ -463,8 +488,8 @@ namespace DMX2
this.lblInfo.LabelProp = "info"; this.lblInfo.LabelProp = "info";
this.evInfo.Add (this.lblInfo); this.evInfo.Add (this.lblInfo);
this.hbox4.Add (this.evInfo); this.hbox4.Add (this.evInfo);
global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
w77.Position = 1; w80.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='aboutAction' action='aboutAction'/><toolitem name='quitAction' action='quitAction'/><toolitem name='selectColorAction2' action='selectColorAction2'/></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='aboutAction' action='aboutAction'/><toolitem name='quitAction' action='quitAction'/><toolitem name='selectColorAction2' action='selectColorAction2'/></toolbar></ui>");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8"))); this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
@ -472,15 +497,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 w78 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8])); global::Gtk.Box.BoxChild w81 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
w78.Position = 2; w81.Position = 2;
w78.Expand = false; w81.Expand = false;
w78.Fill = false; w81.Fill = false;
this.vbox1.Add (this.hbox4); this.vbox1.Add (this.hbox4);
global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4])); global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
w79.Position = 2; w82.Position = 2;
w79.Expand = false; w82.Expand = false;
w79.Fill = false; w82.Fill = false;
this.Add (this.vbox1); this.Add (this.vbox1);
if ((this.Child != null)) { if ((this.Child != null)) {
this.Child.ShowAll (); this.Child.ShowAll ();

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

@ -477,6 +477,29 @@ page</property>
<property name="MemberName" /> <property name="MemberName" />
<property name="CanFocus">True</property> <property name="CanFocus">True</property>
<property name="Position">177</property> <property name="Position">177</property>
<child>
<widget class="Gtk.VBox" id="vbox4">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
<widget class="Gtk.EventBox" id="evBBox2">
<property name="MemberName" />
<child>
<widget class="Gtk.Label" id="labelMasterPos">
<property name="MemberName" />
<property name="Xpad">4</property>
<property name="Ypad">4</property>
<property name="Xalign">0</property>
</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> <child>
<widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow2"> <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow2">
<property name="MemberName" /> <property name="MemberName" />
@ -491,6 +514,12 @@ page</property>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="Position">1</property>
<property name="AutoSize">True</property>
</packing>
</child>
</widget>
<packing> <packing>
<property name="Resize">False</property> <property name="Resize">False</property>
</packing> </packing>

10
DMX-2.0/style.gtkrc
View file

@ -123,6 +123,11 @@ style "soundtimelabel" = "counter"
font_name = "DejaVu Sans Mono Bold 9" font_name = "DejaVu Sans Mono Bold 9"
} }
style "masterpos" = "counter"
{
font_name = "DejaVu Sans Mono Bold 10"
}
style "page" = "sombre" style "page" = "sombre"
{ {
fg[NORMAL] = "#FFFF00" fg[NORMAL] = "#FFFF00"
@ -228,13 +233,14 @@ widget_class "*.<GtkCList>.<GtkButton>" style "treeview_header-s"
widget "gtk-tooltip*" style "tooltips-s" widget "gtk-tooltip*" style "tooltips-s"
widget "*.evBBox" style "counter"
widget "*.evBBox*" style "counter"
widget "*.labelMasterPos" style "masterpos"
widget "*.pb" style "circuitspb" widget "*.pb" style "circuitspb"
widget "*.posLabel" style "counter" widget "*.posLabel" style "counter"
widget "*.timeLabel" style "counter" widget "*.timeLabel" style "counter"
widget "*.actLabel" style "actmacro" widget "*.actLabel" style "actmacro"
widget "*.evBBox" style "counter"
widget "*.evBBox1" style "counter"
widget "*.soundTimeLabel" style "soundtimelabel" widget "*.soundTimeLabel" style "soundtimelabel"