diff --git a/DMX-2.0/About.cs b/DMX-2.0/About.cs new file mode 100644 index 0000000..8158b2d --- /dev/null +++ b/DMX-2.0/About.cs @@ -0,0 +1,36 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +using System; + +namespace DMX2 +{ + public partial class About : Gtk.Dialog + { + public About () + { + this.Build (); + } + protected void OnButtonOkClicked (object sender, EventArgs e) + { + Destroy(); + } + + } +} + diff --git a/DMX-2.0/AssemblyInfo.cs b/DMX-2.0/AssemblyInfo.cs index 9c46a62..177cb6f 100644 --- a/DMX-2.0/AssemblyInfo.cs +++ b/DMX-2.0/AssemblyInfo.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System.Reflection; using System.Runtime.CompilerServices; diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs index 753d2f8..8adff38 100644 --- a/DMX-2.0/Conduite.cs +++ b/DMX-2.0/Conduite.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj index 951742b..fb543f8 100644 --- a/DMX-2.0/DMX-2.0.csproj +++ b/DMX-2.0/DMX-2.0.csproj @@ -149,6 +149,8 @@ + + diff --git a/DMX-2.0/DriverBoitierV1.cs b/DMX-2.0/DriverBoitierV1.cs index 430e25f..66e1a41 100644 --- a/DMX-2.0/DriverBoitierV1.cs +++ b/DMX-2.0/DriverBoitierV1.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Threading; using System.IO.Ports; diff --git a/DMX-2.0/DriverBoitierV1UI.cs b/DMX-2.0/DriverBoitierV1UI.cs index e1c56c9..a14b04d 100644 --- a/DMX-2.0/DriverBoitierV1UI.cs +++ b/DMX-2.0/DriverBoitierV1UI.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using Gtk; diff --git a/DMX-2.0/DriverBoitierV2.cs b/DMX-2.0/DriverBoitierV2.cs index 47529ca..c28bc02 100644 --- a/DMX-2.0/DriverBoitierV2.cs +++ b/DMX-2.0/DriverBoitierV2.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Threading; using System.IO.Ports; diff --git a/DMX-2.0/DriverBoitierV2UI.cs b/DMX-2.0/DriverBoitierV2UI.cs index 7eda79b..15a8413 100644 --- a/DMX-2.0/DriverBoitierV2UI.cs +++ b/DMX-2.0/DriverBoitierV2UI.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using Gtk; diff --git a/DMX-2.0/DriverDMX.cs b/DMX-2.0/DriverDMX.cs index 79769c8..e862e3a 100644 --- a/DMX-2.0/DriverDMX.cs +++ b/DMX-2.0/DriverDMX.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Threading; using System.Xml; diff --git a/DMX-2.0/EditionUnivers.cs b/DMX-2.0/EditionUnivers.cs index c0de8af..d206772 100644 --- a/DMX-2.0/EditionUnivers.cs +++ b/DMX-2.0/EditionUnivers.cs @@ -1,3 +1,21 @@ + +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ using System; using Gtk; using System.Collections.Generic; diff --git a/DMX-2.0/ErreurLectureFichier.cs b/DMX-2.0/ErreurLectureFichier.cs index cbc7d97..2b6a635 100644 --- a/DMX-2.0/ErreurLectureFichier.cs +++ b/DMX-2.0/ErreurLectureFichier.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; namespace DMX2 diff --git a/DMX-2.0/EventManager.cs b/DMX-2.0/EventManager.cs index d3102b7..4ebb355 100644 --- a/DMX-2.0/EventManager.cs +++ b/DMX-2.0/EventManager.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Linq; diff --git a/DMX-2.0/GestionCircuits.cs b/DMX-2.0/GestionCircuits.cs index e586f86..3c3cd3a 100644 --- a/DMX-2.0/GestionCircuits.cs +++ b/DMX-2.0/GestionCircuits.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using Gtk; diff --git a/DMX-2.0/GestionDriversUI.cs b/DMX-2.0/GestionDriversUI.cs index 86a7d23..867ff30 100644 --- a/DMX-2.0/GestionDriversUI.cs +++ b/DMX-2.0/GestionDriversUI.cs @@ -1,3 +1,21 @@ + +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ using System; using System.IO; using Gtk; diff --git a/DMX-2.0/HelperFunctions.cs b/DMX-2.0/HelperFunctions.cs index 87f9b2c..8ae2ede 100644 --- a/DMX-2.0/HelperFunctions.cs +++ b/DMX-2.0/HelperFunctions.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using Gdk; using GLib; diff --git a/DMX-2.0/Info.cs b/DMX-2.0/Info.cs index bfe033f..ed3737f 100644 --- a/DMX-2.0/Info.cs +++ b/DMX-2.0/Info.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; namespace DMX2 diff --git a/DMX-2.0/Main.cs b/DMX-2.0/Main.cs index f8c1b59..0fa43aa 100644 --- a/DMX-2.0/Main.cs +++ b/DMX-2.0/Main.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using Gtk; diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index 89c362d..6ab270f 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using Gtk; using System.Collections.Generic; @@ -555,7 +573,9 @@ namespace DMX2 connectAction.Sensitive = saveAsAction.Sensitive = closeAction.Sensitive = true; openAction.Sensitive = newAction.Sensitive = false; + this.Title = "Loupiottes - " + Conduite.Courante.Name; + ConstruitMatrice(); } else { btnAjoutLigne.Sensitive = btnRetireLigne.Sensitive = btnGo.Sensitive = btnGoBack.Sensitive = @@ -565,7 +585,9 @@ namespace DMX2 connectAction.Sensitive = saveAsAction.Sensitive = closeAction.Sensitive = false; openAction.Sensitive = newAction.Sensitive = true; + this.Title = "Loupiottes"; + DetruitMatrice(); foreach (var widget in vboxCircuits.Children) vboxCircuits.Remove (widget); @@ -734,7 +756,16 @@ namespace DMX2 return; aguiprocess= Process.Start("aconnectgui"); + } + + protected void OnAboutActionActivated (object sender, EventArgs e) + { + + About dlg = new About(); + dlg.Show(); + dlg.Run (); } + } } \ No newline at end of file diff --git a/DMX-2.0/MidiEventProvider.PInvoke.cs b/DMX-2.0/MidiEventProvider.PInvoke.cs index a9cbcf9..fdc11b2 100644 --- a/DMX-2.0/MidiEventProvider.PInvoke.cs +++ b/DMX-2.0/MidiEventProvider.PInvoke.cs @@ -1,3 +1,21 @@ + +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ using System; using System.Runtime.InteropServices; diff --git a/DMX-2.0/MidiEventProvider.cs b/DMX-2.0/MidiEventProvider.cs index 814d67f..5fa8396 100644 --- a/DMX-2.0/MidiEventProvider.cs +++ b/DMX-2.0/MidiEventProvider.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Runtime.InteropServices; using System.Collections.Generic; diff --git a/DMX-2.0/SelSeqCircuits.cs b/DMX-2.0/SelSeqCircuits.cs index 342bde3..379dba5 100644 --- a/DMX-2.0/SelSeqCircuits.cs +++ b/DMX-2.0/SelSeqCircuits.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; diff --git a/DMX-2.0/SeqLinUI.cs b/DMX-2.0/SeqLinUI.cs index d288be2..c1a032b 100644 --- a/DMX-2.0/SeqLinUI.cs +++ b/DMX-2.0/SeqLinUI.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using Gtk; diff --git a/DMX-2.0/SeqMacroUI.cs b/DMX-2.0/SeqMacroUI.cs index f4da278..27f29b3 100644 --- a/DMX-2.0/SeqMacroUI.cs +++ b/DMX-2.0/SeqMacroUI.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using Gtk; diff --git a/DMX-2.0/Sequenceur.cs b/DMX-2.0/Sequenceur.cs index 32f6c10..a65a301 100644 --- a/DMX-2.0/Sequenceur.cs +++ b/DMX-2.0/Sequenceur.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Xml; diff --git a/DMX-2.0/SequenceurLineaire.cs b/DMX-2.0/SequenceurLineaire.cs index 53654e3..661d121 100644 --- a/DMX-2.0/SequenceurLineaire.cs +++ b/DMX-2.0/SequenceurLineaire.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/DMX-2.0/SequenceurMacro.cs b/DMX-2.0/SequenceurMacro.cs index ccfd2c0..faf1d67 100644 --- a/DMX-2.0/SequenceurMacro.cs +++ b/DMX-2.0/SequenceurMacro.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Xml; diff --git a/DMX-2.0/SequenceurMaitre.cs b/DMX-2.0/SequenceurMaitre.cs index 83b971e..f7ab20e 100644 --- a/DMX-2.0/SequenceurMaitre.cs +++ b/DMX-2.0/SequenceurMaitre.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Xml; diff --git a/DMX-2.0/SequenceurUI.cs b/DMX-2.0/SequenceurUI.cs index 7147792..cf1102f 100644 --- a/DMX-2.0/SequenceurUI.cs +++ b/DMX-2.0/SequenceurUI.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; namespace DMX2 diff --git a/DMX-2.0/UniversDMX.cs b/DMX-2.0/UniversDMX.cs index 7affc95..ebe3438 100644 --- a/DMX-2.0/UniversDMX.cs +++ b/DMX-2.0/UniversDMX.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/DMX-2.0/WebServer.cs b/DMX-2.0/WebServer.cs index 65f0b52..2b9bfb6 100644 --- a/DMX-2.0/WebServer.cs +++ b/DMX-2.0/WebServer.cs @@ -1,3 +1,21 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + using System; using System.Web; using System.Net; diff --git a/DMX-2.0/gtk-gui/DMX2.About.cs b/DMX-2.0/gtk-gui/DMX2.About.cs new file mode 100644 index 0000000..f6f6b8d --- /dev/null +++ b/DMX-2.0/gtk-gui/DMX2.About.cs @@ -0,0 +1,57 @@ + +// This file has been generated by the GUI designer. Do not modify. +namespace DMX2 +{ + public partial class About + { + private global::Gtk.Label label1; + private global::Gtk.Button buttonOk; + + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget DMX2.About + this.Name = "DMX2.About"; + this.WindowPosition = ((global::Gtk.WindowPosition)(4)); + this.Modal = true; + // Internal child DMX2.About.VBox + global::Gtk.VBox w1 = this.VBox; + w1.Name = "dialog1_VBox"; + w1.BorderWidth = ((uint)(2)); + // Container child dialog1_VBox.Gtk.Box+BoxChild + this.label1 = new global::Gtk.Label (); + this.label1.Name = "label1"; + this.label1.LabelProp = "Loupiottes\n\nLogiciel de contrôle DMX 512\n\nCopyright (C) Arnaud Houdelette\t\t2012-2014\nCopyright (C) Emmanuel Langlois\t\t2012-2014\nhttp://www.loupiottes.fr\nLicence : GPL V2"; + w1.Add (this.label1); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1 [this.label1])); + w2.Position = 0; + w2.Expand = false; + w2.Fill = false; + // Internal child DMX2.About.ActionArea + global::Gtk.HButtonBox w3 = this.ActionArea; + w3.Name = "dialog1_ActionArea"; + w3.Spacing = 10; + w3.BorderWidth = ((uint)(5)); + w3.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild + this.buttonOk = new global::Gtk.Button (); + this.buttonOk.CanDefault = true; + this.buttonOk.CanFocus = true; + this.buttonOk.Name = "buttonOk"; + this.buttonOk.UseStock = true; + this.buttonOk.UseUnderline = true; + this.buttonOk.Label = "gtk-close"; + this.AddActionWidget (this.buttonOk, -7); + global::Gtk.ButtonBox.ButtonBoxChild w4 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3 [this.buttonOk])); + w4.Expand = false; + w4.Fill = false; + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.DefaultWidth = 400; + this.DefaultHeight = 300; + this.Show (); + this.buttonOk.Clicked += new global::System.EventHandler (this.OnButtonOkClicked); + } + } +} diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index adefca8..db05e24 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -24,6 +24,7 @@ namespace DMX2 private global::Gtk.Action seqMacroAction; private global::Gtk.Action selectColorAction; private global::Gtk.Action aguiAction; + private global::Gtk.Action aboutAction; private global::Gtk.VBox vbox1; private global::Gtk.HBox hbox1; private global::Gtk.VBox vbox2; @@ -117,6 +118,8 @@ namespace DMX2 this.aguiAction.VisibleVertical = false; this.aguiAction.VisibleOverflown = false; w1.Add (this.aguiAction, null); + this.aboutAction = new global::Gtk.Action ("aboutAction", null, null, "gtk-about"); + w1.Add (this.aboutAction, null); this.UIManager.InsertActionGroup (w1, 0); this.AddAccelGroup (this.UIManager.AccelGroup); this.Name = "DMX2.MainWindow"; @@ -420,7 +423,7 @@ namespace DMX2 global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); w74.Position = 1; // Container child hbox4.Gtk.Box+BoxChild - this.UIManager.AddUiFromString (""); + this.UIManager.AddUiFromString (""); this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8"))); this.toolbar8.Name = "toolbar8"; this.toolbar8.ShowArrow = false; @@ -458,6 +461,7 @@ namespace DMX2 this.seqMacroAction.Activated += new global::System.EventHandler (this.OnSeqMacroActionActivated); this.selectColorAction.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated); this.aguiAction.Activated += new global::System.EventHandler (this.OnInfoActionActivated); + this.aboutAction.Activated += new global::System.EventHandler (this.OnAboutActionActivated); this.btnGo.Clicked += new global::System.EventHandler (this.OnBtnGoClicked); this.btnGoBack.Clicked += new global::System.EventHandler (this.OnBtnGoBackClicked); this.btnAjoutLigne.Clicked += new global::System.EventHandler (this.OnBtnAjoutLigneClicked); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 4d78247..5519cbb 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -5,7 +5,7 @@ 2.12 - + @@ -208,6 +208,12 @@ False + + Action + + gtk-about + + MainWindow @@ -544,6 +550,7 @@ celle selectionnée + @@ -2558,4 +2565,62 @@ au sequenceur + + + CenterOnParent + True + 1 + False + + + + 2 + + + + Loupiottes + +Logiciel de contrôle DMX 512 + +Copyright (C) Arnaud Houdelette 2012-2014 +Copyright (C) Emmanuel Langlois 2012-2014 +http://www.loupiottes.fr +Licence : GPL V2 + + + 0 + True + False + False + + + + + + + + 10 + 5 + 1 + End + + + + True + True + True + StockItem + gtk-close + -7 + + gtk-close + + + False + False + + + + + \ No newline at end of file diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc index 7b902d4..03c35e0 100644 --- a/DMX-2.0/style.gtkrc +++ b/DMX-2.0/style.gtkrc @@ -1,3 +1,20 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ style "sombre" { diff --git a/dmx512_v2_ino/dmx512_v2_ino.ino b/dmx512_v2_ino/dmx512_v2_ino.ino index ed6d17a..518e09b 100644 --- a/dmx512_v2_ino/dmx512_v2_ino.ino +++ b/dmx512_v2_ino/dmx512_v2_ino.ino @@ -1,4 +1,22 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + // definition des fonction cbi sbi idem assembleur #ifndef cbi diff --git a/live-dmx/auto/config b/live-dmx/auto/config index e707110..fe6daec 100755 --- a/live-dmx/auto/config +++ b/live-dmx/auto/config @@ -7,4 +7,5 @@ lb config noauto \ --bootappend-install "locales=fr_FR.UTF-8" \ --archive-areas "main contrib non-free" \ --apt-recommends true \ + --architectures i386 \ "${@}" diff --git a/live-dmx/config/includes.chroot/usr/local/bin/DMX-2.0.exe b/live-dmx/config/includes.chroot/usr/local/bin/DMX-2.0.exe index fbd992b..e8fdba7 100755 Binary files a/live-dmx/config/includes.chroot/usr/local/bin/DMX-2.0.exe and b/live-dmx/config/includes.chroot/usr/local/bin/DMX-2.0.exe differ diff --git a/live-dmx/config/includes.chroot/usr/local/bin/style.gtkrc b/live-dmx/config/includes.chroot/usr/local/bin/style.gtkrc index c82cf37..03c35e0 100644 --- a/live-dmx/config/includes.chroot/usr/local/bin/style.gtkrc +++ b/live-dmx/config/includes.chroot/usr/local/bin/style.gtkrc @@ -1,3 +1,20 @@ +/* + + Copyright (C) Arnaud Houdelette 2012-2014 + Copyright (C) Emmanuel Langlois 2012-2014 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ style "sombre" { @@ -83,10 +100,18 @@ style "counter" font_name = "DejaVu Sans Mono Bold 12" } +style "actmacro" +{ + fg[NORMAL] = "#FFFF00" + bg[NORMAL] = "#000000" + font_name = "DejaVu Sans Mono Bold 6" +} + + style "lbtirette" { fg[NORMAL] = "#D0D0D0" - font_name = "DejaVu Sans Mono 7" + font_name = "DejaVu Sans 7" } @@ -96,9 +121,11 @@ class "GtkProgressBar" style "progressbar" widget "*.pb" style "circuitspb" widget "*.posLabel" style "counter" widget "*.timeLabel" style "counter" +widget "*.actLabel" style "actmacro" + widget "*.evBBox" style "counter" widget "*.lblTirette" style "lbtirette" widget "*.sclTirette" style "tirettes" widget "*.sclTiretteC" style "tirettesc" widget "*.sclTiretteT" style "tirettest" -widget "*.sclTiretteM" style "tirettesm" +widget "*.sclTiretteM" style "tirettesm" \ No newline at end of file