ThePimp: toolbox test.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2887 92316355-f0b4-4df1-b90c-862c8a59935f

ThePimp/MainWindow.cs

@@ -25,6 +25,7 @@ namespace ThePimp
         {
             Build ();
             Title += " v" + Libpipi.getVersion();
+            vpaned1.Add1(new ToolBox());
         }
 
         protected void OnDeleteEvent (object sender, DeleteEventArgs a)

ThePimp/gtk-gui/ThePimp.MainWindow.cs

@@ -79,17 +79,13 @@ namespace ThePimp {
         
         private Gtk.HPaned hpaned1;
         
-        private Gtk.Notebook notebook1;
-        
         private Gtk.VPaned vpaned1;
         
-        private Gtk.VBox vbox2;
+        private Gtk.HPaned hpaned2;
         
-        private Gtk.Label label2;
-        
-        private Gtk.VBox vbox3;
+        private Gtk.Notebook notebook1;
         
-        private Gtk.Label label3;
+        private Gtk.VPaned vpaned2;
         
         private Gtk.Statusbar statusbar1;
         
@@ -224,74 +220,56 @@ namespace ThePimp {
             this.hpaned1 = new Gtk.HPaned();
             this.hpaned1.CanFocus = true;
             this.hpaned1.Name = "hpaned1";
-            this.hpaned1.Position = 639;
+            this.hpaned1.Position = 27;
+            // Container child hpaned1.Gtk.Paned+PanedChild
+            this.vpaned1 = new Gtk.VPaned();
+            this.vpaned1.CanFocus = true;
+            this.vpaned1.Name = "vpaned1";
+            this.vpaned1.Position = 42;
+            this.hpaned1.Add(this.vpaned1);
+            Gtk.Paned.PanedChild w5 = ((Gtk.Paned.PanedChild)(this.hpaned1[this.vpaned1]));
+            w5.Resize = false;
             // Container child hpaned1.Gtk.Paned+PanedChild
+            this.hpaned2 = new Gtk.HPaned();
+            this.hpaned2.CanFocus = true;
+            this.hpaned2.Name = "hpaned2";
+            this.hpaned2.Position = 889;
+            // Container child hpaned2.Gtk.Paned+PanedChild
             this.notebook1 = new Gtk.Notebook();
             this.notebook1.CanFocus = true;
             this.notebook1.Name = "notebook1";
             this.notebook1.CurrentPage = 0;
             this.notebook1.BorderWidth = ((uint)(5));
-            this.hpaned1.Add(this.notebook1);
-            Gtk.Paned.PanedChild w5 = ((Gtk.Paned.PanedChild)(this.hpaned1[this.notebook1]));
-            w5.Resize = false;
-            // Container child hpaned1.Gtk.Paned+PanedChild
-            this.vpaned1 = new Gtk.VPaned();
-            this.vpaned1.CanFocus = true;
-            this.vpaned1.Name = "vpaned1";
-            this.vpaned1.Position = 76;
-            // Container child vpaned1.Gtk.Paned+PanedChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            this.vbox2.BorderWidth = ((uint)(5));
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.label2 = new Gtk.Label();
-            this.label2.WidthRequest = 100;
-            this.label2.Name = "label2";
-            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Tools");
-            this.vbox2.Add(this.label2);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.label2]));
-            w6.Position = 0;
-            w6.Expand = false;
-            w6.Fill = false;
-            this.vpaned1.Add(this.vbox2);
-            Gtk.Paned.PanedChild w7 = ((Gtk.Paned.PanedChild)(this.vpaned1[this.vbox2]));
+            this.hpaned2.Add(this.notebook1);
+            Gtk.Paned.PanedChild w6 = ((Gtk.Paned.PanedChild)(this.hpaned2[this.notebook1]));
+            w6.Resize = false;
+            // Container child hpaned2.Gtk.Paned+PanedChild
+            this.vpaned2 = new Gtk.VPaned();
+            this.vpaned2.CanFocus = true;
+            this.vpaned2.Name = "vpaned2";
+            this.vpaned2.Position = 42;
+            this.hpaned2.Add(this.vpaned2);
+            Gtk.Paned.PanedChild w7 = ((Gtk.Paned.PanedChild)(this.hpaned2[this.vpaned2]));
             w7.Resize = false;
