diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj
index 9ff810a..269a832 100644
--- a/DMX-2.0/DMX-2.0.csproj
+++ b/DMX-2.0/DMX-2.0.csproj
@@ -63,6 +63,27 @@
gui.stetic
+
+
+
+
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
index 864254f..9d8dafe 100644
--- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
+++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs
@@ -15,6 +15,7 @@ namespace DMX2
private global::Gtk.Action propertiesAction;
private global::Gtk.Action FichierAction;
private global::Gtk.Action newAction;
+ private global::Gtk.Action seqLinAction;
private global::Gtk.VBox vbox1;
private global::Gtk.HBox hbox1;
private global::Gtk.Fixed fixed2;
@@ -27,9 +28,6 @@ namespace DMX2
private global::Gtk.NodeView nodeview1;
private global::Gtk.ScrolledWindow scrolledwindow2;
private global::Gtk.VBox vboxCircuits;
- private global::Gtk.ProgressBar progressbar1;
- private global::Gtk.ProgressBar progressbar2;
- private global::Gtk.ProgressBar progressbar3;
private global::Gtk.HSeparator hseparator1;
private global::Gtk.HBox hbox2;
private global::Gtk.Toolbar toolbar3;
@@ -71,6 +69,9 @@ namespace DMX2
w1.Add (this.FichierAction, null);
this.newAction = new global::Gtk.Action ("newAction", null, null, "gtk-new");
w1.Add (this.newAction, null);
+ this.seqLinAction = new global::Gtk.Action ("seqLinAction", null, null, "tirettes");
+ this.seqLinAction.Sensitive = false;
+ w1.Add (this.seqLinAction, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
this.Name = "DMX2.MainWindow";
@@ -106,12 +107,12 @@ namespace DMX2
this.hpaned1 = new global::Gtk.HPaned ();
this.hpaned1.CanFocus = true;
this.hpaned1.Name = "hpaned1";
- this.hpaned1.Position = 705;
+ this.hpaned1.Position = 753;
// Container child hpaned1.Gtk.Paned+PanedChild
this.hpaned2 = new global::Gtk.HPaned ();
this.hpaned2.CanFocus = true;
this.hpaned2.Name = "hpaned2";
- this.hpaned2.Position = 313;
+ this.hpaned2.Position = 583;
// Container child hpaned2.Gtk.Paned+PanedChild
this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
this.scrolledwindow1.CanFocus = true;
@@ -159,71 +160,47 @@ namespace DMX2
this.vboxCircuits = new global::Gtk.VBox ();
this.vboxCircuits.Name = "vboxCircuits";
this.vboxCircuits.Spacing = 2;
- // Container child vboxCircuits.Gtk.Box+BoxChild
- this.progressbar1 = new global::Gtk.ProgressBar ();
- this.progressbar1.Name = "progressbar1";
- this.vboxCircuits.Add (this.progressbar1);
- global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vboxCircuits [this.progressbar1]));
- w12.Position = 0;
- w12.Expand = false;
- w12.Fill = false;
- // Container child vboxCircuits.Gtk.Box+BoxChild
- this.progressbar2 = new global::Gtk.ProgressBar ();
- this.progressbar2.Name = "progressbar2";
- this.vboxCircuits.Add (this.progressbar2);
- global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vboxCircuits [this.progressbar2]));
- w13.Position = 1;
- w13.Expand = false;
- w13.Fill = false;
- // Container child vboxCircuits.Gtk.Box+BoxChild
- this.progressbar3 = new global::Gtk.ProgressBar ();
- this.progressbar3.HeightRequest = 22;
- this.progressbar3.Name = "progressbar3";
- this.progressbar3.Text = global::Mono.Unix.Catalog.GetString ("tre");
- this.vboxCircuits.Add (this.progressbar3);
- global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vboxCircuits [this.progressbar3]));
- w14.Position = 2;
- w14.Expand = false;
- w14.Fill = false;
w11.Add (this.vboxCircuits);
this.scrolledwindow2.Add (w11);
this.hpaned1.Add (this.scrolledwindow2);
- global::Gtk.Paned.PanedChild w17 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
- w17.Resize = false;
- w17.Shrink = false;
+ global::Gtk.Paned.PanedChild w14 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.scrolledwindow2]));
+ w14.Resize = false;
+ w14.Shrink = false;
this.hbox1.Add (this.hpaned1);
- global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
- w18.Position = 2;
+ global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hpaned1]));
+ w15.Position = 2;
this.vbox1.Add (this.hbox1);
- global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
- w19.Position = 0;
+ global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
+ w16.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 w20 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
- w20.Position = 1;
- w20.Expand = false;
- w20.Fill = false;
+ global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
+ w17.Position = 1;
+ w17.Expand = false;
+ w17.Fill = false;
// Container child vbox1.Gtk.Box+BoxChild
this.hbox2 = new global::Gtk.HBox ();
this.hbox2.Name = "hbox2";
this.hbox2.Spacing = 6;
// Container child hbox2.Gtk.Box+BoxChild
- this.UIManager.AddUiFromString ("");
+ this.UIManager.AddUiFromString ("");
this.toolbar3 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar3")));
this.toolbar3.Name = "toolbar3";
this.toolbar3.ShowArrow = false;
this.hbox2.Add (this.toolbar3);
- global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar3]));
- w21.Position = 0;
+ global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar3]));
+ w18.Position = 0;
+ w18.Expand = false;
+ w18.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
this.fixed3 = new global::Gtk.Fixed ();
this.fixed3.Name = "fixed3";
this.fixed3.HasWindow = false;
this.hbox2.Add (this.fixed3);
- global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed3]));
- w22.Position = 1;
+ global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.fixed3]));
+ w19.Position = 1;
// Container child hbox2.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("");
this.toolbar2 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar2")));
@@ -231,15 +208,15 @@ namespace DMX2
this.toolbar2.ShowArrow = false;
this.toolbar2.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
this.hbox2.Add (this.toolbar2);
- global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar2]));
- w23.Position = 2;
- w23.Expand = false;
- w23.Fill = false;
+ global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.toolbar2]));
+ w20.Position = 2;
+ w20.Expand = false;
+ w20.Fill = false;
this.vbox1.Add (this.hbox2);
- global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
- w24.Position = 2;
- w24.Expand = false;
- w24.Fill = false;
+ global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
+ w21.Position = 2;
+ w21.Expand = false;
+ w21.Fill = false;
this.Add (this.vbox1);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/DMX-2.0/gtk-gui/generated.cs b/DMX-2.0/gtk-gui/generated.cs
index 8407c26..e2ddeff 100644
--- a/DMX-2.0/gtk-gui/generated.cs
+++ b/DMX-2.0/gtk-gui/generated.cs
@@ -13,65 +13,73 @@ namespace Stetic
global::Gtk.IconFactory w1 = new global::Gtk.IconFactory ();
global::Gtk.IconSet w2 = new global::Gtk.IconSet ();
global::Gtk.IconSource w3 = new global::Gtk.IconSource ();
- w3.Pixbuf = global::Stetic.IconLoader.LoadIcon (iconRenderer, "gtk-properties", global::Gtk.IconSize.Button);
+ w3.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.ictir.16.png");
+ w3.SizeWildcarded = false;
+ w3.Size = global::Gtk.IconSize.SmallToolbar;
w2.AddSource (w3);
global::Gtk.IconSource w4 = new global::Gtk.IconSource ();
- w4.Pixbuf = global::Stetic.IconLoader.LoadIcon (iconRenderer, "gtk-properties", global::Gtk.IconSize.LargeToolbar);
+ w4.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.ictir.24.png");
+ w4.SizeWildcarded = false;
+ w4.Size = global::Gtk.IconSize.LargeToolbar;
w2.AddSource (w4);
global::Gtk.IconSource w5 = new global::Gtk.IconSource ();
- w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (iconRenderer, "gtk-properties", global::Gtk.IconSize.SmallToolbar);
+ w5.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.ictir.32.png");
+ w5.SizeWildcarded = false;
+ w5.Size = global::Gtk.IconSize.Dnd;
w2.AddSource (w5);
global::Gtk.IconSource w6 = new global::Gtk.IconSource ();
- w6.Pixbuf = global::Stetic.IconLoader.LoadIcon (iconRenderer, "gtk-properties", global::Gtk.IconSize.LargeToolbar);
+ w6.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.ictir.48.png");
+ w6.SizeWildcarded = false;
+ w6.Size = global::Gtk.IconSize.Dialog;
w2.AddSource (w6);
- w1.Add ("circuits", w2);
- global::Gtk.IconSet w7 = new global::Gtk.IconSet ();
+ global::Gtk.IconSource w7 = new global::Gtk.IconSource ();
+ w7.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.ictir.16.png");
+ w7.SizeWildcarded = false;
+ w7.Size = global::Gtk.IconSize.Button;
+ w2.AddSource (w7);
global::Gtk.IconSource w8 = new global::Gtk.IconSource ();
- w8.Pixbuf = global::Stetic.IconLoader.LoadIcon (iconRenderer, "gtk-preferences", global::Gtk.IconSize.SmallToolbar);
- w7.AddSource (w8);
- global::Gtk.IconSource w9 = new global::Gtk.IconSource ();
- w9.Pixbuf = global::Stetic.IconLoader.LoadIcon (iconRenderer, "gtk-preferences", global::Gtk.IconSize.LargeToolbar);
- w7.AddSource (w9);
- w1.Add ("UniversDMX", w7);
+ w8.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.ictir.16.png");
+ w8.SizeWildcarded = false;
+ w8.Size = global::Gtk.IconSize.Menu;
+ w2.AddSource (w8);
+ w1.Add ("tirettes", w2);
+ global::Gtk.IconSet w9 = new global::Gtk.IconSet ();
+ global::Gtk.IconSource w10 = new global::Gtk.IconSource ();
+ w10.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.docListe.16.png");
+ w10.SizeWildcarded = false;
+ w10.Size = global::Gtk.IconSize.Menu;
+ w9.AddSource (w10);
+ global::Gtk.IconSource w11 = new global::Gtk.IconSource ();
+ w11.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.docListe.48.png");
+ w11.SizeWildcarded = false;
+ w11.Size = global::Gtk.IconSize.Dialog;
+ w9.AddSource (w11);
+ global::Gtk.IconSource w12 = new global::Gtk.IconSource ();
+ w12.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.docListe.16.png");
+ w12.SizeWildcarded = false;
+ w12.Size = global::Gtk.IconSize.Button;
+ w9.AddSource (w12);
+ global::Gtk.IconSource w13 = new global::Gtk.IconSource ();
+ w13.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.docListe.24.png");
+ w13.SizeWildcarded = false;
+ w13.Size = global::Gtk.IconSize.LargeToolbar;
+ w9.AddSource (w13);
+ global::Gtk.IconSource w14 = new global::Gtk.IconSource ();
+ w14.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.docListe.16.png");
+ w14.SizeWildcarded = false;
+ w14.Size = global::Gtk.IconSize.SmallToolbar;
+ w9.AddSource (w14);
+ global::Gtk.IconSource w15 = new global::Gtk.IconSource ();
+ w15.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("DMX2.icons.docListe.32.png");
+ w15.SizeWildcarded = false;
+ w15.Size = global::Gtk.IconSize.Dnd;
+ w9.AddSource (w15);
+ w1.Add ("circuits", w9);
w1.AddDefault ();
}
}
}
- internal class IconLoader
- {
- public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
- {
- Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
- if ((res != null)) {
- return res;
- } else {
- int sz;
- int sy;
- global::Gtk.Icon.SizeLookup (size, out sz, out sy);
- try {
- return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
- } catch (System.Exception) {
- if ((name != "gtk-missing-image")) {
- return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
- } else {
- Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
- Gdk.GC gc = new Gdk.GC (pmap);
- gc.RgbFgColor = new Gdk.Color (255, 255, 255);
- pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
- gc.RgbFgColor = new Gdk.Color (0, 0, 0);
- pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
- gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
- gc.RgbFgColor = new Gdk.Color (255, 0, 0);
- pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
- pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
- return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
- }
- }
- }
- }
- }
-
internal class ActionGroups
{
public static Gtk.ActionGroup GetActionGroup (System.Type type)
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index e1901d6..b09c63a 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -9,26 +9,56 @@
-
+
- stock:gtk-properties Button
+ resource:DMX2.icons.ictir.16.png
+ SmallToolbar
- stock:gtk-properties LargeToolbar
+ resource:DMX2.icons.ictir.24.png
+ LargeToolbar
- stock:gtk-properties SmallToolbar
+ resource:DMX2.icons.ictir.32.png
+ Dnd
- stock:gtk-properties LargeToolbar
+ resource:DMX2.icons.ictir.48.png
+ Dialog
+
+
+ resource:DMX2.icons.ictir.16.png
+ Button
+
+
+ resource:DMX2.icons.ictir.16.png
+ Menu
-
+
- stock:gtk-preferences SmallToolbar
+ resource:DMX2.icons.docListe.16.png
+ Menu
- stock:gtk-preferences LargeToolbar
+ resource:DMX2.icons.docListe.48.png
+ Dialog
+
+
+ resource:DMX2.icons.docListe.16.png
+ Button
+
+
+ resource:DMX2.icons.docListe.24.png
+ LargeToolbar
+
+
+ resource:DMX2.icons.docListe.16.png
+ SmallToolbar
+
+
+ resource:DMX2.icons.docListe.32.png
+ Dnd
@@ -95,6 +125,12 @@
gtk-new
+
+ Action
+
+ False
+ tirettes
+
MainWindow
@@ -136,12 +172,12 @@
True
- 705
+ 753
True
- 313
+ 583
@@ -170,6 +206,7 @@
+ False
False
@@ -210,39 +247,7 @@
2
-
-
-
-
- 0
- True
- False
- False
-
-
-
-
-
-
-
- 1
- True
- False
- False
-
-
-
-
-
- 22
- tre
-
-
- 2
- True
- False
- False
-
+
@@ -287,11 +292,14 @@
False
+
0
- True
+ False
+ False
+ False