From 363c377c5b9ece2acebe5637eaec899d616df1a7 Mon Sep 17 00:00:00 2001
From: tzim <tzim@tzim.net>
Date: Tue, 23 Apr 2013 06:07:26 +0000
Subject: [PATCH]

---
 DMX-2.0/Conduite.cs        | 12 +++++++++++-
 DMX-2.0/MainWindow.cs      |  7 +++++++
 DMX-2.0/gtk-gui/gui.stetic |  3 ++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs
index bd12192..f918f7d 100644
--- a/DMX-2.0/Conduite.cs
+++ b/DMX-2.0/Conduite.cs
@@ -60,6 +60,16 @@ namespace DMX2
 			}
 		}
 
+		int master=100;
+
+		public int Master {
+			get {
+				return master;
+			}
+			set {
+				master= value;
+			}
+		}
 
 		int IComparer<Circuit>.Compare (Circuit x, Circuit y)
 		{
@@ -121,7 +131,7 @@ namespace DMX2
 					foreach (var seq in Sequenceurs) {
 						val = Math.Max (val, seq.ValeurCircuit (c));
 					}
-					c.ValeurCourante = val;
+					c.ValeurCourante = val * master /100;
 				}
 			}
 			// Cette fonction retourne quasi immédiatement, même si il y'a beaucoup a faire sur l'affichage
diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index ba88d84..8f9852f 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -140,5 +140,12 @@ namespace DMX2
 			fullUpdateFlag=false;
 			updScheduled=false;
 		}
+
+		protected void OnMasterScaleValueChanged (object sender, EventArgs e)
+		{
+			Conduite.Courante.Master = (int)(masterScale.Value);
+		}
+
+
 	}
 }
\ No newline at end of file
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index e4c7324..59ef354 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -245,7 +245,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.VScale" id="vscale1">
+                  <widget class="Gtk.VScale" id="masterScale">
                     <property name="MemberName" />
                     <property name="HeightRequest">260</property>
                     <property name="Inverted">True</property>
@@ -256,6 +256,7 @@
                     <property name="DrawValue">True</property>
                     <property name="Digits">0</property>
                     <property name="ValuePos">Top</property>
+                    <signal name="ValueChanged" handler="OnMasterScaleValueChanged" />
                   </widget>
                   <packing>
                     <property name="Position">5</property>