-            // Container child vpaned1.Gtk.Paned+PanedChild
-            this.vbox3 = new Gtk.VBox();
-            this.vbox3.Name = "vbox3";
-            this.vbox3.BorderWidth = ((uint)(5));
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.label3 = new Gtk.Label();
-            this.label3.WidthRequest = 100;
-            this.label3.Name = "label3";
-            this.label3.LabelProp = Mono.Unix.Catalog.GetString("Layers & Channels");
-            this.vbox3.Add(this.label3);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox3[this.label3]));
-            w8.Position = 0;
-            w8.Expand = false;
-            w8.Fill = false;
-            this.vpaned1.Add(this.vbox3);
-            this.hpaned1.Add(this.vpaned1);
-            Gtk.Paned.PanedChild w10 = ((Gtk.Paned.PanedChild)(this.hpaned1[this.vpaned1]));
-            w10.Resize = false;
-            w10.Shrink = false;
+            w7.Shrink = false;
+            this.hpaned1.Add(this.hpaned2);
             this.vbox1.Add(this.hpaned1);
-            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox1[this.hpaned1]));
-            w11.Position = 2;
+            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hpaned1]));
+            w9.Position = 2;
             // Container child vbox1.Gtk.Box+BoxChild
             this.statusbar1 = new Gtk.Statusbar();
             this.statusbar1.Name = "statusbar1";
             this.statusbar1.Spacing = 6;
             this.vbox1.Add(this.statusbar1);
-            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
-            w12.Position = 3;
-            w12.Expand = false;
-            w12.Fill = false;
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
+            w10.Position = 3;
+            w10.Expand = false;
+            w10.Fill = false;
             this.Add(this.vbox1);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
-            this.DefaultWidth = 840;
+            this.DefaultWidth = 954;
             this.DefaultHeight = 680;
             this.Show();
             this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);

ThePimp/gtk-gui/ThePimp.ToolBox.cs

