Ajout des styles.

Qq modifs sur seqmacro

DMX-2.0/DMX-2.0.csproj

@@ -83,6 +83,9 @@
     <EmbeddedResource Include="icons\docListe\48.png">
       <DeployService-UseProjectRelativePath>true</DeployService-UseProjectRelativePath>
     </EmbeddedResource>
+    <EmbeddedResource Include="style.gtkrc">
+      <LogicalName>style.gtkrc</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />

DMX-2.0/Main.cs

@@ -5,13 +5,21 @@ namespace DMX2
 {
 	class MainClass
 	{
-
-
 		public static void Main (string[] args)
 		{
 
 			Application.Init ();
 
+			if(System.IO.File.Exists("style.gtkrc")) Gtk.Rc.Parse("style.gtkrc");
+			else using (System.IO.Stream stream = 
+			        System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("style.gtkrc"))
+			{
+  				using (System.IO.TextReader reader = new System.IO.StreamReader(stream))
+  				{
+    				Gtk.Rc.ParseString (reader.ReadToEnd());
+  				}
+			} 
+
 			MainWindow win = new MainWindow ();
 
 			win.Show ();

DMX-2.0/MainWindow.cs

@@ -23,6 +23,7 @@ namespace DMX2
 			win=this;
 			Build ();
 			MajWidgets();
+			defStyle= this.Style;
 		}
 
 
@@ -511,8 +512,9 @@ namespace DMX2
 				foreach (var circuit in Conduite.Courante.Circuits) {
 					vboxCircuits.PackStart (pb=new ProgressBar (),false,false,0);
 					pb.Text = (++i).ToString() + " - " + circuit.Name;
-					pb.HeightRequest = 22;
+					pb.HeightRequest = 12;
 					pb.Data[circuitKey] = circuit;
+					pb.Name ="pb";
 				}
 				vboxCircuits.ShowAll ();
 			}
@@ -588,6 +590,8 @@ namespace DMX2
 			ChangeMatriceCouleur();
 		}		
 
+		Style defStyle;
+
 		void ChangeMatriceCouleur ()
 		{
 			if (Conduite.Courante.BlackOut) {
@@ -607,7 +611,7 @@ namespace DMX2
 				return;
 			}
 
-			ModifyBg (Gtk.StateType.Normal, new Gdk.Color (255, 255, 255));
+			ModifyBg (Gtk.StateType.Normal, defStyle.Background(StateType.Normal) );
 
 		}
 

DMX-2.0/SequenceurMacro.cs

@@ -388,8 +388,7 @@ namespace DMX2
 					Circuit c = Conduite.Courante.GetCircuitByID(i);
 					if(circuitsSeq.Contains(c))
 					{
-						if(effetsEnCours.ContainsKey(c)) effetsEnCours.Remove(c);
-						effetsEnCours.Add(c, new EffetMacro(temps,valeurscourantes[c],valeurCible));
+						effetsEnCours[c] = new EffetMacro(temps,valeurscourantes[c],valeurCible);
 					}
 				}
 			}
@@ -514,7 +513,7 @@ namespace DMX2
 						ligneMaitre = enCours;
 						timeStamp = TimeSpan.Zero;
 					
-				
+						topPresent = false;
 						int index = IndexLigneEnCours+1;
 						if(index<lignes.Count)
 						{

DMX-2.0/style.gtkrc

@@ -0,0 +1,28 @@
+style "circuitspb"
+{
+  font_name = "Sans 6"
+}
+widget "*.pb" style "circuitspb"
+
+style "sombre"
+{
+   bg[NORMAL] =  {0.3, 0.3, 0.3} 
+   bg[INSENSITIVE] =  {0.2, 0.2, 0.2} 
+   bg[PRELIGHT] =  {0.4, 0.4, 0.48} 
+   base[NORMAL] =  {0.35, 0.35, 0.35} 
+   base[SELECTED] =  {0.75, 0.35, 0.35} 
+   base[ACTIVE] =  {0.75, 0.75, 0.35} 
+   text[NORMAL] =  {0.75, 0.75, 0.75} 
+   fg[NORMAL] = {0.95, 1.0, 1.0} 
+}
+
+class "GtkWidget" style "sombre"
+
+style "counter" 
+{
+   fg[NORMAL] = {1.0,1.0,0.0}
+   bg[NORMAL] = {0.0,0.0,0.0}
+   font_name = "DejaVu Sans Mono 12" 
+}
+
+widget "*.timeLabel" style "counter"