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

timer seq maitre + bp macro

Browse source
This commit is contained in:
manu 2013-10-17 21:14:16 +00:00
parent 3f5a3aaf94
commit a9983c69bf
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
DMX-2.0/MainWindow.cs
View file

@ -468,7 +468,7 @@ namespace DMX2
//Activation / Désactivation des boutons en fonction de l'état de la counduite courante //Activation / Désactivation des boutons en fonction de l'état de la counduite courante
btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive = btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive =
showAllAction.Sensitive = universAction.Sensitive = masterScale.Sensitive = showAllAction.Sensitive = universAction.Sensitive = masterScale.Sensitive =
seqLinAction.Sensitive = circAction.Sensitive = saveAction.Sensitive = seqLinAction.Sensitive = seqMacroAction.Sensitive = circAction.Sensitive = saveAction.Sensitive =
saveAsAction.Sensitive = closeAction.Sensitive = true; saveAsAction.Sensitive = closeAction.Sensitive = true;
openAction.Sensitive = newAction.Sensitive = false; openAction.Sensitive = newAction.Sensitive = false;
this.Title = "DMX 2.0 - " + Conduite.Courante.Name; this.Title = "DMX 2.0 - " + Conduite.Courante.Name;
@ -476,7 +476,7 @@ namespace DMX2
} else { } else {
btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive = btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive =
showAllAction.Sensitive = universAction.Sensitive = masterScale.Sensitive = showAllAction.Sensitive = universAction.Sensitive = masterScale.Sensitive =
seqLinAction.Sensitive = circAction.Sensitive = saveAction.Sensitive = seqLinAction.Sensitive = seqMacroAction.Sensitive = circAction.Sensitive = saveAction.Sensitive =
saveAsAction.Sensitive = closeAction.Sensitive = false; saveAsAction.Sensitive = closeAction.Sensitive = false;
openAction.Sensitive = newAction.Sensitive = true; openAction.Sensitive = newAction.Sensitive = true;
this.Title = "DMX 2.0"; this.Title = "DMX 2.0";
@ -561,8 +561,12 @@ namespace DMX2
Conduite.Courante.Drivers.Add( new DriverBoitierV1()); Conduite.Courante.Drivers.Add( new DriverBoitierV1());
} protected void OnSeqMacroActionActivated (object sender, EventArgs e)
{
throw new System.NotImplementedException ();
} }
} }
} }

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

@ -21,6 +21,7 @@ namespace DMX2
private global::Gtk.Action showAllAction; private global::Gtk.Action showAllAction;
private global::Gtk.Action universAction; private global::Gtk.Action universAction;
private global::Gtk.Action connectAction; private global::Gtk.Action connectAction;
private global::Gtk.Action seqMacroAction;
private global::Gtk.VBox vbox1; private global::Gtk.VBox vbox1;
private global::Gtk.HBox hbox1; private global::Gtk.HBox hbox1;
private global::Gtk.VBox vbox2; private global::Gtk.VBox vbox2;
@ -101,6 +102,9 @@ namespace DMX2
w1.Add (this.universAction, null); w1.Add (this.universAction, null);
this.connectAction = new global::Gtk.Action ("connectAction", null, null, "gtk-connect"); this.connectAction = new global::Gtk.Action ("connectAction", null, null, "gtk-connect");
w1.Add (this.connectAction, null); w1.Add (this.connectAction, null);
this.seqMacroAction = new global::Gtk.Action ("seqMacroAction", null, null, "gtk-index");
this.seqMacroAction.Sensitive = false;
w1.Add (this.seqMacroAction, null);
this.UIManager.InsertActionGroup (w1, 0); this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup); this.AddAccelGroup (this.UIManager.AccelGroup);
this.Name = "DMX2.MainWindow"; this.Name = "DMX2.MainWindow";
@ -399,7 +403,7 @@ namespace DMX2
this.hbox4.Name = "hbox4"; this.hbox4.Name = "hbox4";
this.hbox4.Spacing = 6; this.hbox4.Spacing = 6;
// Container child hbox4.Gtk.Box+BoxChild // Container child hbox4.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar7'><toolitem name='circAction' action='circAction'/><toolitem name='seqLinAction' action='seqLinAction'/><separator/><toolitem name='showAllAction' action='showAllAction'/><toolitem name='fullscreenAction1' action='fullscreenAction1'/><toolitem name='universAction' action='universAction'/><toolitem name='connectAction' action='connectAction'/></toolbar></ui>"); this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar7'><toolitem name='circAction' action='circAction'/><toolitem name='seqLinAction' action='seqLinAction'/><toolitem name='seqMacroAction' action='seqMacroAction'/><separator/><toolitem name='showAllAction' action='showAllAction'/><toolitem name='fullscreenAction1' action='fullscreenAction1'/><toolitem name='universAction' action='universAction'/><toolitem name='connectAction' action='connectAction'/></toolbar></ui>");
this.toolbar7 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar7"))); this.toolbar7 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar7")));
this.toolbar7.Name = "toolbar7"; this.toolbar7.Name = "toolbar7";
this.toolbar7.ShowArrow = false; this.toolbar7.ShowArrow = false;
@ -451,6 +455,7 @@ namespace DMX2
this.showAllAction.Activated += new global::System.EventHandler (this.OnShowAllActionActivated); this.showAllAction.Activated += new global::System.EventHandler (this.OnShowAllActionActivated);
this.universAction.Activated += new global::System.EventHandler (this.OnUniversActionActivated); this.universAction.Activated += new global::System.EventHandler (this.OnUniversActionActivated);
this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated); this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated);
this.seqMacroAction.Activated += new global::System.EventHandler (this.OnSeqMacroActionActivated);
this.btnGo.Clicked += new global::System.EventHandler (this.OnBtnGoClicked); this.btnGo.Clicked += new global::System.EventHandler (this.OnBtnGoClicked);
this.btnGoBack.Clicked += new global::System.EventHandler (this.OnBtnGoBackClicked); this.btnGoBack.Clicked += new global::System.EventHandler (this.OnBtnGoBackClicked);
this.btnAjoutLigne.Clicked += new global::System.EventHandler (this.OnBtnAjoutLigneClicked); this.btnAjoutLigne.Clicked += new global::System.EventHandler (this.OnBtnAjoutLigneClicked);

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

@ -170,6 +170,13 @@
<property name="StockId">gtk-connect</property> <property name="StockId">gtk-connect</property>
<signal name="Activated" handler="OnConnectActionActivated" /> <signal name="Activated" handler="OnConnectActionActivated" />
</action> </action>
<action id="seqMacroAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="Sensitive">False</property>
<property name="StockId">gtk-index</property>
<signal name="Activated" handler="OnSeqMacroActionActivated" />
</action>
</action-group> </action-group>
<property name="MemberName" /> <property name="MemberName" />
<property name="Title" translatable="yes">MainWindow</property> <property name="Title" translatable="yes">MainWindow</property>
@ -466,6 +473,7 @@
<node name="toolbar7" type="Toolbar"> <node name="toolbar7" type="Toolbar">
<node type="Toolitem" action="circAction" /> <node type="Toolitem" action="circAction" />
<node type="Toolitem" action="seqLinAction" /> <node type="Toolitem" action="seqLinAction" />
<node type="Toolitem" action="seqMacroAction" />
<node type="Separator" /> <node type="Separator" />
<node type="Toolitem" action="showAllAction" /> <node type="Toolitem" action="showAllAction" />
<node type="Toolitem" action="fullscreenAction1" /> <node type="Toolitem" action="fullscreenAction1" />