@@ -13,43 +13,43 @@ namespace ThePimp {
     
     public partial class ToolBox {
         
-        private Gtk.Table table1;
+        private Gtk.VBox vbox2;
         
-        private Gtk.Button button10;
+        private Gtk.Button button5;
         
-        private Gtk.Image image5;
+        private Gtk.Image image1;
         
-        private Gtk.Button button11;
+        private Gtk.Button button8;
         
-        private Gtk.Image image6;
+        private Gtk.Image image2;
         
-        private Gtk.Button button12;
+        private Gtk.Button button7;
         
-        private Gtk.Image image9;
+        private Gtk.Image image3;
         
-        private Gtk.Button button13;
+        private Gtk.Button button9;
         
-        private Gtk.Image image8;
+        private Gtk.Image image4;
         
-        private Gtk.Button button5;
+        private Gtk.Button button10;
         
-        private Gtk.Image image1;
+        private Gtk.Image image5;
         
-        private Gtk.Button button6;
+        private Gtk.Button button11;
         
-        private Gtk.Image image7;
+        private Gtk.Image image6;
         
-        private Gtk.Button button7;
+        private Gtk.Button button6;
         
-        private Gtk.Image image3;
+        private Gtk.Image image7;
         
-        private Gtk.Button button8;
+        private Gtk.Button button13;
         
-        private Gtk.Image image2;
+        private Gtk.Image image8;
         
-        private Gtk.Button button9;
+        private Gtk.Button button12;
         
-        private Gtk.Image image4;
+        private Gtk.Image image9;
         
         protected virtual void Build() {
             Stetic.Gui.Initialize(this);
@@ -57,83 +57,9 @@ namespace ThePimp {
             Stetic.BinContainer.Attach(this);
             this.Name = "ThePimp.ToolBox";
             // Container child ThePimp.ToolBox.Gtk.Container+ContainerChild
-            this.table1 = new Gtk.Table(((uint)(4)), ((uint)(4)), false);
-            this.table1.Name = "table1";
-            this.table1.RowSpacing = ((uint)(6));
-            this.table1.ColumnSpacing = ((uint)(6));
-            // Container child table1.Gtk.Table+TableChild
-            this.button10 = new Gtk.Button();
-            this.button10.CanFocus = true;
-            this.button10.Name = "button10";
-            // Container child button10.Gtk.Container+ContainerChild
-            this.image5 = new Gtk.Image();
-            this.image5.Name = "image5";
-            this.image5.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-rectangle", Gtk.IconSize.Menu, 16);
-            this.button10.Add(this.image5);
-            this.button10.Label = null;
-            this.table1.Add(this.button10);
-            Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.button10]));
-            w2.TopAttach = ((uint)(1));
-            w2.BottomAttach = ((uint)(2));
-            w2.LeftAttach = ((uint)(1));
-            w2.RightAttach = ((uint)(2));
-            w2.XOptions = ((Gtk.AttachOptions)(4));
-            w2.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.button11 = new Gtk.Button();
-            this.button11.CanFocus = true;
-            this.button11.Name = "button11";
-            // Container child button11.Gtk.Container+ContainerChild
-            this.image6 = new Gtk.Image();
-            this.image6.Name = "image6";
-            this.image6.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-ellipse", Gtk.IconSize.Menu, 16);
-            this.button11.Add(this.image6);
-            this.button11.Label = null;
-            this.table1.Add(this.button11);
-            Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.button11]));
-            w4.TopAttach = ((uint)(1));
-            w4.BottomAttach = ((uint)(2));
-            w4.LeftAttach = ((uint)(2));
-            w4.RightAttach = ((uint)(3));
-            w4.XOptions = ((Gtk.AttachOptions)(4));
-            w4.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.button12 = new Gtk.Button();
-            this.button12.CanFocus = true;
-            this.button12.Name = "button12";
-            // Container child button12.Gtk.Container+ContainerChild
-            this.image9 = new Gtk.Image();
-            this.image9.Name = "image9";
-            this.image9.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_3d-color-picker", Gtk.IconSize.Menu, 16);
-            this.button12.Add(this.image9);
-            this.button12.Label = null;
-            this.table1.Add(this.button12);
-            Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.button12]));
-            w6.TopAttach = ((uint)(2));
-            w6.BottomAttach = ((uint)(3));
-            w6.LeftAttach = ((uint)(2));
-            w6.RightAttach = ((uint)(3));
-            w6.XOptions = ((Gtk.AttachOptions)(4));
-            w6.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.button13 = new Gtk.Button();
-            this.button13.CanFocus = true;
-            this.button13.Name = "button13";
-            // Container child button13.Gtk.Container+ContainerChild
-            this.image8 = new Gtk.Image();
-            this.image8.Name = "image8";
-            this.image8.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-text", Gtk.IconSize.Menu, 16);
-            this.button13.Add(this.image8);
-            this.button13.Label = null;
-            this.table1.Add(this.button13);
-            Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.button13]));
-            w8.TopAttach = ((uint)(2));
-            w8.BottomAttach = ((uint)(3));
-            w8.LeftAttach = ((uint)(1));
-            w8.RightAttach = ((uint)(2));
-            w8.XOptions = ((Gtk.AttachOptions)(4));
-            w8.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
+            this.vbox2 = new Gtk.VBox();
+            this.vbox2.Name = "vbox2";
+            // Container child vbox2.Gtk.Box+BoxChild
             this.button5 = new Gtk.Button();
             this.button5.CanFocus = true;
             this.button5.Name = "button5";
@@ -143,43 +69,12 @@ namespace ThePimp {
             this.image1.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_show-draw-functions", Gtk.IconSize.Menu, 16);
             this.button5.Add(this.image1);
             this.button5.Label = null;
-            this.table1.Add(this.button5);
-            Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this.button5]));
-            w10.XOptions = ((Gtk.AttachOptions)(4));
-            w10.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.button6 = new Gtk.Button();
-            this.button6.CanFocus = true;
-            this.button6.Name = "button6";
-            // Container child button6.Gtk.Container+ContainerChild
-            this.image7 = new Gtk.Image();
-            this.image7.Name = "image7";
-            this.image7.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-polygon", Gtk.IconSize.Menu, 16);
-            this.button6.Add(this.image7);
-            this.button6.Label = null;
-            this.table1.Add(this.button6);
-            Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.button6]));
-            w12.TopAttach = ((uint)(2));
-            w12.BottomAttach = ((uint)(3));
-            w12.XOptions = ((Gtk.AttachOptions)(4));
-            w12.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.button7 = new Gtk.Button();
-            this.button7.CanFocus = true;
-            this.button7.Name = "button7";
-            // Container child button7.Gtk.Container+ContainerChild
-            this.image3 = new Gtk.Image();
-            this.image3.Name = "image3";
-            this.image3.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
-            this.button7.Add(this.image3);
-            this.button7.Label = null;
-            this.table1.Add(this.button7);
-            Gtk.Table.TableChild w14 = ((Gtk.Table.TableChild)(this.table1[this.button7]));
-            w14.LeftAttach = ((uint)(2));
-            w14.RightAttach = ((uint)(3));
-            w14.XOptions = ((Gtk.AttachOptions)(4));
-            w14.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
+            this.vbox2.Add(this.button5);
+            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox2[this.button5]));
+            w2.Position = 0;
+            w2.Expand = false;
+            w2.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
             this.button8 = new Gtk.Button();
             this.button8.CanFocus = true;
             this.button8.Name = "button8";
