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

Ajout ligne info next seqmaster

Browse source
This commit is contained in:
tzim 2015-04-12 11:54:00 +00:00
parent 855d31fa84
commit 2c8264f866
4 changed files with 110 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
DMX-2.0/MainWindow.cs
View file

@ -32,6 +32,7 @@ namespace DMX2
ListStore lsMatrice = null; ListStore lsMatrice = null;
FileInfo conduiteFile=null; FileInfo conduiteFile=null;
int lastSaveHash=0; int lastSaveHash=0;
bool nextChange=false;
public string CurFolder{ public string CurFolder{
get; get;
@ -294,6 +295,7 @@ namespace DMX2
if (MatriceUI.Columns [0] == col) { if (MatriceUI.Columns [0] == col) {
Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre = IndexEffetSelectionne(); Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre = IndexEffetSelectionne();
nextChange = true;
} }
} }
@ -598,14 +600,20 @@ 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 ()) { if (Conduite.Courante.SequenceurMaitre.EffetChange () || nextChange) {
nextChange=false;
MatriceUI.QueueDraw (); MatriceUI.QueueDraw ();
int l = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours; int l = Conduite.Courante.SequenceurMaitre.IndexLigneEnCours;
int ln = Conduite.Courante.SequenceurMaitre.IndexLigneaSuivre;
if (ln == -1) ln = l + 1;
if (l < Conduite.Courante.SequenceurMaitre.Lignes.Count && l >= 0) { if (l < Conduite.Courante.SequenceurMaitre.Lignes.Count && l >= 0) {
labelMasterPos.LabelProp = labelMasterPos.LabelProp =
(l + 1).ToString () + " - " + (l + 1).ToString () + " - " +
Conduite.Courante.SequenceurMaitre.Lignes[l].Nom; Conduite.Courante.SequenceurMaitre.Lignes[l].Nom;
} }
if (ln < Conduite.Courante.SequenceurMaitre.Lignes.Count && ln >= 0) {
labelMasterNext.LabelProp= (ln+1).ToString() + " - " + Conduite.Courante.SequenceurMaitre.Lignes [ln].Nom ;
}
} }
fullUpdateFlag=false; fullUpdateFlag=false;
masterScale.Value = Conduite.Courante.Master; masterScale.Value = Conduite.Courante.Master;

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

