From 7193d20876963a89d826b0bd5635d45c1dac7563 Mon Sep 17 00:00:00 2001 From: tzim Date: Sun, 25 May 2014 09:23:28 +0000 Subject: [PATCH] =?UTF-8?q?*=20Main.cs:=20*=20MainWindow.cs:=20*=20gui.ste?= =?UTF-8?q?tic:=20*=20DMX2.MainWindow.cs:=20Suppression=20des=20ref=C3=A9r?= =?UTF-8?q?ences=20=C3=A0=20aconnectgui=20(on=20=20=20peux=20dire=20qu'on?= =?UTF-8?q?=20en=20a=20plus=20besoin,=20l=C3=A0).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AlsaSeqLib.cs: * DriverBoitierV2.cs: * AlsaSeqLib.Wrappers.cs: Suppression des alertes de compilation. --- DMX-2.0/AlsaSeqLib.Wrappers.cs | 5 +---- DMX-2.0/AlsaSeqLib.cs | 5 ----- DMX-2.0/DriverBoitierV2.cs | 7 +++++-- DMX-2.0/Main.cs | 6 +----- DMX-2.0/MainWindow.cs | 18 ------------------ DMX-2.0/gtk-gui/DMX2.MainWindow.cs | 8 -------- DMX-2.0/gtk-gui/gui.stetic | 11 ----------- 7 files changed, 7 insertions(+), 53 deletions(-) diff --git a/DMX-2.0/AlsaSeqLib.Wrappers.cs b/DMX-2.0/AlsaSeqLib.Wrappers.cs index 5357291..8b58480 100644 --- a/DMX-2.0/AlsaSeqLib.Wrappers.cs +++ b/DMX-2.0/AlsaSeqLib.Wrappers.cs @@ -76,10 +76,7 @@ namespace DMX2 ptr, typeof(snd_seq_addr_t) ); - } catch (Exception e) { -#if DEBUG -Console.WriteLine (e.Message); -#endif + } catch { return new snd_seq_addr_t (); } } diff --git a/DMX-2.0/AlsaSeqLib.cs b/DMX-2.0/AlsaSeqLib.cs index f00520c..e0ce4ff 100644 --- a/DMX-2.0/AlsaSeqLib.cs +++ b/DMX-2.0/AlsaSeqLib.cs @@ -59,11 +59,6 @@ namespace DMX2 } } } - - public override bool Equals (object obj) - { - return ((Client)obj).id == id; - } } public static int ClientId { diff --git a/DMX-2.0/DriverBoitierV2.cs b/DMX-2.0/DriverBoitierV2.cs index a7f7698..e67489b 100644 --- a/DMX-2.0/DriverBoitierV2.cs +++ b/DMX-2.0/DriverBoitierV2.cs @@ -151,11 +151,14 @@ namespace DMX2 etat = etatAutomate.Deconnecte; } - } catch (Exception ex) { - etat = etatAutomate.Deconnecte; + } #if DEBUG + catch (Exception ex) { Console.WriteLine("DriverV2:Connection : {0}",ex); +#else + catch { #endif + etat = etatAutomate.Deconnecte; Thread.Sleep (500); } } diff --git a/DMX-2.0/Main.cs b/DMX-2.0/Main.cs index 2777532..7c7bfea 100644 --- a/DMX-2.0/Main.cs +++ b/DMX-2.0/Main.cs @@ -25,7 +25,7 @@ namespace DMX2 { public static void Main (string[] args) { - bool fullscreen = false, aguibtn = false; + bool fullscreen = false; WebServer ws = null; bool webserv = false; System.IO.FileInfo openfile=null; @@ -37,9 +37,6 @@ namespace DMX2 case "fs": fullscreen = true; break; - case "aguibtn": - aguibtn=true; - break; case "ws": webserv = true; break; @@ -74,7 +71,6 @@ namespace DMX2 MainWindow win = new MainWindow (); // application des options if(fullscreen) win.ToggleFullscreen(); - if(aguibtn) win.AfficheBoutonACGUI(); if (openfile!=null) win.OpenFile(openfile); diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index 648a741..219cfc7 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -739,24 +739,6 @@ namespace DMX2 } - public void AfficheBoutonACGUI () - { - aguiAction.VisibleHorizontal = true; - } - - Process aguiprocess= null; - - protected void OnInfoActionActivated (object sender, EventArgs e) - { - /*if(aguiprocess!=null) - if(!aguiprocess.HasExited) - return; - - aguiprocess= Process.Start("aconnectgui");*/ - - - } - protected void OnAboutActionActivated (object sender, EventArgs e) { diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index 6a355cb..6290860 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -23,7 +23,6 @@ namespace DMX2 private global::Gtk.Action connectAction; private global::Gtk.Action seqMacroAction; private global::Gtk.Action selectColorAction; - private global::Gtk.Action aguiAction; private global::Gtk.Action aboutAction; private global::Gtk.Action midiAction; private global::Gtk.Action connectAction1; @@ -119,12 +118,6 @@ namespace DMX2 w1.Add (this.seqMacroAction, null); this.selectColorAction = new global::Gtk.Action ("selectColorAction", null, "Recharger le theme", "gtk-select-color"); w1.Add (this.selectColorAction, null); - this.aguiAction = new global::Gtk.Action ("aguiAction", null, "Lance AConnectGui", "gtk-info"); - this.aguiAction.Visible = false; - this.aguiAction.VisibleHorizontal = false; - 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.midiAction = new global::Gtk.Action ("midiAction", null, null, "gtk-preferences"); @@ -506,7 +499,6 @@ namespace DMX2 this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated); 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.midiAction.Activated += new global::System.EventHandler (this.OnMidiActionActivated); this.selectColorAction1.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 5975e17..6a3a816 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -197,17 +197,6 @@ Recharger le theme - - Action - - gtk-info - Lance AConnectGui - False - False - False - False - - Action