@@ -189,13 +84,27 @@ namespace ThePimp {
             this.image2.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_insert-fields-author", Gtk.IconSize.Menu, 16);
             this.button8.Add(this.image2);
             this.button8.Label = null;
-            this.table1.Add(this.button8);
-            Gtk.Table.TableChild w16 = ((Gtk.Table.TableChild)(this.table1[this.button8]));
-            w16.LeftAttach = ((uint)(1));
-            w16.RightAttach = ((uint)(2));
-            w16.XOptions = ((Gtk.AttachOptions)(4));
-            w16.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
+            this.vbox2.Add(this.button8);
+            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox2[this.button8]));
+            w4.Position = 1;
+            w4.Expand = false;
+            w4.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.button7 = new Gtk.Button();
+            this.button7.CanFocus = true;
+            this.button7.Name = "button7";
+            // Container child button7.Gtk.Container+ContainerChild
+            this.image3 = new Gtk.Image();
+            this.image3.Name = "image3";
+            this.image3.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
+            this.button7.Add(this.image3);
+            this.button7.Label = null;
+            this.vbox2.Add(this.button7);
+            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.button7]));
+            w6.Position = 2;
+            w6.Expand = false;
+            w6.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
             this.button9 = new Gtk.Button();
             this.button9.CanFocus = true;
             this.button9.Name = "button9";
@@ -205,13 +114,86 @@ namespace ThePimp {
             this.image4.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-line", Gtk.IconSize.Menu, 16);
             this.button9.Add(this.image4);
             this.button9.Label = null;
-            this.table1.Add(this.button9);
-            Gtk.Table.TableChild w18 = ((Gtk.Table.TableChild)(this.table1[this.button9]));
-            w18.TopAttach = ((uint)(1));
-            w18.BottomAttach = ((uint)(2));
-            w18.XOptions = ((Gtk.AttachOptions)(4));
-            w18.YOptions = ((Gtk.AttachOptions)(4));
-            this.Add(this.table1);
+            this.vbox2.Add(this.button9);
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox2[this.button9]));
+            w8.Position = 3;
+            w8.Expand = false;
+            w8.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.button10 = new Gtk.Button();
+            this.button10.CanFocus = true;
+            this.button10.Name = "button10";
+            // Container child button10.Gtk.Container+ContainerChild
+            this.image5 = new Gtk.Image();
+            this.image5.Name = "image5";
+            this.image5.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-rectangle", Gtk.IconSize.Menu, 16);
+            this.button10.Add(this.image5);
+            this.button10.Label = null;
+            this.vbox2.Add(this.button10);
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox2[this.button10]));
+            w10.Position = 4;
+            w10.Expand = false;
+            w10.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.button11 = new Gtk.Button();
+            this.button11.CanFocus = true;
+            this.button11.Name = "button11";
+            // Container child button11.Gtk.Container+ContainerChild
+            this.image6 = new Gtk.Image();
+            this.image6.Name = "image6";
+            this.image6.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-ellipse", Gtk.IconSize.Menu, 16);
+            this.button11.Add(this.image6);
+            this.button11.Label = null;
+            this.vbox2.Add(this.button11);
+            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox2[this.button11]));
+            w12.Position = 5;
+            w12.Expand = false;
+            w12.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.button6 = new Gtk.Button();
+            this.button6.CanFocus = true;
+            this.button6.Name = "button6";
+            // Container child button6.Gtk.Container+ContainerChild
+            this.image7 = new Gtk.Image();
+            this.image7.Name = "image7";
+            this.image7.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-polygon", Gtk.IconSize.Menu, 16);
+            this.button6.Add(this.image7);
+            this.button6.Label = null;
+            this.vbox2.Add(this.button6);
+            Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox2[this.button6]));
+            w14.Position = 6;
+            w14.Expand = false;
+            w14.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.button13 = new Gtk.Button();
+            this.button13.CanFocus = true;
+            // Container child button13.Gtk.Container+ContainerChild
+            this.image8 = new Gtk.Image();
+            this.image8.Name = "image8";
+            this.image8.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_draw-text", Gtk.IconSize.Menu, 16);
+            this.button13.Add(this.image8);
+            this.button13.Label = null;
+            this.vbox2.Add(this.button13);
+            Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox2[this.button13]));
+            w16.Position = 7;
+            w16.Expand = false;
+            w16.Fill = false;
+            // Container child vbox2.Gtk.Box+BoxChild
+            this.button12 = new Gtk.Button();
+            this.button12.CanFocus = true;
+            this.button12.Name = "button12";
+            // Container child button12.Gtk.Container+ContainerChild
+            this.image9 = new Gtk.Image();
+            this.image9.Name = "image9";
+            this.image9.Pixbuf = Stetic.IconLoader.LoadIcon(this, "stock_3d-color-picker", Gtk.IconSize.Menu, 16);
+            this.button12.Add(this.image9);
+            this.button12.Label = null;
+            this.vbox2.Add(this.button12);
+            Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox2[this.button12]));
+            w18.Position = 8;
+            w18.Expand = false;
+            w18.Fill = false;
+            this.Add(this.vbox2);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }

