From 89cc5753222c249c7d9237c48763658936754cb9 Mon Sep 17 00:00:00 2001 From: tzim Date: Sat, 11 Apr 2015 20:38:33 +0000 Subject: [PATCH] modifs sur le style --- DMX-2.0/SeqSonUI.cs | 2 + DMX-2.0/gtk-gui/DMX2.MainWindow.cs | 4 ++ DMX-2.0/gtk-gui/DMX2.SeqSonUI.cs | 2 +- DMX-2.0/gtk-gui/gui.stetic | 4 ++ DMX-2.0/style.gtkrc | 65 +++++++++++++++++------------- 5 files changed, 47 insertions(+), 30 deletions(-) diff --git a/DMX-2.0/SeqSonUI.cs b/DMX-2.0/SeqSonUI.cs index 323b7ac..357145e 100644 --- a/DMX-2.0/SeqSonUI.cs +++ b/DMX-2.0/SeqSonUI.cs @@ -59,6 +59,8 @@ namespace DMX2 listFiles.AppendColumn (fileCol); listFiles.Model = lsFiles; + + timeLabel.Name = "soundTimeLabel"; } void UpdListFiles () diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index 68befab..db80daf 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -132,6 +132,10 @@ namespace DMX2 this.seqSonAction.Sensitive = false; 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.UIManager.InsertActionGroup (w1, 0); this.AddAccelGroup (this.UIManager.AccelGroup); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqSonUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqSonUI.cs index 19b8b7f..3ab3843 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqSonUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqSonUI.cs @@ -45,7 +45,7 @@ namespace DMX2 private global::Gtk.NodeView listFiles; private global::Gtk.Label label1; private global::Gtk.Label titreLabel; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index caf6516..7909eeb 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -232,6 +232,10 @@ Action gtk-select-color + False + False + False + False diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc index a2220aa..bc5770a 100644 --- a/DMX-2.0/style.gtkrc +++ b/DMX-2.0/style.gtkrc @@ -18,7 +18,7 @@ style "sombre" { - font_name = "Cantarell 9" + font_name = "DejaVu Sans 9" bg[NORMAL] = "#666666" bg[SELECTED] = "#707090" @@ -48,7 +48,7 @@ style "sombre" #GtkTreeView::even-row-color = "#595959" } -style "scale" = "sombre" { +style "scale-s" = "sombre" { GtkScale::slider-width = 19 GtkScale::slider-length = 27 GtkRange::trough-side-details = 1 @@ -62,7 +62,7 @@ style "scale" = "sombre" { } -style "tirettes" = "scale" { +style "tirettes" = "scale-s" { font_name = "DejaVu Sans Mono 7" engine "clearlooks" { } @@ -93,14 +93,14 @@ style "tirettesm" = "tirettes" { } } -style "progressbar" { +style "progressbar-s" = "sombre" { bg[SELECTED] = "#8080A0" engine "clearlooks" { hint="progressbar" } } -style "circuitspb" +style "circuitspb" = "sombre" { font_name = "DejaVu Sans 7" bg[SELECTED] = "#C0B000" @@ -109,7 +109,7 @@ style "circuitspb" } } -style "counter" +style "counter" = "sombre" { fg[NORMAL] = "#FFFF00" bg[NORMAL] = "#000000" @@ -118,7 +118,12 @@ style "counter" } } -style "page" +style "soundtimelabel" = "counter" +{ + font_name = "DejaVu Sans Mono Bold 9" +} + +style "page" = "sombre" { fg[NORMAL] = "#FFFF00" bg[NORMAL] = "#000000" @@ -126,7 +131,7 @@ style "page" engine "clearlooks" { } } -style "pagesmall" +style "pagesmall" = "sombre" { fg[NORMAL] = "#FFFF00" bg[NORMAL] = "#000000" @@ -135,7 +140,7 @@ style "pagesmall" } } -style "actmacro" +style "actmacro" = "sombre" { fg[NORMAL] = "#FFFF00" bg[NORMAL] = "#000000" @@ -145,7 +150,7 @@ style "actmacro" } -style "lbtirette" +style "lbtirette" = "sombre" { fg[NORMAL] = "#D0D0D0" font_name = "DejaVu Sans 7" @@ -153,7 +158,7 @@ style "lbtirette" } } -style "entry" = "sombre" { +style "entry-s" = "sombre" { xthickness = 3 ythickness = 3 @@ -164,13 +169,13 @@ style "entry" = "sombre" { } } -style "treeview" { +style "treeview-s" = "sombre" { engine "clearlooks" { hint = "treeview" } } -style "treeview_header" = "sombre" { +style "treeview_header-s" = "sombre" { xthickness = 2 ythickness = 1 @@ -179,12 +184,12 @@ style "treeview_header" = "sombre" { } } -style "tooltips" = "sombre" { +style "tooltips-s" = "sombre" { xthickness = 4 ythickness = 4 } -style "scrollbar" = "sombre" { +style "scrollbar-s" = "sombre" { xthickness = 2 ythickness = 2 @@ -193,14 +198,14 @@ style "scrollbar" = "sombre" { } } -style "hscrollbar" = "sombre" { +style "hscrollbar-s" = "sombre" { engine "clearlooks" { hint = "hscrollbar" } } -style "vscrollbar" = "sombre" { +style "vscrollbar-s" = "sombre" { engine "clearlooks" { hint = "vscrollbar" @@ -208,20 +213,20 @@ style "vscrollbar" = "sombre" { } class "GtkWidget" style "sombre" -class "GtkScale" style "scale" -class "GtkProgressBar" style "progressbar" -class "GtkEntry" style "entry" -class "GtkScrollbar" style "scrollbar" -class "GtkHScrollbar" style "hscrollbar" -class "GtkVScrollbar" style "vscrollbar" +class "GtkScale" style "scale-s" +class "GtkProgressBar" style "progressbar-s" +class "GtkEntry" style "entry-s" +class "GtkScrollbar" style "scrollbar-s" +class "GtkHScrollbar" style "hscrollbar-s" +class "GtkVScrollbar" style "vscrollbar-s" -widget_class "*.*" style "treeview" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" -widget_class "*.." style "treeview_header" +widget_class "*.*" style "treeview-s" +widget_class "*.." style "treeview_header-s" +widget_class "*.." style "treeview_header-s" +widget_class "*.." style "treeview_header-s" +widget_class "*.." style "treeview_header-s" -widget "gtk-tooltip*" style "tooltips" +widget "gtk-tooltip*" style "tooltips-s" widget "*.pb" style "circuitspb" widget "*.posLabel" style "counter" @@ -231,6 +236,8 @@ widget "*.actLabel" style "actmacro" widget "*.evBBox" style "counter" widget "*.evBBox1" style "counter" +widget "*.soundTimeLabel" style "soundtimelabel" + widget "*.lblPage" style "page" widget "*.lblpagesmall" style "pagesmall"