@ -50,7 +50,9 @@ namespace DMX2
private global::Gtk.HPaned hpaned2; private global::Gtk.HPaned hpaned2;
private global::Gtk.VBox vbox4; private global::Gtk.VBox vbox4;
private global::Gtk.EventBox evBBox2; private global::Gtk.EventBox evBBox2;
private global::Gtk.VBox vbox5;
private global::Gtk.Label labelMasterPos; private global::Gtk.Label labelMasterPos;
private global::Gtk.Label labelMasterNext;
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;
@ -402,17 +404,38 @@ namespace DMX2
this.evBBox2 = new global::Gtk.EventBox (); this.evBBox2 = new global::Gtk.EventBox ();
this.evBBox2.Name = "evBBox2"; this.evBBox2.Name = "evBBox2";
// Container child evBBox2.Gtk.Container+ContainerChild // Container child evBBox2.Gtk.Container+ContainerChild
this.vbox5 = new global::Gtk.VBox ();
this.vbox5.Name = "vbox5";
this.vbox5.Spacing = 6;
// Container child vbox5.Gtk.Box+BoxChild
this.labelMasterPos = new global::Gtk.Label (); this.labelMasterPos = new global::Gtk.Label ();
this.labelMasterPos.Name = "labelMasterPos"; this.labelMasterPos.Name = "labelMasterPos";
this.labelMasterPos.Xpad = 4; this.labelMasterPos.Xpad = 4;
this.labelMasterPos.Ypad = 4; this.labelMasterPos.Ypad = 1;
this.labelMasterPos.Xalign = 0F; this.labelMasterPos.Xalign = 0F;
this.evBBox2.Add (this.labelMasterPos); this.labelMasterPos.LabelProp = "\t";
this.vbox4.Add (this.evBBox2); this.vbox5.Add (this.labelMasterPos);
global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.evBBox2])); global::Gtk.Box.BoxChild w65 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.labelMasterPos]));
w66.Position = 0; w65.Position = 0;
w65.Expand = false;
w65.Fill = false;
// Container child vbox5.Gtk.Box+BoxChild
this.labelMasterNext = new global::Gtk.Label ();
this.labelMasterNext.Name = "labelMasterNext";
this.labelMasterNext.Xpad = 20;
this.labelMasterNext.Xalign = 0F;
this.labelMasterNext.LabelProp = "\t";
this.vbox5.Add (this.labelMasterNext);
global::Gtk.Box.BoxChild w66 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.labelMasterNext]));
w66.Position = 1;
w66.Expand = false; w66.Expand = false;
w66.Fill = false; w66.Fill = false;
this.evBBox2.Add (this.vbox5);
this.vbox4.Add (this.evBBox2);
global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.evBBox2]));
w68.Position = 0;
w68.Expand = false;
w68.Fill = false;
// Container child vbox4.Gtk.Box+BoxChild // 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";
@ -424,14 +447,14 @@ namespace DMX2
this.MatriceUI.RulesHint = true; this.MatriceUI.RulesHint = true;
this.GtkScrolledWindow2.Add (this.MatriceUI); this.GtkScrolledWindow2.Add (this.MatriceUI);
this.vbox4.Add (this.GtkScrolledWindow2); this.vbox4.Add (this.GtkScrolledWindow2);
global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkScrolledWindow2])); global::Gtk.Box.BoxChild w70 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.GtkScrolledWindow2]));
w68.Position = 1; w70.Position = 1;
this.hpaned2.Add (this.vbox4); this.hpaned2.Add (this.vbox4);
global::Gtk.Paned.PanedChild w69 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.vbox4])); global::Gtk.Paned.PanedChild w71 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.vbox4]));
w69.Resize = false; w71.Resize = false;
this.hpaned1.Add (this.hpaned2); this.hpaned1.Add (this.hpaned2);
global::Gtk.Paned.PanedChild w70 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); global::Gtk.Paned.PanedChild w72 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2]));
w70.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;
@ -439,32 +462,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 w71 = new global::Gtk.Viewport (); global::Gtk.Viewport w73 = new global::Gtk.Viewport ();
w71.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;
w71.Add (this.vboxCircuits); w73.Add (this.vboxCircuits);
this.scrolledwindow2.Add (w71); this.scrolledwindow2.Add (w73);
this.hpaned1.Add (this.scrolledwindow2); this.hpaned1.Add (this.scrolledwindow2);
global::Gtk.Paned.PanedChild w74 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); global::Gtk.Paned.PanedChild w76 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
w74.Resize = false; w76.Resize = false;
w74.Shrink = false; w76.Shrink = false;
this.hbox1.Add (this.hpaned1); this.hbox1.Add (this.hpaned1);
global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
w75.Position = 2; w77.Position = 2;
this.vbox1.Add (this.hbox1); this.vbox1.Add (this.hbox1);
global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); global::Gtk.Box.BoxChild w78 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
w76.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 w77 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); global::Gtk.Box.BoxChild w79 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
w77.Position = 1; w79.Position = 1;
w77.Expand = false; w79.Expand = false;
w77.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";
@ -475,10 +498,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 w78 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); global::Gtk.Box.BoxChild w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7]));
w78.Position = 0; w80.Position = 0;
w78.Expand = false; w80.Expand = false;
w78.Fill = false; w80.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";
@ -488,8 +511,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 w80 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
w80.Position = 1; w82.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")));
@ -497,15 +520,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 w83 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8]));
w81.Position = 2; w83.Position = 2;
w81.Expand = false; w83.Expand = false;
w81.Fill = false; w83.Fill = false;
this.vbox1.Add (this.hbox4); this.vbox1.Add (this.hbox4);
global::Gtk.Box.BoxChild w82 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4])); global::Gtk.Box.BoxChild w84 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4]));
w82.Position = 2; w84.Position = 2;
w82.Expand = false; w84.Expand = false;
w82.Fill = false; w84.Fill = false;
this.Add (this.vbox1); this.Add (this.vbox1);
if ((this.Child != null)) { if ((this.Child != null)) {
this.Child.ShowAll (); this.Child.ShowAll ();

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

@ -484,18 +484,45 @@ page</property>
<child> <child>
<widget class="Gtk.EventBox" id="evBBox2"> <widget class="Gtk.EventBox" id="evBBox2">
<property name="MemberName" /> <property name="MemberName" />
<child>
<widget class="Gtk.VBox" id="vbox5">
<property name="MemberName" />
<property name="Spacing">6</property>
<child> <child>
<widget class="Gtk.Label" id="labelMasterPos"> <widget class="Gtk.Label" id="labelMasterPos">
<property name="MemberName" /> <property name="MemberName" />
<property name="Xpad">4</property> <property name="Xpad">4</property>
<property name="Ypad">4</property> <property name="Ypad">1</property>
<property name="Xalign">0</property> <property name="Xalign">0</property>
<property name="LabelProp" translatable="yes"> </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="labelMasterNext">
<property name="MemberName" />
<property name="Xpad">20</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes"> </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>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="Position">0</property> <property name="Position">0</property>
<property name="AutoSize">True</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>
</packing> </packing>

6
DMX-2.0/style.gtkrc
View file

@ -127,7 +127,10 @@ style "masterpos" = "counter"
{ {
font_name = "DejaVu Sans Mono Bold 10" font_name = "DejaVu Sans Mono Bold 10"
} }
style "masternext" = "counter"
{
font_name = "DejaVu Sans Mono Bold 7"
}
style "page" = "sombre" style "page" = "sombre"
{ {
fg[NORMAL] = "#FFFF00" fg[NORMAL] = "#FFFF00"
@ -236,6 +239,7 @@ widget "gtk-tooltip*" style "tooltips-s"
widget "*.evBBox" style "counter" widget "*.evBBox" style "counter"
widget "*.evBBox*" style "counter" widget "*.evBBox*" style "counter"
widget "*.labelMasterPos" style "masterpos" widget "*.labelMasterPos" style "masterpos"
widget "*.labelMasterNext" style "masternext"
widget "*.pb" style "circuitspb" widget "*.pb" style "circuitspb"
widget "*.posLabel" style "counter" widget "*.posLabel" style "counter"
widget "*.timeLabel" style "counter" widget "*.timeLabel" style "counter"