diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs
index 4a1229d..5e562b6 100644
--- a/DMX-2.0/MainWindow.cs
+++ b/DMX-2.0/MainWindow.cs
@@ -806,5 +806,6 @@ namespace DMX2
mDlg= null;
};
}
+
}
}
\ No newline at end of file
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index 888e409..68befab 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -28,6 +28,7 @@ namespace DMX2
private global::Gtk.Action connectAction1;
private global::Gtk.Action selectColorAction1;
private global::Gtk.Action seqSonAction;
+ private global::Gtk.Action selectColorAction2;
private global::Gtk.VBox vbox1;
private global::Gtk.HBox hbox1;
private global::Gtk.VBox vbox2;
@@ -57,7 +58,7 @@ namespace DMX2
private global::Gtk.EventBox evInfo;
private global::Gtk.Label lblInfo;
private global::Gtk.Toolbar toolbar8;
-
+
protected virtual void Build ()
{
global::Stetic.Gui.Initialize (this);
@@ -130,6 +131,8 @@ namespace DMX2
this.seqSonAction = new global::Gtk.Action ("seqSonAction", null, null, "gtk-cdrom");
this.seqSonAction.Sensitive = false;
w1.Add (this.seqSonAction, null);
+ this.selectColorAction2 = new global::Gtk.Action ("selectColorAction2", null, null, "gtk-select-color");
+ w1.Add (this.selectColorAction2, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
this.Name = "DMX2.MainWindow";
@@ -459,7 +462,7 @@ namespace DMX2
global::Gtk.Box.BoxChild w77 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
w77.Position = 1;
// Container child hbox4.Gtk.Box+BoxChild
- this.UIManager.AddUiFromString ("");
+ this.UIManager.AddUiFromString ("");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
this.toolbar8.Name = "toolbar8";
this.toolbar8.ShowArrow = false;
@@ -500,6 +503,7 @@ namespace DMX2
this.midiAction.Activated += new global::System.EventHandler (this.OnMidiActionActivated);
this.selectColorAction1.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
this.seqSonAction.Activated += new global::System.EventHandler (this.OnSeqSonActionActivated);
+ this.selectColorAction2.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
this.btnGo.Clicked += new global::System.EventHandler (this.OnBtnGoClicked);
this.btnGoBack.Clicked += new global::System.EventHandler (this.OnBtnGoBackClicked);
this.btnAjoutLigne.Clicked += new global::System.EventHandler (this.OnBtnAjoutLigneClicked);
diff --git a/DMX-2.0/gtk-gui/generated.cs b/DMX-2.0/gtk-gui/generated.cs
index 0c027d9..7b51166 100644
--- a/DMX-2.0/gtk-gui/generated.cs
+++ b/DMX-2.0/gtk-gui/generated.cs
@@ -5,7 +5,7 @@ namespace Stetic
internal class Gui
{
private static bool initialized;
-
+
internal static void Initialize (Gtk.Widget iconRenderer)
{
if ((Stetic.Gui.initialized == false)) {
@@ -79,7 +79,7 @@ namespace Stetic
}
}
}
-
+
internal class IconLoader
{
public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
@@ -113,12 +113,12 @@ namespace Stetic
}
}
}
-
+
internal class BinContainer
{
private Gtk.Widget child;
private Gtk.UIManager uimanager;
-
+
public static BinContainer Attach (Gtk.Bin bin)
{
BinContainer bc = new BinContainer ();
@@ -127,32 +127,32 @@ namespace Stetic
bin.Added += new Gtk.AddedHandler (bc.OnAdded);
return bc;
}
-
+
private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
{
if ((this.child != null)) {
args.Requisition = this.child.SizeRequest ();
}
}
-
+
private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
{
if ((this.child != null)) {
this.child.Allocation = args.Allocation;
}
}
-
+
private void OnAdded (object sender, Gtk.AddedArgs args)
{
this.child = args.Widget;
}
-
+
public void SetUiManager (Gtk.UIManager uim)
{
this.uimanager = uim;
this.child.Realized += new System.EventHandler (this.OnRealized);
}
-
+
private void OnRealized (object sender, System.EventArgs args)
{
if ((this.uimanager != null)) {
@@ -165,14 +165,14 @@ namespace Stetic
}
}
}
-
+
internal class ActionGroups
{
public static Gtk.ActionGroup GetActionGroup (System.Type type)
{
return Stetic.ActionGroups.GetActionGroup (type.FullName);
}
-
+
public static Gtk.ActionGroup GetActionGroup (string name)
{
return null;
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index c532190..caf6516 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -228,6 +228,12 @@
gtk-cdrom
+
+ Action
+
+ gtk-select-color
+
+
MainWindow
@@ -599,6 +605,7 @@ page
+
diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc
index 3fb9e43..a2220aa 100644
--- a/DMX-2.0/style.gtkrc
+++ b/DMX-2.0/style.gtkrc
@@ -26,75 +26,87 @@ style "sombre"
bg[INSENSITIVE] = "#808080"
bg[PRELIGHT] = "#8080A0"
base[NORMAL] = "#595959"
- base[SELECTED] = "#bb5959"
- base[ACTIVE] = "#DAC000"
+ base[SELECTED] = "#B06060"
+ base[ACTIVE] = "#A06060"
text[NORMAL] = "#D0D0D0"
fg[NORMAL] = "#FFFFFF"
fg[PRELIGHT] = "#FFFFFF"
engine "clearlooks" {
- #colorize_scrollbar = FALSE
- toolbarstyle = 0
+ colorize_scrollbar = TRUE
+ reliefstyle = 1
+ menubarstyle = 2
+ toolbarstyle = 0
+ animation = FALSE
+ radius = 3.0
+ style = GUMMY
+
+ # Set a hint to disable backward compatibility fallbacks.
+ hint = "use-hints"
}
GtkTreeView::odd-row-color = "#66666F"
#GtkTreeView::even-row-color = "#595959"
}
-style "scale" {
+style "scale" = "sombre" {
GtkScale::slider-width = 19
GtkScale::slider-length = 27
GtkRange::trough-side-details = 1
bg[NORMAL] = "#A0A0B0"
-}
-
-style "tirettes" {
- font_name = "DejaVu Sans Mono 7"
- GtkScale::slider-width = 19
- GtkScale::slider-length = 28
- bg[NORMAL] = "#A0A0B0"
bg[PRELIGHT] = "#8080A0"
- bg[SELECTED] = "#DAC000"
+ bg[SELECTED] = "#C0B000"
fg[NORMAL] = "#FFFFFF"
+ engine "clearlooks" {
+ hint="scale"
+ }
+
}
-style "tirettesc" {
+style "tirettes" = "scale" {
font_name = "DejaVu Sans Mono 7"
- GtkScale::slider-width = 19
- GtkScale::slider-length = 28
+ engine "clearlooks" {
+ }
+}
+
+style "tirettesc" = "tirettes" {
bg[NORMAL] = "#B08080"
- bg[PRELIGHT] = "#B06060"
- bg[SELECTED] = "#DAC000"
fg[NORMAL] = "#FF5050"
+ bg[PRELIGHT] = "#A08080"
+ engine "clearlooks" {
+ }
}
-style "tirettest" {
- font_name = "DejaVu Sans Mono 7"
- GtkScale::slider-width = 19
- GtkScale::slider-length = 28
+style "tirettest" = "tirettes" {
bg[NORMAL] = "#80B080"
- bg[PRELIGHT] = "#B06060"
- bg[SELECTED] = "#DAC000"
fg[NORMAL] = "#50FF50"
+ bg[PRELIGHT] = "#80A080"
+ engine "clearlooks" {
+
+ }
}
-style "tirettesm" {
- font_name = "DejaVu Sans Mono 7"
- GtkScale::slider-width = 19
- GtkScale::slider-length = 28
+style "tirettesm" = "tirettes" {
bg[NORMAL] = "#6070B0"
- bg[PRELIGHT] = "#B06060"
- bg[SELECTED] = "#DAC000"
fg[NORMAL] = "#8080FF"
+ bg[PRELIGHT] = "#8080A0"
+ engine "clearlooks" {
+ }
}
style "progressbar" {
- bg[SELECTED] = "#A8A8B8"
+ bg[SELECTED] = "#8080A0"
+ engine "clearlooks" {
+ hint="progressbar"
+ }
}
style "circuitspb"
{
font_name = "DejaVu Sans 7"
- bg[SELECTED] = "#DAC000"
+ bg[SELECTED] = "#C0B000"
+ engine "clearlooks" {
+ hint="progressbar"
+ }
}
style "counter"
@@ -102,6 +114,8 @@ style "counter"
fg[NORMAL] = "#FFFF00"
bg[NORMAL] = "#000000"
font_name = "DejaVu Sans Mono Bold 12"
+ engine "clearlooks" {
+ }
}
style "page"
@@ -109,12 +123,16 @@ style "page"
fg[NORMAL] = "#FFFF00"
bg[NORMAL] = "#000000"
font_name = "DejaVu Sans Mono Bold 32"
+ engine "clearlooks" {
+ }
}
style "pagesmall"
{
fg[NORMAL] = "#FFFF00"
bg[NORMAL] = "#000000"
font_name = "DejaVu Sans Mono Bold 6"
+ engine "clearlooks" {
+ }
}
style "actmacro"
@@ -122,6 +140,8 @@ style "actmacro"
fg[NORMAL] = "#FFFF00"
bg[NORMAL] = "#000000"
font_name = "DejaVu Sans Mono Bold 6"
+ engine "clearlooks" {
+ }
}
@@ -129,12 +149,80 @@ style "lbtirette"
{
fg[NORMAL] = "#D0D0D0"
font_name = "DejaVu Sans 7"
+ engine "clearlooks" {
+ }
}
+style "entry" = "sombre" {
+ xthickness = 3
+ ythickness = 3
+
+ base[ACTIVE] = "#595959"
+
+ engine "clearlooks" {
+
+ }
+}
+
+style "treeview" {
+
+ engine "clearlooks" {
+ hint = "treeview"
+ }
+}
+style "treeview_header" = "sombre" {
+ xthickness = 2
+ ythickness = 1
+
+ engine "clearlooks" {
+ hint = "treeview-header"
+ }
+}
+
+style "tooltips" = "sombre" {
+ xthickness = 4
+ ythickness = 4
+}
+
+style "scrollbar" = "sombre" {
+ xthickness = 2
+ ythickness = 2
+
+ engine "clearlooks" {
+ hint = "scrollbar"
+ }
+}
+
+style "hscrollbar" = "sombre" {
+
+ engine "clearlooks" {
+ hint = "hscrollbar"
+ }
+}
+
+style "vscrollbar" = "sombre" {
+
+ engine "clearlooks" {
+ hint = "vscrollbar"
+ }
+}
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"
+
+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 "gtk-tooltip*" style "tooltips"
+
widget "*.pb" style "circuitspb"
widget "*.posLabel" style "counter"
widget "*.timeLabel" style "counter"
@@ -150,4 +238,4 @@ widget "*.lblTirette" style "lbtirette"
widget "*.sclTirette" style "tirettes"
widget "*.sclTiretteC" style "tirettesc"
widget "*.sclTiretteT" style "tirettest"
-widget "*.sclTiretteM" style "tirettesm"
\ No newline at end of file
+widget "*.sclTiretteM" style "tirettesm"