ThePimp/gtk-gui/gui.stetic

@@ -7,7 +7,7 @@
   <import>
     <widget-library name="../Pimp.exe" internal="true" />
   </import>
-  <widget class="Gtk.Window" id="ThePimp.MainWindow" design-size="840 680">
+  <widget class="Gtk.Window" id="ThePimp.MainWindow" design-size="954 680">
     <action-group name="Default">
       <action id="newAction">
         <property name="Type">Action</property>
@@ -265,13 +265,15 @@
           <widget class="Gtk.HPaned" id="hpaned1">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Position">639</property>
+            <property name="Position">27</property>
             <child>
-              <widget class="Gtk.Notebook" id="notebook1">
+              <widget class="Gtk.VPaned" id="vpaned1">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="CurrentPage">0</property>
-                <property name="BorderWidth">5</property>
+                <property name="Position">42</property>
+                <child>
+                  <placeholder />
+                </child>
                 <child>
                   <placeholder />
                 </child>
@@ -281,27 +283,16 @@
               </packing>
             </child>
             <child>
-              <widget class="Gtk.VPaned" id="vpaned1">
+              <widget class="Gtk.HPaned" id="hpaned2">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Position">76</property>
+                <property name="Position">889</property>
                 <child>
-                  <widget class="Gtk.VBox" id="vbox2">
+                  <widget class="Gtk.Notebook" id="notebook1">
                     <property name="MemberName" />
+                    <property name="CanFocus">True</property>
+                    <property name="CurrentPage">0</property>
                     <property name="BorderWidth">5</property>
-                    <child>
-                      <widget class="Gtk.Label" id="label2">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">100</property>
-                        <property name="LabelProp" translatable="yes">Tools</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
                     <child>
                       <placeholder />
                     </child>
@@ -311,22 +302,10 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.VBox" id="vbox3">
+                  <widget class="Gtk.VPaned" id="vpaned2">
                     <property name="MemberName" />
-                    <property name="BorderWidth">5</property>
-                    <child>
-                      <widget class="Gtk.Label" id="label3">
-                        <property name="MemberName" />
-                        <property name="WidthRequest">100</property>
-                        <property name="LabelProp" translatable="yes">Layers &amp; Channels</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
+                    <property name="CanFocus">True</property>
+                    <property name="Position">42</property>
                     <child>
                       <placeholder />
                     </child>
@@ -334,12 +313,12 @@
                       <placeholder />
                     </child>
                   </widget>
+                  <packing>
+                    <property name="Resize">False</property>
+                    <property name="Shrink">False</property>
+                  </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="Resize">False</property>
-                <property name="Shrink">False</property>
-              </packing>
             </child>
           </widget>
           <packing>
