From c7c2c50490ba286754d4acb5735b5398f23af612 Mon Sep 17 00:00:00 2001 From: tzim Date: Tue, 5 Nov 2013 08:42:23 +0000 Subject: [PATCH] QQ Modifs esthetiques --- DMX-2.0/Main.cs | 15 +-- DMX-2.0/gtk-gui/DMX2.MainWindow.cs | 101 +++++++++---------- DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs | 97 ++++++++++--------- DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs | 104 ++++++++++---------- DMX-2.0/gtk-gui/gui.stetic | 149 ++++++++++++++++------------- DMX-2.0/style.gtkrc | 4 +- 6 files changed, 254 insertions(+), 216 deletions(-) diff --git a/DMX-2.0/Main.cs b/DMX-2.0/Main.cs index 8240633..a205b01 100644 --- a/DMX-2.0/Main.cs +++ b/DMX-2.0/Main.cs @@ -16,16 +16,11 @@ namespace DMX2 )).DirectoryName ); - 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()); - } - } + 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 (); diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index 47f962f..59fb6b1 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -31,6 +31,7 @@ namespace DMX2 private global::Gtk.Button btnRetireLigne; private global::Gtk.ToggleButton btnBlackOut; private global::Gtk.ToggleButton btnPause; + private global::Gtk.EventBox evBBox; private global::Gtk.Label timeLabel; private global::Gtk.VScale masterScale; private global::Gtk.VSeparator vseparator1; @@ -268,18 +269,22 @@ namespace DMX2 w55.Expand = false; w55.Fill = false; // Container child vbox2.Gtk.Box+BoxChild + this.evBBox = new global::Gtk.EventBox (); + this.evBBox.Name = "evBBox"; + // Container child evBBox.Gtk.Container+ContainerChild this.timeLabel = new global::Gtk.Label (); this.timeLabel.Name = "timeLabel"; + this.timeLabel.Ypad = 8; this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("0.00"); this.timeLabel.UseMarkup = true; this.timeLabel.Justify = ((global::Gtk.Justification)(2)); this.timeLabel.Angle = 90; - this.vbox2.Add (this.timeLabel); - global::Gtk.Box.BoxChild w56 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.timeLabel])); - w56.Position = 6; - w56.Expand = false; - w56.Fill = false; - w56.Padding = ((uint)(10)); + this.evBBox.Add (this.timeLabel); + this.vbox2.Add (this.evBBox); + global::Gtk.Box.BoxChild w57 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.evBBox])); + w57.Position = 6; + w57.Expand = false; + w57.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.masterScale = new global::Gtk.VScale (null); this.masterScale.HeightRequest = 75; @@ -293,21 +298,21 @@ namespace DMX2 this.masterScale.Digits = 0; this.masterScale.ValuePos = ((global::Gtk.PositionType)(2)); this.vbox2.Add (this.masterScale); - global::Gtk.Box.BoxChild w57 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale])); - w57.Position = 7; + global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.masterScale])); + w58.Position = 7; this.hbox1.Add (this.vbox2); - global::Gtk.Box.BoxChild w58 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2])); - w58.Position = 0; - w58.Expand = false; - w58.Fill = false; + global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox2])); + w59.Position = 0; + w59.Expand = false; + w59.Fill = false; // Container child hbox1.Gtk.Box+BoxChild this.vseparator1 = new global::Gtk.VSeparator (); this.vseparator1.Name = "vseparator1"; this.hbox1.Add (this.vseparator1); - global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1])); - w59.Position = 1; - w59.Expand = false; - w59.Fill = false; + global::Gtk.Box.BoxChild w60 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vseparator1])); + w60.Position = 1; + w60.Expand = false; + w60.Fill = false; // Container child hbox1.Gtk.Box+BoxChild this.hpaned1 = new global::Gtk.HPaned (); this.hpaned1.CanFocus = true; @@ -329,17 +334,17 @@ namespace DMX2 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])); - w61.Resize = false; + global::Gtk.Paned.PanedChild w62 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.GtkScrolledWindow2])); + w62.Resize = false; // Container child hpaned2.Gtk.Paned+PanedChild this.onglets = new global::Gtk.Notebook (); this.onglets.CanFocus = true; this.onglets.Name = "onglets"; - this.onglets.CurrentPage = 1; + this.onglets.CurrentPage = 0; this.hpaned2.Add (this.onglets); this.hpaned1.Add (this.hpaned2); - global::Gtk.Paned.PanedChild w63 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); - w63.Resize = false; + global::Gtk.Paned.PanedChild w64 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.hpaned2])); + w64.Resize = false; // Container child hpaned1.Gtk.Paned+PanedChild this.scrolledwindow2 = new global::Gtk.ScrolledWindow (); this.scrolledwindow2.WidthRequest = 150; @@ -347,32 +352,32 @@ namespace DMX2 this.scrolledwindow2.Name = "scrolledwindow2"; this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child scrolledwindow2.Gtk.Container+ContainerChild - global::Gtk.Viewport w64 = new global::Gtk.Viewport (); - w64.ShadowType = ((global::Gtk.ShadowType)(0)); + global::Gtk.Viewport w65 = new global::Gtk.Viewport (); + w65.ShadowType = ((global::Gtk.ShadowType)(0)); // Container child GtkViewport1.Gtk.Container+ContainerChild this.vboxCircuits = new global::Gtk.VBox (); this.vboxCircuits.Name = "vboxCircuits"; this.vboxCircuits.Spacing = 2; - w64.Add (this.vboxCircuits); - this.scrolledwindow2.Add (w64); + w65.Add (this.vboxCircuits); + this.scrolledwindow2.Add (w65); this.hpaned1.Add (this.scrolledwindow2); - global::Gtk.Paned.PanedChild w67 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); - w67.Resize = false; - w67.Shrink = false; + global::Gtk.Paned.PanedChild w68 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2])); + w68.Resize = false; + w68.Shrink = false; this.hbox1.Add (this.hpaned1); - global::Gtk.Box.BoxChild w68 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); - w68.Position = 2; + global::Gtk.Box.BoxChild w69 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1])); + w69.Position = 2; this.vbox1.Add (this.hbox1); - global::Gtk.Box.BoxChild w69 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); - w69.Position = 0; + global::Gtk.Box.BoxChild w70 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); + w70.Position = 0; // Container child vbox1.Gtk.Box+BoxChild this.hseparator1 = new global::Gtk.HSeparator (); this.hseparator1.Name = "hseparator1"; this.vbox1.Add (this.hseparator1); - global::Gtk.Box.BoxChild w70 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); - w70.Position = 1; - w70.Expand = false; - w70.Fill = false; + global::Gtk.Box.BoxChild w71 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1])); + w71.Position = 1; + w71.Expand = false; + w71.Fill = false; // Container child vbox1.Gtk.Box+BoxChild this.hbox4 = new global::Gtk.HBox (); this.hbox4.Name = "hbox4"; @@ -383,10 +388,10 @@ namespace DMX2 this.toolbar7.Name = "toolbar7"; this.toolbar7.ShowArrow = false; this.hbox4.Add (this.toolbar7); - global::Gtk.Box.BoxChild w71 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); - w71.Position = 0; - w71.Expand = false; - w71.Fill = false; + global::Gtk.Box.BoxChild w72 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar7])); + w72.Position = 0; + w72.Expand = false; + w72.Fill = false; // Container child hbox4.Gtk.Box+BoxChild this.evInfo = new global::Gtk.EventBox (); this.evInfo.Name = "evInfo"; @@ -396,8 +401,8 @@ namespace DMX2 this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("info"); this.evInfo.Add (this.label2); this.hbox4.Add (this.evInfo); - global::Gtk.Box.BoxChild w73 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); - w73.Position = 1; + global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); + w74.Position = 1; // Container child hbox4.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8"))); @@ -405,15 +410,15 @@ namespace DMX2 this.toolbar8.ShowArrow = false; this.toolbar8.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.hbox4.Add (this.toolbar8); - global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8])); - w74.Position = 2; - w74.Expand = false; - w74.Fill = false; - this.vbox1.Add (this.hbox4); - global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4])); + global::Gtk.Box.BoxChild w75 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.toolbar8])); w75.Position = 2; w75.Expand = false; w75.Fill = false; + this.vbox1.Add (this.hbox4); + global::Gtk.Box.BoxChild w76 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox4])); + w76.Position = 2; + w76.Expand = false; + w76.Fill = false; this.Add (this.vbox1); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs index ea0753c..e964cae 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs @@ -22,6 +22,7 @@ namespace DMX2 private global::Gtk.VBox vbox2; private global::Gtk.HBox hbox1; private global::Gtk.VBox vbox4; + private global::Gtk.EventBox evBBox; private global::Gtk.HBox hbox2; private global::Gtk.Label posLabel; private global::Gtk.Label timeLabel; @@ -90,13 +91,18 @@ namespace DMX2 this.vbox4 = new global::Gtk.VBox (); this.vbox4.Name = "vbox4"; // Container child vbox4.Gtk.Box+BoxChild + this.evBBox = new global::Gtk.EventBox (); + this.evBBox.Name = "evBBox"; + // Container child evBBox.Gtk.Container+ContainerChild this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild this.posLabel = new global::Gtk.Label (); + this.posLabel.HeightRequest = 33; this.posLabel.Name = "posLabel"; - this.posLabel.Xpad = 10; + this.posLabel.Xpad = 15; + this.posLabel.Xalign = 0F; this.posLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("n°0"); this.posLabel.UseMarkup = true; this.hbox2.Add (this.posLabel); @@ -108,7 +114,7 @@ namespace DMX2 this.timeLabel = new global::Gtk.Label (); this.timeLabel.HeightRequest = 33; this.timeLabel.Name = "timeLabel"; - this.timeLabel.Xpad = 30; + this.timeLabel.Xpad = 15; this.timeLabel.Xalign = 1F; this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("0.00"); this.timeLabel.UseMarkup = true; @@ -119,11 +125,12 @@ namespace DMX2 w4.Position = 1; w4.Expand = false; w4.Fill = false; - this.vbox4.Add (this.hbox2); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.hbox2])); - w5.Position = 0; - w5.Expand = false; - w5.Fill = false; + this.evBBox.Add (this.hbox2); + this.vbox4.Add (this.evBBox); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.evBBox])); + w6.Position = 0; + w6.Expand = false; + w6.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.seqMasterScale = new global::Gtk.HScale (null); this.seqMasterScale.CanFocus = true; @@ -136,28 +143,28 @@ namespace DMX2 this.seqMasterScale.Digits = 0; this.seqMasterScale.ValuePos = ((global::Gtk.PositionType)(1)); this.vbox4.Add (this.seqMasterScale); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.seqMasterScale])); - w6.Position = 1; - w6.Expand = false; - w6.Fill = false; + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.seqMasterScale])); + w7.Position = 1; + w7.Expand = false; + w7.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.pbTrans = new global::Gtk.ProgressBar (); this.pbTrans.HeightRequest = 15; this.pbTrans.Name = "pbTrans"; this.vbox4.Add (this.pbTrans); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.pbTrans])); - w7.Position = 2; - w7.Expand = false; - w7.Fill = false; + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.pbTrans])); + w8.Position = 2; + w8.Expand = false; + w8.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.pbDuree = new global::Gtk.ProgressBar (); this.pbDuree.HeightRequest = 15; this.pbDuree.Name = "pbDuree"; this.vbox4.Add (this.pbDuree); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.pbDuree])); - w8.Position = 3; - w8.Expand = false; - w8.Fill = false; + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.pbDuree])); + w9.Position = 3; + w9.Expand = false; + w9.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar1 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar1"))); @@ -166,10 +173,10 @@ namespace DMX2 this.toolbar1.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.toolbar1.IconSize = ((global::Gtk.IconSize)(2)); this.vbox4.Add (this.toolbar1); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.toolbar1])); - w9.Position = 4; - w9.Expand = false; - w9.Fill = false; + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.toolbar1])); + w10.Position = 4; + w10.Expand = false; + w10.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar2 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar2"))); @@ -177,15 +184,15 @@ namespace DMX2 this.toolbar2.ShowArrow = false; this.toolbar2.IconSize = ((global::Gtk.IconSize)(2)); this.vbox4.Add (this.toolbar2); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.toolbar2])); - w10.Position = 5; - w10.Expand = false; - w10.Fill = false; - this.hbox1.Add (this.vbox4); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4])); - w11.Position = 0; + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.toolbar2])); + w11.Position = 5; w11.Expand = false; w11.Fill = false; + this.hbox1.Add (this.vbox4); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4])); + w12.Position = 0; + w12.Expand = false; + w12.Fill = false; // Container child hbox1.Gtk.Box+BoxChild this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow.Name = "GtkScrolledWindow"; @@ -198,8 +205,8 @@ namespace DMX2 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])); - w13.Position = 1; + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.GtkScrolledWindow])); + w14.Position = 1; // Container child hbox1.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar3 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar3"))); @@ -209,31 +216,31 @@ namespace DMX2 this.toolbar3.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.toolbar3.IconSize = ((global::Gtk.IconSize)(2)); this.hbox1.Add (this.toolbar3); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbar3])); - w14.Position = 2; - w14.Expand = false; - w14.Fill = false; - this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); - w15.Position = 0; + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbar3])); + w15.Position = 2; w15.Expand = false; w15.Fill = false; + this.vbox2.Add (this.hbox1); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); + w16.Position = 0; + w16.Expand = false; + w16.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow1.Name = "GtkScrolledWindow1"; // Container child GtkScrolledWindow1.Gtk.Container+ContainerChild - global::Gtk.Viewport w16 = new global::Gtk.Viewport (); - w16.ShadowType = ((global::Gtk.ShadowType)(0)); + global::Gtk.Viewport w17 = new global::Gtk.Viewport (); + w17.ShadowType = ((global::Gtk.ShadowType)(0)); // Container child GtkViewport.Gtk.Container+ContainerChild this.zoneWid = new global::Gtk.Fixed (); this.zoneWid.HeightRequest = 0; this.zoneWid.Name = "zoneWid"; this.zoneWid.HasWindow = false; - w16.Add (this.zoneWid); - this.GtkScrolledWindow1.Add (w16); + w17.Add (this.zoneWid); + this.GtkScrolledWindow1.Add (w17); this.vbox2.Add (this.GtkScrolledWindow1); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1])); - w19.Position = 1; + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.GtkScrolledWindow1])); + w20.Position = 1; this.GtkAlignment.Add (this.vbox2); this.frame1.Add (this.GtkAlignment); this.titreLabel = new global::Gtk.Label (); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs index edb9387..69cd320 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs @@ -19,6 +19,7 @@ namespace DMX2 private global::Gtk.VBox vbox2; private global::Gtk.HBox hbox1; private global::Gtk.VBox vbox3; + private global::Gtk.EventBox evBBox; private global::Gtk.HBox hbox2; private global::Gtk.Label posLabel; private global::Gtk.Label timeLabel; @@ -81,13 +82,18 @@ namespace DMX2 this.vbox3 = new global::Gtk.VBox (); this.vbox3.Name = "vbox3"; // Container child vbox3.Gtk.Box+BoxChild + this.evBBox = new global::Gtk.EventBox (); + this.evBBox.Name = "evBBox"; + // Container child evBBox.Gtk.Container+ContainerChild this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild this.posLabel = new global::Gtk.Label (); + this.posLabel.HeightRequest = 33; this.posLabel.Name = "posLabel"; - this.posLabel.Xpad = 10; + this.posLabel.Xpad = 15; + this.posLabel.Xalign = 0F; this.posLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("n° 0"); this.posLabel.UseMarkup = true; this.hbox2.Add (this.posLabel); @@ -97,8 +103,9 @@ namespace DMX2 w3.Fill = false; // Container child hbox2.Gtk.Box+BoxChild this.timeLabel = new global::Gtk.Label (); + this.timeLabel.HeightRequest = 33; this.timeLabel.Name = "timeLabel"; - this.timeLabel.Xpad = 10; + this.timeLabel.Xpad = 15; this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("00.0"); this.timeLabel.UseMarkup = true; this.hbox2.Add (this.timeLabel); @@ -107,11 +114,12 @@ namespace DMX2 w4.Position = 1; w4.Expand = false; w4.Fill = false; - this.vbox3.Add (this.hbox2); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox2])); - w5.Position = 0; - w5.Expand = false; - w5.Fill = false; + this.evBBox.Add (this.hbox2); + this.vbox3.Add (this.evBBox); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.evBBox])); + w6.Position = 0; + w6.Expand = false; + w6.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.seqMasterScale = new global::Gtk.HScale (null); this.seqMasterScale.CanFocus = true; @@ -124,10 +132,10 @@ namespace DMX2 this.seqMasterScale.Digits = 0; this.seqMasterScale.ValuePos = ((global::Gtk.PositionType)(1)); this.vbox3.Add (this.seqMasterScale); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.seqMasterScale])); - w6.Position = 1; - w6.Expand = false; - w6.Fill = false; + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.seqMasterScale])); + w7.Position = 1; + w7.Expand = false; + w7.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.hbox3 = new global::Gtk.HBox (); this.hbox3.Name = "hbox3"; @@ -139,52 +147,52 @@ namespace DMX2 this.txtCommand.IsEditable = true; this.txtCommand.InvisibleChar = '●'; this.hbox3.Add (this.txtCommand); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.txtCommand])); - w7.Position = 0; + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.txtCommand])); + w8.Position = 0; // Container child hbox3.Gtk.Box+BoxChild this.btnCommand = new global::Gtk.Button (); this.btnCommand.CanFocus = true; this.btnCommand.Name = "btnCommand"; this.btnCommand.UseUnderline = true; // Container child btnCommand.Gtk.Container+ContainerChild - global::Gtk.Alignment w8 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); + global::Gtk.Alignment w9 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w9 = new global::Gtk.HBox (); - w9.Spacing = 2; + global::Gtk.HBox w10 = new global::Gtk.HBox (); + w10.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w10 = new global::Gtk.Image (); - w10.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-ok", global::Gtk.IconSize.Menu); + global::Gtk.Image w11 = new global::Gtk.Image (); + w11.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-ok", global::Gtk.IconSize.Menu); + w10.Add (w11); + // Container child GtkHBox.Gtk.Container+ContainerChild + global::Gtk.Label w13 = new global::Gtk.Label (); + w13.LabelProp = global::Mono.Unix.Catalog.GetString ("Ok"); + w13.UseUnderline = true; + w10.Add (w13); w9.Add (w10); - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w12 = new global::Gtk.Label (); - w12.LabelProp = global::Mono.Unix.Catalog.GetString ("Ok"); - w12.UseUnderline = true; - w9.Add (w12); - w8.Add (w9); - this.btnCommand.Add (w8); + this.btnCommand.Add (w9); this.hbox3.Add (this.btnCommand); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.btnCommand])); - w16.Position = 1; - w16.Expand = false; - w16.Fill = false; - this.vbox3.Add (this.hbox3); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox3])); - w17.Position = 2; + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.btnCommand])); + w17.Position = 1; w17.Expand = false; w17.Fill = false; + this.vbox3.Add (this.hbox3); + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox3])); + w18.Position = 2; + w18.Expand = false; + w18.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar"))); this.toolbar.Name = "toolbar"; this.toolbar.ShowArrow = false; this.vbox3.Add (this.toolbar); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.toolbar])); - w18.Position = 3; - w18.Expand = false; - w18.Fill = false; + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.toolbar])); + w19.Position = 3; + w19.Expand = false; + w19.Fill = false; this.hbox1.Add (this.vbox3); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox3])); - w19.Position = 0; + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox3])); + w20.Position = 0; // Container child hbox1.Gtk.Box+BoxChild this.UIManager.AddUiFromString (""); this.toolbar1 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar1"))); @@ -194,16 +202,16 @@ namespace DMX2 this.toolbar1.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.toolbar1.IconSize = ((global::Gtk.IconSize)(2)); this.hbox1.Add (this.toolbar1); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbar1])); - w20.PackType = ((global::Gtk.PackType)(1)); - w20.Position = 1; - w20.Expand = false; - w20.Fill = false; - this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); - w21.Position = 0; + global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbar1])); + w21.PackType = ((global::Gtk.PackType)(1)); + w21.Position = 1; w21.Expand = false; w21.Fill = false; + this.vbox2.Add (this.hbox1); + global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); + w22.Position = 0; + w22.Expand = false; + w22.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); this.scrolledwindow1.CanFocus = true; @@ -216,8 +224,8 @@ namespace DMX2 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])); - w23.Position = 1; + global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1])); + w24.Position = 1; this.alignment1.Add (this.vbox2); this.GtkAlignment.Add (this.alignment1); this.frame1.Add (this.GtkAlignment); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 6d0d105..ebf028a 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -298,19 +298,24 @@ - + - <big>0.00</big> - True - Center - 90 + + + + 8 + <big>0.00</big> + True + Center + 90 + + 6 True False False - 10 @@ -383,7 +388,7 @@ True - 1 + 0 @@ -718,40 +723,47 @@ - + - 6 - + - 10 - <big>n°0</big> - True + 6 + + + + 33 + 15 + 0 + <big>n°0</big> + True + + + 0 + True + False + False + + + + + + 33 + 15 + 1 + <big>0.00</big> + True + Right + + + End + 1 + False + False + False + + - - 0 - True - False - False - - - - - - 33 - 30 - 1 - <big>0.00</big> - True - Right - - - End - 1 - False - False - False - @@ -1602,37 +1614,46 @@ - + - 6 - + - 10 - <big>n° 0</big> - True + 6 + + + + 33 + 15 + 0 + <big>n° 0</big> + True + + + 0 + False + False + False + + + + + + 33 + 15 + 0,69 + <big>00.0</big> + True + + + End + 1 + False + False + False + + - - 0 - True - False - False - - - - - - 10 - <big>00.0</big> - True - - - End - 1 - True - False - False - diff --git a/DMX-2.0/style.gtkrc b/DMX-2.0/style.gtkrc index a31372e..eab106d 100644 --- a/DMX-2.0/style.gtkrc +++ b/DMX-2.0/style.gtkrc @@ -57,4 +57,6 @@ 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 +widget "*.posLabel" style "counter" +widget "*.timeLabel" style "counter" +widget "*.evBBox" style "counter" \ No newline at end of file