From f01883444eeb51a665e42227b2c9aaeac5564248 Mon Sep 17 00:00:00 2001 From: tzim Date: Wed, 20 May 2015 07:03:38 +0000 Subject: [PATCH] --- DMX-2.0.sln | 2 ++ DMX-2.0/DMX-2.0.csproj | 15 +++++++-------- DMX-2.0/gtk-gui/DMX2.About.cs | 2 +- DMX-2.0/gtk-gui/DMX2.DriverBoitierV1UI.cs | 2 +- DMX-2.0/gtk-gui/DMX2.DriverBoitierV2UI.cs | 2 +- DMX-2.0/gtk-gui/DMX2.DriverBoitierV3UI.cs | 2 +- DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs | 2 +- DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs | 2 +- DMX-2.0/gtk-gui/DMX2.GestionDriversUI.cs | 2 +- DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs | 2 +- DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs | 2 +- DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs | 2 +- DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs | 2 +- DMX-2.0/gtk-gui/gui.stetic | 2 +- 14 files changed, 21 insertions(+), 20 deletions(-) diff --git a/DMX-2.0.sln b/DMX-2.0.sln index be1215a..3da397b 100644 --- a/DMX-2.0.sln +++ b/DMX-2.0.sln @@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject dmx512_v2_ino.c = dmx512_v2_ino.c dmx512_v2_ino\dmx512_v2_ino.ino = dmx512_v2_ino\dmx512_v2_ino.ino + loupiottes.js = loupiottes.js + dmx512_micro\dmx512_micro.cpp = dmx512_micro\dmx512_micro.cpp EndProjectSection EndProject Global diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj index 8d79d64..67a5af1 100644 --- a/DMX-2.0/DMX-2.0.csproj +++ b/DMX-2.0/DMX-2.0.csproj @@ -66,19 +66,19 @@ - true + True - true + True - true + True - true + True - true + True style.gtkrc @@ -181,8 +181,8 @@ - - + + @@ -199,6 +199,5 @@ - \ No newline at end of file diff --git a/DMX-2.0/gtk-gui/DMX2.About.cs b/DMX-2.0/gtk-gui/DMX2.About.cs index f6f6b8d..68356da 100644 --- a/DMX-2.0/gtk-gui/DMX2.About.cs +++ b/DMX-2.0/gtk-gui/DMX2.About.cs @@ -6,7 +6,7 @@ namespace DMX2 { private global::Gtk.Label label1; private global::Gtk.Button buttonOk; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.DriverBoitierV1UI.cs b/DMX-2.0/gtk-gui/DMX2.DriverBoitierV1UI.cs index 758efa1..9c98093 100644 --- a/DMX-2.0/gtk-gui/DMX2.DriverBoitierV1UI.cs +++ b/DMX-2.0/gtk-gui/DMX2.DriverBoitierV1UI.cs @@ -13,7 +13,7 @@ namespace DMX2 private global::Gtk.Label lblEtat; private global::Gtk.HBox hbox1; private global::Gtk.Button btnValider; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.DriverBoitierV2UI.cs b/DMX-2.0/gtk-gui/DMX2.DriverBoitierV2UI.cs index 119dee8..a261611 100644 --- a/DMX-2.0/gtk-gui/DMX2.DriverBoitierV2UI.cs +++ b/DMX-2.0/gtk-gui/DMX2.DriverBoitierV2UI.cs @@ -23,7 +23,7 @@ namespace DMX2 private global::Gtk.HBox hbox1; private global::Gtk.Button btnValider; private global::Gtk.Button btnInit; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.DriverBoitierV3UI.cs b/DMX-2.0/gtk-gui/DMX2.DriverBoitierV3UI.cs index 6d48500..d99e649 100644 --- a/DMX-2.0/gtk-gui/DMX2.DriverBoitierV3UI.cs +++ b/DMX-2.0/gtk-gui/DMX2.DriverBoitierV3UI.cs @@ -26,7 +26,7 @@ namespace DMX2 private global::Gtk.HBox hbox1; private global::Gtk.Button btnValider; private global::Gtk.Button btnInit; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs b/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs index 079d2d0..c565f93 100644 --- a/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs +++ b/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs @@ -32,7 +32,7 @@ namespace DMX2 private global::Gtk.TreeView tvCircuits; private global::Gtk.Label label5; private global::Gtk.Button buttonCancel; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs b/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs index eefc7ae..0537343 100644 --- a/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs +++ b/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs @@ -11,7 +11,7 @@ namespace DMX2 private global::Gtk.ScrolledWindow GtkScrolledWindow; private global::Gtk.TreeView listeCircuits; private global::Gtk.Button buttonOk; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.GestionDriversUI.cs b/DMX-2.0/gtk-gui/DMX2.GestionDriversUI.cs index 635eefe..5110119 100644 --- a/DMX-2.0/gtk-gui/DMX2.GestionDriversUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.GestionDriversUI.cs @@ -14,7 +14,7 @@ namespace DMX2 private global::Gtk.Alignment frmDrvChild; private global::Gtk.Label GtkLabel2; private global::Gtk.Button buttonOk; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs b/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs index ceaf3a3..b40f561 100644 --- a/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.GestionMidiUI.cs @@ -32,7 +32,7 @@ namespace DMX2 private global::Gtk.ScrolledWindow GtkScrolledWindow1; private global::Gtk.TreeView listKnown; private global::Gtk.Button buttonClose; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs b/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs index 3c5262e..8799344 100644 --- a/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs +++ b/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs @@ -18,7 +18,7 @@ namespace DMX2 private global::Gtk.TreeView listeSelCircuits; private global::Gtk.Button buttonCancel; private global::Gtk.Button buttonOk; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs index 3e06327..513b798 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs @@ -38,7 +38,7 @@ namespace DMX2 private global::Gtk.ScrolledWindow GtkScrolledWindow1; private global::Gtk.Fixed zoneWid; private global::Gtk.Label titreLabel; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs index c6fdfec..3199b2f 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs @@ -33,7 +33,7 @@ namespace DMX2 private global::Gtk.ScrolledWindow scrolledwindow1; private global::Gtk.TreeView effetsListe; private global::Gtk.Label titreLabel; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index e5bd2b8..7c598d1 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -5,7 +5,7 @@ 2.12 - +