@@ -436,274 +415,180 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="ThePimp.ToolBox" design-size="300 300">
+  <widget class="Gtk.Bin" id="ThePimp.ToolBox" design-size="26 234">
     <property name="MemberName" />
     <child>
-      <widget class="Gtk.Table" id="table1">
+      <widget class="Gtk.VBox" id="vbox2">
         <property name="MemberName" />
-        <property name="NRows">4</property>
-        <property name="NColumns">4</property>
-        <property name="RowSpacing">6</property>
-        <property name="ColumnSpacing">6</property>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
         <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <widget class="Gtk.Button" id="button10">
+          <widget class="Gtk.Button" id="button5">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image5">
+              <widget class="Gtk.Image" id="image1">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_draw-rectangle Menu</property>
+                <property name="Pixbuf">stock:stock_show-draw-functions Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="TopAttach">1</property>
-            <property name="BottomAttach">2</property>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
+            <property name="Position">0</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button11">
+          <widget class="Gtk.Button" id="button8">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image6">
+              <widget class="Gtk.Image" id="image2">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_draw-ellipse Menu</property>
+                <property name="Pixbuf">stock:stock_insert-fields-author Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="TopAttach">1</property>
-            <property name="BottomAttach">2</property>
-            <property name="LeftAttach">2</property>
-            <property name="RightAttach">3</property>
+            <property name="Position">1</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button12">
+          <widget class="Gtk.Button" id="button7">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image9">
+              <widget class="Gtk.Image" id="image3">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_3d-color-picker Menu</property>
+                <property name="Pixbuf">stock:gtk-clear Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
-            <property name="LeftAttach">2</property>
-            <property name="RightAttach">3</property>
+            <property name="Position">2</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button13">
+          <widget class="Gtk.Button" id="button9">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image8">
+              <widget class="Gtk.Image" id="image4">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_draw-text Menu</property>
+                <property name="Pixbuf">stock:stock_draw-line Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
+            <property name="Position">3</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button5">
+          <widget class="Gtk.Button" id="button10">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image1">
+              <widget class="Gtk.Image" id="image5">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_show-draw-functions Menu</property>
+                <property name="Pixbuf">stock:stock_draw-rectangle Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
+            <property name="Position">4</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button6">
+          <widget class="Gtk.Button" id="button11">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image7">
+              <widget class="Gtk.Image" id="image6">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_draw-polygon Menu</property>
+                <property name="Pixbuf">stock:stock_draw-ellipse Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="TopAttach">2</property>
-            <property name="BottomAttach">3</property>
+            <property name="Position">5</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button7">
+          <widget class="Gtk.Button" id="button6">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image3">
+              <widget class="Gtk.Image" id="image7">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:gtk-clear Menu</property>
+                <property name="Pixbuf">stock:stock_draw-polygon Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="LeftAttach">2</property>
-            <property name="RightAttach">3</property>
+            <property name="Position">6</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button8">
+          <widget class="Gtk.Button" id="button13">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image2">
+              <widget class="Gtk.Image" id="image8">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_insert-fields-author Menu</property>
+                <property name="Pixbuf">stock:stock_draw-text Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="LeftAttach">1</property>
-            <property name="RightAttach">2</property>
+            <property name="Position">7</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
         <child>
-          <widget class="Gtk.Button" id="button9">
+          <widget class="Gtk.Button" id="button12">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
             <property name="Type">Custom</property>
             <child>
-              <widget class="Gtk.Image" id="image4">
+              <widget class="Gtk.Image" id="image9">
                 <property name="MemberName" />
-                <property name="Pixbuf">stock:stock_draw-line Menu</property>
+                <property name="Pixbuf">stock:stock_3d-color-picker Menu</property>
               </widget>
             </child>
           </widget>
           <packing>
-            <property name="TopAttach">1</property>
-            <property name="BottomAttach">2</property>
+            <property name="Position">8</property>
             <property name="AutoSize">True</property>
-            <property name="XOptions">Fill</property>
-            <property name="YOptions">Fill</property>
-            <property name="XExpand">False</property>
-            <property name="XFill">True</property>
-            <property name="XShrink">False</property>
-            <property name="YExpand">False</property>
-            <property name="YFill">True</property>
-            <property name="YShrink">False</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
       </widget>