From 5f5447cba8113eed828cec3d39983436b21b0aa8 Mon Sep 17 00:00:00 2001 From: tzim Date: Mon, 4 Nov 2013 15:27:23 +0000 Subject: [PATCH] Changement sur le style --- DMX-2.0/SeqMacroUI.cs | 32 -------------------- DMX-2.0/gtk-gui/DMX2.MainWindow.cs | 1 + DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs | 1 + DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs | 1 + DMX-2.0/gtk-gui/gui.stetic | 3 ++ DMX-2.0/style.gtkrc | 48 ++++++++++++++++++++++++------ 6 files changed, 45 insertions(+), 41 deletions(-) diff --git a/DMX-2.0/SeqMacroUI.cs b/DMX-2.0/SeqMacroUI.cs index a7c25be..8348f69 100644 --- a/DMX-2.0/SeqMacroUI.cs +++ b/DMX-2.0/SeqMacroUI.cs @@ -111,9 +111,6 @@ namespace DMX2 UpdListeEffets(); } - Gdk.Color colGrey= new Gdk.Color(200,200,200); - Gdk.Color colWhite= new Gdk.Color(255,255,255); - void RenderMatriceNum (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) { if (Conduite.Courante==null) return; @@ -124,12 +121,6 @@ namespace DMX2 if( sequenceur.IndexLigneaSuivre == sequenceur.Lignes.IndexOf(l) ) num+= "* "; (cell as Gtk.CellRendererText).Text = num + (sequenceur.Lignes.IndexOf(l)+1).ToString(); - - if(tree_model.GetPath (iter).Indices[0]%2 == 0) - cell.CellBackgroundGdk = colGrey; - else - cell.CellBackgroundGdk = colWhite; - } @@ -138,10 +129,6 @@ namespace DMX2 if (Conduite.Courante==null) return; SequenceurMacro.Ligne l = tree_model.GetValue (iter, 0) as SequenceurMacro.Ligne; (cell as Gtk.CellRendererText).Text = l.Nom; - if(tree_model.GetPath (iter).Indices[0]%2 == 0) - cell.CellBackgroundGdk = colGrey; - else - cell.CellBackgroundGdk = colWhite; } void RenderMatriceTop (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) @@ -150,11 +137,6 @@ namespace DMX2 SequenceurMacro.Ligne l = tree_model.GetValue (iter, 0) as SequenceurMacro.Ligne; if (l.Top< TimeSpan.Zero) (cell as Gtk.CellRendererText).Text = string.Empty; else (cell as Gtk.CellRendererText).Text = (l.Top.TotalMilliseconds /100).ToString(); - if(tree_model.GetPath (iter).Indices[0]%2 == 0) - cell.CellBackgroundGdk = colGrey; - else - cell.CellBackgroundGdk = colWhite; - } void RenderMatriceCircuits (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) @@ -162,11 +144,6 @@ namespace DMX2 if (Conduite.Courante==null) return; SequenceurMacro.Ligne l = tree_model.GetValue (iter, 0) as SequenceurMacro.Ligne; (cell as Gtk.CellRendererText).Text = l.Circuits; - if(tree_model.GetPath (iter).Indices[0]%2 == 0) - cell.CellBackgroundGdk = colGrey; - else - cell.CellBackgroundGdk = colWhite; - } void RenderMatriceValeur (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) @@ -174,10 +151,6 @@ namespace DMX2 if (Conduite.Courante==null) return; SequenceurMacro.Ligne l = tree_model.GetValue (iter, 0) as SequenceurMacro.Ligne; (cell as Gtk.CellRendererText).Text = (l.Valeur).ToString(); - if(tree_model.GetPath (iter).Indices[0]%2 == 0) - cell.CellBackgroundGdk = colGrey; - else - cell.CellBackgroundGdk = colWhite; } @@ -186,11 +159,6 @@ namespace DMX2 if (Conduite.Courante==null) return; SequenceurMacro.Ligne l = tree_model.GetValue (iter, 0) as SequenceurMacro.Ligne; (cell as Gtk.CellRendererText).Text = (l.Temps.TotalMilliseconds /100).ToString(); - if(tree_model.GetPath (iter).Indices[0]%2 == 0) - cell.CellBackgroundGdk = colGrey; - else - cell.CellBackgroundGdk = colWhite; - } void OnNomCellEdited (object o, EditedArgs args) diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index bebdc76..316bf0a 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -325,6 +325,7 @@ namespace DMX2 this.MatriceUI = new global::Gtk.NodeView (); this.MatriceUI.CanFocus = true; this.MatriceUI.Name = "MatriceUI"; + this.MatriceUI.RulesHint = true; this.GtkScrolledWindow2.Add (this.MatriceUI); this.hpaned2.Add (this.GtkScrolledWindow2); global::Gtk.Paned.PanedChild w61 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2])); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs index cb6593c..ea0753c 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs @@ -195,6 +195,7 @@ namespace DMX2 this.effetsListe = new global::Gtk.TreeView (); this.effetsListe.CanFocus = true; this.effetsListe.Name = "effetsListe"; + this.effetsListe.RulesHint = true; this.GtkScrolledWindow.Add (this.effetsListe); this.hbox1.Add (this.GtkScrolledWindow); global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.GtkScrolledWindow])); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs index 81e0d5e..fdaa9a3 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs @@ -213,6 +213,7 @@ namespace DMX2 this.effetsListe = new global::Gtk.TreeView (); this.effetsListe.CanFocus = true; this.effetsListe.Name = "effetsListe"; + this.effetsListe.RulesHint = true; this.scrolledwindow1.Add (this.effetsListe); this.vbox2.Add (this.scrolledwindow1); global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1])); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index fab3758..df95162 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -370,6 +370,7 @@ True True + True @@ -863,6 +864,7 @@ True True + True @@ -1765,6 +1767,7 @@ True + True diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc index bf082d6..63a5dcf 100644 --- a/DMX-2.0/style.gtkrc +++ b/DMX-2.0/style.gtkrc @@ -1,22 +1,47 @@ -style "circuitspb" -{ - font_name = "Sans 6" -} -widget "*.pb" style "circuitspb" style "sombre" { - bg[NORMAL] = {0.3, 0.3, 0.3} + bg[NORMAL] = {0.4, 0.4, 0.4} + bg[SELECTED] = {0.44, 0.45, 0.5} + bg[ACTIVE] = {0.45, 0.45, 0.45} bg[INSENSITIVE] = {0.2, 0.2, 0.2} - bg[PRELIGHT] = {0.4, 0.4, 0.48} + bg[PRELIGHT] = {0.5, 0.5, 0.58} 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} + fg[NORMAL] = {1.0, 1.0, 1.0} + fg[PRELIGHT] = {1.0, 1.0, 1.0} + engine "clearlooks" { + #colorize_scrollbar = FALSE + toolbarstyle = 0 + } + + GtkTreeView::odd-row-color = {0.40, 0.40, 0.43} + #GtkTreeView::even-row-color = {0.35, 0.35, 0.35} } -class "GtkWidget" style "sombre" + +style "scale" { + GtkScale::slider-width = 18 + GtkScale::slider-length = 30 + GtkRange::trough-side-details = 1 + bg[NORMAL] = {0.64, 0.64, 0.70} +} + +style "progressbar" { + bg[SELECTED] = {0.64, 0.64, 0.70} +} + +style "circuitspb" +{ + font_name = "DejaVu Sans 6" +} + +style "test" { + bg[SELECTED] = {1.0, 0.4, 0.4} + +} style "counter" { @@ -25,4 +50,9 @@ style "counter" font_name = "DejaVu Sans Mono 12" } +class "GtkWidget" style "sombre" +class "GtkScale" style "scale" +class "GtkProgressBar" style "progressbar" +widget "*.pb" style "circuitspb" +#class "GtkScrollbar" style "test" widget "*.timeLabel" style "counter" \ No newline at end of file