From bf09b340937f38b0ac4cebc8425bc6d37df016c5 Mon Sep 17 00:00:00 2001
From: manu <manu@loupiottes>
Date: Sun, 28 Oct 2018 18:52:53 +0100
Subject: [PATCH] Correction Style GTK et sequenceur Son

---
 DMX-2.0/MainWindow.cs              |  6 +++++-
 DMX-2.0/SequenceurSon.cs           | 34 +++++++++++++++++++-----------
 DMX-2.0/gtk-gui/DMX2.MainWindow.cs |  3 ---
 DMX-2.0/gtk-gui/gui.stetic         |  3 ---
 DMX-2.0/style.gtkrc                |  2 +-
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index 6725fe9..80dea92 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -53,7 +53,11 @@ namespace DMX2
 			Build ();
 			MajWidgets();
 
-			ContextMenuHelper ctxHelper = new ContextMenuHelper();
+#if DEBUG
+          //  selectColorAction2.Visible = true;
+#endif
+
+            ContextMenuHelper ctxHelper = new ContextMenuHelper();
 			ctxHelper.ContextMenu += EventPopup;
 			ctxHelper.AttachToWidget(btnGo);
 			ctxHelper.AttachToWidget(btnGoBack);
diff --git a/DMX-2.0/SequenceurSon.cs b/DMX-2.0/SequenceurSon.cs
index 3491588..52367de 100644
--- a/DMX-2.0/SequenceurSon.cs
+++ b/DMX-2.0/SequenceurSon.cs
@@ -133,16 +133,24 @@ namespace DMX2
 			get{ return volume;}
 			set {
 				volume=value;
-				mplayerProcess.StandardInput.WriteLine ("volume {0} 1", volume);
+                if (mplayerProcess != null && !mplayerProcess.HasExited)
+                {
+                    if (!Paused)
+                        mplayerProcess.StandardInput.WriteLine("volume {0} 1", volume);
+                }
 				volumeEventTarget.FeedBack ();
 			}
 		}
 
 		public TimeSpan PlayTime {
 			get{
-				if(mplayerProcess!=null && !mplayerProcess.HasExited)
-				mplayerProcess.StandardInput.WriteLine ("get_time_pos");
-				return position;
+                if (mplayerProcess != null && !mplayerProcess.HasExited)
+                {
+                    if (!Paused)
+                        mplayerProcess.StandardInput.WriteLine("get_time_pos");
+
+                }
+                return position;
 			}
 			set{
 				if (CheckMplayer ()) {
@@ -171,13 +179,14 @@ namespace DMX2
 
 			curfile = files[pos];
 			Stop();
-			mplayerProcess.StandardInput.WriteLine ("volume 0 1");
-			mplayerProcess.StandardInput.WriteLine ("loadfile \"{0}\" 0", curfile);
-			mplayerProcess.StandardInput.WriteLine ("get_time_length");
+            //mplayerProcess.StandardInput.WriteLine ("volume 0 1");
+            mplayerProcess.StandardInput.WriteLine ("volume {0} 1", volume);
+            mplayerProcess.StandardInput.WriteLine ("pausing loadfile \"{0}\"", curfile);
+			mplayerProcess.StandardInput.WriteLine ("pausing get_time_length");
 			//mplayerProcess.StandardInput.WriteLine ("pausing seek 0 2");
-			mplayerProcess.StandardInput.WriteLine ("pause");
-			mplayerProcess.StandardInput.WriteLine ("seek 0 2");
-			mplayerProcess.StandardInput.WriteLine ("volume {0} 1", volume);
+			//mplayerProcess.StandardInput.WriteLine ("pause");
+			//mplayerProcess.StandardInput.WriteLine ("seek 0 2");
+			//mplayerProcess.StandardInput.WriteLine ("volume {0} 1", volume);
 			Paused = true;
 		}
 
@@ -187,8 +196,9 @@ namespace DMX2
 				return;
 			if (!CheckMplayer ())
 				return;
-			mplayerProcess.StandardInput.WriteLine ("pause");
-			Paused = false;
+            mplayerProcess.StandardInput.WriteLine ("pause");
+            mplayerProcess.StandardInput.WriteLine ("volume {0} 1", volume);
+            Paused = false;
 		}
 
 		public void Pause ()
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index 5de3acd..23225d2 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -198,9 +198,6 @@ namespace DMX2
 			w1.Add(this.seqSonAction, null);
 			this.selectColorAction2 = new global::Gtk.Action("selectColorAction2", null, null, "gtk-select-color");
 			this.selectColorAction2.Visible = false;
-			this.selectColorAction2.VisibleHorizontal = false;
-			this.selectColorAction2.VisibleVertical = false;
-			this.selectColorAction2.VisibleOverflown = false;
 			w1.Add(this.selectColorAction2, null);
 			this.seqMidiAction = new global::Gtk.Action("seqMidiAction", null, null, "MidiSeq");
 			this.seqMidiAction.Sensitive = false;
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index 1057039..cd2d6e5 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -238,9 +238,6 @@
         <property name="Label" translatable="yes" />
         <property name="StockId">gtk-select-color</property>
         <property name="Visible">False</property>
-        <property name="VisibleHorizontal">False</property>
-        <property name="VisibleVertical">False</property>
-        <property name="VisibleOverflown">False</property>
         <signal name="Activated" handler="OnSelectColorActionActivated" />
       </action>
       <action id="seqMidiAction">
diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc
index e32ecd7..e72eff0 100644
--- a/DMX-2.0/style.gtkrc
+++ b/DMX-2.0/style.gtkrc
@@ -45,7 +45,7 @@ style "sombre"
    }
 
    GtkTreeView::odd-row-color = 	"#66666F"
-   #GtkTreeView::even-row-color = 	"#595959"
+   GtkTreeView::even-row-color = 	"#595959"
 }
 
 style "scale-s" = "sombre" {