ThePimp: reorganised stuff.

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

ThePimp/MainWindow.cs

@@ -17,45 +17,48 @@ using Gtk;
 using Pipi;
 using ThePimp;
 
-public partial class MainWindow: Gtk.Window
+namespace ThePimp
 {
-    public MainWindow (): base (Gtk.WindowType.Toplevel)
+    public partial class MainWindow: Gtk.Window
     {
-        Build ();
-        Title += " v" + Libpipi.getVersion();
-    }
+        public MainWindow (): base (Gtk.WindowType.Toplevel)
+        {
+            Build ();
+            Title += " v" + Libpipi.getVersion();
+        }
 
-    protected void OnDeleteEvent (object sender, DeleteEventArgs a)
-    {
-        Application.Quit ();
-        a.RetVal = true;
-    }
+        protected void OnDeleteEvent (object sender, DeleteEventArgs a)
+        {
+            Application.Quit ();
+            a.RetVal = true;
+        }
 
-    protected virtual void OnOpenActionActivated (object sender, System.EventArgs e)
-    {
-        ThePimp.OpenFile open = new ThePimp.OpenFile();
-        Pipi.Picture p = open.Load();
-        open.Destroy();
-        if(p != null)
+        protected virtual void OnOpenActionActivated (object sender, System.EventArgs e)
         {
-            while(notebook1.NPages > 0)
-                notebook1.RemovePage(0);
-            int n = notebook1.AppendPage(new PictureView(p),
-                                         new Label(p.FileName));
-            notebook1.Page = n;
+            OpenFile open = new OpenFile();
+            Pipi.Picture p = open.Load();
+            open.Destroy();
+            if(p != null)
+            {
+                while(notebook1.NPages > 0)
+                    notebook1.RemovePage(0);
+                int n = notebook1.AppendPage(new PictureView(p),
+                                             new Label(p.FileName));
+                notebook1.Page = n;
+            }
         }
-    }
 
-    protected virtual void OnQuitActionActivated (object sender, System.EventArgs e)
-    {
-        Application.Quit ();
-    }
+        protected virtual void OnQuitActionActivated (object sender, System.EventArgs e)
+        {
+            Application.Quit ();
+        }
 
-    protected virtual void OnSaveAsActionActivated (object sender, System.EventArgs e)
-    {
-        ThePimp.SaveFile save = new ThePimp.SaveFile();
-        ThePimp.PictureView view = notebook1.CurrentPageWidget as ThePimp.PictureView;
-        save.Save(view.Picture);
-        save.Destroy();
+        protected virtual void OnSaveAsActionActivated (object sender, System.EventArgs e)
+        {
+            SaveFile save = new SaveFile();
+            PictureView view = notebook1.CurrentPageWidget as PictureView;
+            save.Save(view.Picture);
+            save.Destroy();
+        }
     }
 }

ThePimp/Makefile.am

@@ -5,24 +5,32 @@ pimp_sources = \
 	$(srcdir)/Main.cs \
 	$(srcdir)/PictureView.cs \
 	$(srcdir)/gtk-gui/generated.cs \
+	$(srcdir)/MainWindow.cs \
+	$(srcdir)/gtk-gui/ThePimp.MainWindow.cs \
 	$(srcdir)/OpenFile.cs \
 	$(srcdir)/gtk-gui/ThePimp.OpenFile.cs \
 	$(srcdir)/SaveFile.cs \
 	$(srcdir)/gtk-gui/ThePimp.SaveFile.cs \
-	$(srcdir)/MainWindow.cs \
-	$(srcdir)/gtk-gui/MainWindow.cs
+	$(srcdir)/ToolBox.cs \
+	$(srcdir)/gtk-gui/ThePimp.ToolBox.cs
+
+pimp_resources = \
+	gtk-gui/gui.stetic \
+	gtk-gui/objects.xml
 
 if USE_CSHARP
 bin_SCRIPTS = Pimp.exe
 endif
 
-EXTRA_DIST = $(pimp_sources)
+EXTRA_DIST = $(pimp_sources) $(pimp_resources)
 
-Pimp.exe: $(pimp_sources)
+Pimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
 	cp ../pipi-sharp/pipi-sharp.dll .
 	cp ../pipi-sharp/pipi-sharp.dll.config .
 	cp ../pipi-sharp/pipi-sharp.dll.mdb .
-	gmcs -debug $(pimp_sources) -out:$@ -lib:./ \
+	gmcs -debug -out:$@ -lib:./ \
+	  $(addprefix $(srcdir)/, $(pimp_sources)) \
+	  $(addprefix -resource:$(srcdir)/, $(pimp_resources)) \
 	  -pkg:gtk-sharp-2.0 -r:Mono.Posix -r:pipi-sharp.dll
 
 clean-local:

ThePimp/ThePimp.mdp

@@ -25,17 +25,17 @@
     <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
     <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
     <File name="MainWindow.cs" subtype="Code" buildaction="Compile" />
-    <File name="gtk-gui/MainWindow.cs" subtype="Code" buildaction="Compile" />
+    <File name="gtk-gui/ThePimp.MainWindow.cs" subtype="Code" buildaction="Compile" />
     <File name="Main.cs" subtype="Code" buildaction="Compile" />
     <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
     <File name="app.desktop" subtype="Code" buildaction="FileCopy" DeployService.TargetDirectoryId="Linux.DesktopApplications" />
-    <File name="OpenFile.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/objects.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="PictureView.cs" subtype="Code" buildaction="Compile" />
+    <File name="gtk-gui/ThePimp.PictureView.cs" subtype="Code" buildaction="Compile" />
+    <File name="OpenFile.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/ThePimp.OpenFile.cs" subtype="Code" buildaction="Compile" />
     <File name="ToolBox.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/ThePimp.ToolBox.cs" subtype="Code" buildaction="Compile" />
-    <File name="gtk-gui/ThePimp.PictureView.cs" subtype="Code" buildaction="Compile" />
     <File name="SaveFile.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/ThePimp.SaveFile.cs" subtype="Code" buildaction="Compile" />
   </Contents>
@@ -56,4 +56,4 @@
       <Widget>ThePimp.ToolBox</Widget>
     </ExportedWidgets>
   </GtkDesignInfo>
-</Project>
+</Project>

ThePimp/gtk-gui/MainWindow.cs

@@ -1,300 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-
-
-
-public partial class MainWindow {
-    
-    private Gtk.Action newAction;
-    
-    private Gtk.Action openAction;
-    
-    private Gtk.Action saveAction;
-    
-    private Gtk.Action Action;
-    
-    private Gtk.Action FileAction;
-    
-    private Gtk.Action EditAction;
-    
-    private Gtk.Action ViewAction;
-    
-    private Gtk.Action HelpAction;
-    
-    private Gtk.Action NewAction;
-    
-    private Gtk.Action OpenAction;
-    
-    private Gtk.Action SaveAction;
-    
-    private Gtk.Action SaveAsAction;
-    
-    private Gtk.Action QuitAction;
-    
-    private Gtk.Action HelpAction1;
-    
-    private Gtk.Action AboutAction;
-    
-    private Gtk.Action UndoAction;
-    
-    private Gtk.Action RedoAction;
-    
-    private Gtk.Action BestFitAction;
-    
-    private Gtk.Action NormalSizeAction;
-    
-    private Gtk.Action ZoomOutAction;
-    
-    private Gtk.Action ZoomInAction;
-    
-    private Gtk.Action undoAction;
-    
-    private Gtk.Action redoAction;
-    
-    private Gtk.Action zoom100Action;
-    
-    private Gtk.Action zoomFitAction;
-    
-    private Gtk.Action zoomOutAction;
-    
-    private Gtk.Action zoomInAction;
-    
-    private Gtk.Action helpAction;
-    
-    private Gtk.Action saveAsAction;
-    
-    private Gtk.VBox vbox1;
-    
-    private Gtk.MenuBar menubar1;
-    
-    private Gtk.Toolbar toolbar1;
-    
-    private Gtk.HPaned hpaned1;
-    
-    private Gtk.Notebook notebook1;
-    
-    private Gtk.VPaned vpaned1;
-    
-    private Gtk.VBox vbox2;
-    
-    private Gtk.Label label2;
-    
-    private Gtk.VBox vbox3;
-    
-    private Gtk.Label label3;
-    
-    private Gtk.Statusbar statusbar1;
-    
-    protected virtual void Build() {
-        Stetic.Gui.Initialize(this);
-        // Widget MainWindow
-        Gtk.UIManager w1 = new Gtk.UIManager();
-        Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default");
-        this.newAction = new Gtk.Action("newAction", null, null, "gtk-new");
-        this.newAction.Sensitive = false;
-        w2.Add(this.newAction, null);
-        this.openAction = new Gtk.Action("openAction", null, null, "gtk-open");
-        w2.Add(this.openAction, null);
-        this.saveAction = new Gtk.Action("saveAction", null, null, "gtk-save");
-        this.saveAction.Sensitive = false;
-        w2.Add(this.saveAction, null);
-        this.Action = new Gtk.Action("Action", null, null, null);
-        w2.Add(this.Action, null);
-        this.FileAction = new Gtk.Action("FileAction", Mono.Unix.Catalog.GetString("File"), null, null);
-        this.FileAction.ShortLabel = Mono.Unix.Catalog.GetString("File");
-        w2.Add(this.FileAction, null);
-        this.EditAction = new Gtk.Action("EditAction", Mono.Unix.Catalog.GetString("Edit"), null, null);
-        this.EditAction.ShortLabel = Mono.Unix.Catalog.GetString("Edit");
-        w2.Add(this.EditAction, null);
-        this.ViewAction = new Gtk.Action("ViewAction", Mono.Unix.Catalog.GetString("View"), null, null);
-        this.ViewAction.ShortLabel = Mono.Unix.Catalog.GetString("View");
-        w2.Add(this.ViewAction, null);
-        this.HelpAction = new Gtk.Action("HelpAction", Mono.Unix.Catalog.GetString("Help"), null, null);
-        this.HelpAction.ShortLabel = Mono.Unix.Catalog.GetString("Help");
-        w2.Add(this.HelpAction, null);
-        this.NewAction = new Gtk.Action("NewAction", Mono.Unix.Catalog.GetString("_New"), null, "gtk-new");
-        this.NewAction.Sensitive = false;
-        this.NewAction.ShortLabel = Mono.Unix.Catalog.GetString("_New");
-        w2.Add(this.NewAction, null);
-        this.OpenAction = new Gtk.Action("OpenAction", Mono.Unix.Catalog.GetString("_Open"), null, "gtk-open");
-        this.OpenAction.ShortLabel = Mono.Unix.Catalog.GetString("_Open");
-        w2.Add(this.OpenAction, null);
-        this.SaveAction = new Gtk.Action("SaveAction", Mono.Unix.Catalog.GetString("_Save"), null, "gtk-save");
-        this.SaveAction.Sensitive = false;
-        this.SaveAction.ShortLabel = Mono.Unix.Catalog.GetString("_Save");
-        w2.Add(this.SaveAction, null);
-        this.SaveAsAction = new Gtk.Action("SaveAsAction", Mono.Unix.Catalog.GetString("Save _As"), null, "gtk-save-as");
-        this.SaveAsAction.ShortLabel = Mono.Unix.Catalog.GetString("Save _As");
-        w2.Add(this.SaveAsAction, null);
-        this.QuitAction = new Gtk.Action("QuitAction", Mono.Unix.Catalog.GetString("_Quit"), null, "gtk-quit");
-        this.QuitAction.ShortLabel = Mono.Unix.Catalog.GetString("_Quit");
-        w2.Add(this.QuitAction, null);
-        this.HelpAction1 = new Gtk.Action("HelpAction1", Mono.Unix.Catalog.GetString("_Help"), null, "gtk-help");
-        this.HelpAction1.Sensitive = false;
-        this.HelpAction1.ShortLabel = Mono.Unix.Catalog.GetString("_Help");
-        w2.Add(this.HelpAction1, null);
-        this.AboutAction = new Gtk.Action("AboutAction", Mono.Unix.Catalog.GetString("_About"), null, "gtk-about");
-        this.AboutAction.Sensitive = false;
-        this.AboutAction.ShortLabel = Mono.Unix.Catalog.GetString("_About");
-        w2.Add(this.AboutAction, null);
-        this.UndoAction = new Gtk.Action("UndoAction", Mono.Unix.Catalog.GetString("_Undo"), null, "gtk-undo");
-        this.UndoAction.Sensitive = false;
-        this.UndoAction.ShortLabel = Mono.Unix.Catalog.GetString("_Undo");
-        w2.Add(this.UndoAction, null);
-        this.RedoAction = new Gtk.Action("RedoAction", Mono.Unix.Catalog.GetString("_Redo"), null, "gtk-redo");
-        this.RedoAction.Sensitive = false;
-        this.RedoAction.ShortLabel = Mono.Unix.Catalog.GetString("_Redo");
-        w2.Add(this.RedoAction, null);
-        this.BestFitAction = new Gtk.Action("BestFitAction", Mono.Unix.Catalog.GetString("Best _Fit"), null, "gtk-zoom-fit");
-        this.BestFitAction.Sensitive = false;
-        this.BestFitAction.ShortLabel = Mono.Unix.Catalog.GetString("Best _Fit");
-        w2.Add(this.BestFitAction, null);
-        this.NormalSizeAction = new Gtk.Action("NormalSizeAction", Mono.Unix.Catalog.GetString("_Normal Size"), null, "gtk-zoom-100");
-        this.NormalSizeAction.Sensitive = false;
-        this.NormalSizeAction.ShortLabel = Mono.Unix.Catalog.GetString("_Normal Size");
-        w2.Add(this.NormalSizeAction, null);
-        this.ZoomOutAction = new Gtk.Action("ZoomOutAction", Mono.Unix.Catalog.GetString("Zoom _Out"), null, "gtk-zoom-out");
-        this.ZoomOutAction.Sensitive = false;
-        this.ZoomOutAction.ShortLabel = Mono.Unix.Catalog.GetString("Zoom _Out");
-        w2.Add(this.ZoomOutAction, null);
-        this.ZoomInAction = new Gtk.Action("ZoomInAction", Mono.Unix.Catalog.GetString("Zoom _In"), null, "gtk-zoom-in");
-        this.ZoomInAction.Sensitive = false;
-        this.ZoomInAction.ShortLabel = Mono.Unix.Catalog.GetString("Zoom _In");
-        w2.Add(this.ZoomInAction, null);
-        this.undoAction = new Gtk.Action("undoAction", null, null, "gtk-undo");
-        this.undoAction.Sensitive = false;
-        w2.Add(this.undoAction, null);
-        this.redoAction = new Gtk.Action("redoAction", null, null, "gtk-redo");
-        this.redoAction.Sensitive = false;
-        w2.Add(this.redoAction, null);
-        this.zoom100Action = new Gtk.Action("zoom100Action", null, null, "gtk-zoom-100");
-        this.zoom100Action.Sensitive = false;
-        w2.Add(this.zoom100Action, null);
-        this.zoomFitAction = new Gtk.Action("zoomFitAction", null, null, "gtk-zoom-fit");
-        this.zoomFitAction.Sensitive = false;
-        w2.Add(this.zoomFitAction, null);
-        this.zoomOutAction = new Gtk.Action("zoomOutAction", null, null, "gtk-zoom-out");
-        this.zoomOutAction.Sensitive = false;
-        w2.Add(this.zoomOutAction, null);
-        this.zoomInAction = new Gtk.Action("zoomInAction", null, null, "gtk-zoom-in");
-        this.zoomInAction.Sensitive = false;
-        w2.Add(this.zoomInAction, null);
-        this.helpAction = new Gtk.Action("helpAction", null, null, "gtk-help");
-        this.helpAction.Sensitive = false;
-        w2.Add(this.helpAction, null);
-        this.saveAsAction = new Gtk.Action("saveAsAction", null, null, "gtk-save-as");
-        w2.Add(this.saveAsAction, null);
-        w1.InsertActionGroup(w2, 0);
-        this.AddAccelGroup(w1.AccelGroup);
-        this.Name = "MainWindow";
-        this.Title = Mono.Unix.Catalog.GetString("The Pimp");
-        this.Icon = Stetic.IconLoader.LoadIcon(this, "stock_insert_image", Gtk.IconSize.Menu, 16);
-        this.WindowPosition = ((Gtk.WindowPosition)(4));
-        // Container child MainWindow.Gtk.Container+ContainerChild
-        this.vbox1 = new Gtk.VBox();
-        this.vbox1.Name = "vbox1";
-        // Container child vbox1.Gtk.Box+BoxChild
-        w1.AddUiFromString("<ui><menubar name='menubar1'><menu action='FileAction'><menuitem action='NewAction'/><menuitem action='OpenAction'/><menuitem action='SaveAction'/><menuitem action='SaveAsAction'/><menuitem action='QuitAction'/></menu><menu action='EditAction'><menuitem action='UndoAction'/><menuitem action='RedoAction'/></menu><menu action='ViewAction'><menuitem action='ZoomInAction'/><menuitem action='ZoomOutAction'/><menuitem action='BestFitAction'/><menuitem action='NormalSizeAction'/></menu><menu action='HelpAction'><menuitem action='HelpAction1'/><menuitem action='AboutAction'/></menu></menubar></ui>");
-        this.menubar1 = ((Gtk.MenuBar)(w1.GetWidget("/menubar1")));
-        this.menubar1.Name = "menubar1";
-        this.vbox1.Add(this.menubar1);
-        Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.menubar1]));
-        w3.Position = 0;
-        w3.Expand = false;
-        w3.Fill = false;
-        // Container child vbox1.Gtk.Box+BoxChild
-        w1.AddUiFromString("<ui><toolbar name='toolbar1'><toolitem action='newAction'/><toolitem action='openAction'/><toolitem action='saveAction'/><toolitem action='saveAsAction'/><separator/><toolitem action='undoAction'/><toolitem action='redoAction'/><separator/><toolitem action='zoomInAction'/><toolitem action='zoomOutAction'/><toolitem action='zoomFitAction'/><toolitem action='zoom100Action'/><separator/><toolitem action='helpAction'/></toolbar></ui>");
-        this.toolbar1 = ((Gtk.Toolbar)(w1.GetWidget("/toolbar1")));
-        this.toolbar1.Name = "toolbar1";
-        this.toolbar1.ShowArrow = false;
-        this.toolbar1.ToolbarStyle = ((Gtk.ToolbarStyle)(0));
-        this.vbox1.Add(this.toolbar1);
-        Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox1[this.toolbar1]));
-        w4.Position = 1;
-        w4.Expand = false;
-        w4.Fill = false;
-        // Container child vbox1.Gtk.Box+BoxChild
-        this.hpaned1 = new Gtk.HPaned();
-        this.hpaned1.CanFocus = true;
-        this.hpaned1.Name = "hpaned1";
-        this.hpaned1.Position = 408;
-        // Container child hpaned1.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 = 60;
-        // 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]));
-        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);
-        this.vbox1.Add(this.hpaned1);
-        Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox1[this.hpaned1]));
-        w11.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;
-        this.Add(this.vbox1);
-        if ((this.Child != null)) {
-            this.Child.ShowAll();
-        }
-        this.DefaultWidth = 840;
-        this.DefaultHeight = 680;
-        this.Show();
-        this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
-        this.openAction.Activated += new System.EventHandler(this.OnOpenActionActivated);
-        this.OpenAction.Activated += new System.EventHandler(this.OnOpenActionActivated);
-        this.QuitAction.Activated += new System.EventHandler(this.OnQuitActionActivated);
-        this.saveAsAction.Activated += new System.EventHandler(this.OnSaveAsActionActivated);
-    }
-}

ThePimp/gtk-gui/ThePimp.MainWindow.cs

@@ -0,0 +1,305 @@
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace ThePimp {
+    
+    
+    public partial class MainWindow {
+        
+        private Gtk.Action newAction;
+        
+        private Gtk.Action openAction;
+        
+        private Gtk.Action saveAction;
+        
+        private Gtk.Action Action;
+        
+        private Gtk.Action FileAction;
+        
+        private Gtk.Action EditAction;
+        
+        private Gtk.Action ViewAction;
+        
+        private Gtk.Action HelpAction;
+        
+        private Gtk.Action NewAction;
+        
+        private Gtk.Action OpenAction;
+        
+        private Gtk.Action SaveAction;
+        
+        private Gtk.Action SaveAsAction;
+        
+        private Gtk.Action QuitAction;
+        
+        private Gtk.Action HelpAction1;
+        
+        private Gtk.Action AboutAction;
+        
+        private Gtk.Action UndoAction;
+        
+        private Gtk.Action RedoAction;
+        
+        private Gtk.Action BestFitAction;
+        
+        private Gtk.Action NormalSizeAction;
+        
+        private Gtk.Action ZoomOutAction;
+        
+        private Gtk.Action ZoomInAction;
+        
+        private Gtk.Action undoAction;
+        
+        private Gtk.Action redoAction;
+        
+        private Gtk.Action zoom100Action;
+        
+        private Gtk.Action zoomFitAction;
+        
+        private Gtk.Action zoomOutAction;
+        
+        private Gtk.Action zoomInAction;
+        
+        private Gtk.Action helpAction;
+        
+        private Gtk.Action saveAsAction;
+        
+        private Gtk.VBox vbox1;
+        
+        private Gtk.MenuBar menubar1;
+        
+        private Gtk.Toolbar toolbar1;
+        
+        private Gtk.HPaned hpaned1;
+        
+        private Gtk.Notebook notebook1;
+        
+        private Gtk.VPaned vpaned1;
+        
+        private Gtk.VBox vbox2;
+        
+        private Gtk.Label label2;
+        
+        private Gtk.VBox vbox3;
+        
+        private Gtk.Label label3;
+        
+        private Gtk.Statusbar statusbar1;
+        
+        protected virtual void Build() {
+            Stetic.Gui.Initialize(this);
+            // Widget ThePimp.MainWindow
+            Gtk.UIManager w1 = new Gtk.UIManager();
+            Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default");
+            this.newAction = new Gtk.Action("newAction", null, null, "gtk-new");
+            this.newAction.Sensitive = false;
+            w2.Add(this.newAction, null);
+            this.openAction = new Gtk.Action("openAction", null, null, "gtk-open");
+            w2.Add(this.openAction, null);
+            this.saveAction = new Gtk.Action("saveAction", null, null, "gtk-save");
+            this.saveAction.Sensitive = false;
+            w2.Add(this.saveAction, null);
+            this.Action = new Gtk.Action("Action", null, null, null);
+            w2.Add(this.Action, null);
+            this.FileAction = new Gtk.Action("FileAction", Mono.Unix.Catalog.GetString("File"), null, null);
+            this.FileAction.ShortLabel = Mono.Unix.Catalog.GetString("File");
+            w2.Add(this.FileAction, null);
+            this.EditAction = new Gtk.Action("EditAction", Mono.Unix.Catalog.GetString("Edit"), null, null);
+            this.EditAction.ShortLabel = Mono.Unix.Catalog.GetString("Edit");
+            w2.Add(this.EditAction, null);
+            this.ViewAction = new Gtk.Action("ViewAction", Mono.Unix.Catalog.GetString("View"), null, null);
+            this.ViewAction.ShortLabel = Mono.Unix.Catalog.GetString("View");
+            w2.Add(this.ViewAction, null);
+            this.HelpAction = new Gtk.Action("HelpAction", Mono.Unix.Catalog.GetString("Help"), null, null);
+            this.HelpAction.ShortLabel = Mono.Unix.Catalog.GetString("Help");
+            w2.Add(this.HelpAction, null);
+            this.NewAction = new Gtk.Action("NewAction", Mono.Unix.Catalog.GetString("_New"), null, "gtk-new");
+            this.NewAction.Sensitive = false;
+            this.NewAction.ShortLabel = Mono.Unix.Catalog.GetString("_New");
+            w2.Add(this.NewAction, null);
+            this.OpenAction = new Gtk.Action("OpenAction", Mono.Unix.Catalog.GetString("_Open"), null, "gtk-open");
+            this.OpenAction.ShortLabel = Mono.Unix.Catalog.GetString("_Open");
+            w2.Add(this.OpenAction, null);
+            this.SaveAction = new Gtk.Action("SaveAction", Mono.Unix.Catalog.GetString("_Save"), null, "gtk-save");
+            this.SaveAction.Sensitive = false;
+            this.SaveAction.ShortLabel = Mono.Unix.Catalog.GetString("_Save");
+            w2.Add(this.SaveAction, null);
+            this.SaveAsAction = new Gtk.Action("SaveAsAction", Mono.Unix.Catalog.GetString("Save _As"), null, "gtk-save-as");
+            this.SaveAsAction.ShortLabel = Mono.Unix.Catalog.GetString("Save _As");
+            w2.Add(this.SaveAsAction, null);
+            this.QuitAction = new Gtk.Action("QuitAction", Mono.Unix.Catalog.GetString("_Quit"), null, "gtk-quit");
+            this.QuitAction.ShortLabel = Mono.Unix.Catalog.GetString("_Quit");
+            w2.Add(this.QuitAction, null);
+            this.HelpAction1 = new Gtk.Action("HelpAction1", Mono.Unix.Catalog.GetString("_Help"), null, "gtk-help");
+            this.HelpAction1.Sensitive = false;
+            this.HelpAction1.ShortLabel = Mono.Unix.Catalog.GetString("_Help");
+            w2.Add(this.HelpAction1, null);
+            this.AboutAction = new Gtk.Action("AboutAction", Mono.Unix.Catalog.GetString("_About"), null, "gtk-about");
+            this.AboutAction.Sensitive = false;
+            this.AboutAction.ShortLabel = Mono.Unix.Catalog.GetString("_About");
+            w2.Add(this.AboutAction, null);
+            this.UndoAction = new Gtk.Action("UndoAction", Mono.Unix.Catalog.GetString("_Undo"), null, "gtk-undo");
+            this.UndoAction.Sensitive = false;
+            this.UndoAction.ShortLabel = Mono.Unix.Catalog.GetString("_Undo");
+            w2.Add(this.UndoAction, null);
+            this.RedoAction = new Gtk.Action("RedoAction", Mono.Unix.Catalog.GetString("_Redo"), null, "gtk-redo");
+            this.RedoAction.Sensitive = false;
+            this.RedoAction.ShortLabel = Mono.Unix.Catalog.GetString("_Redo");
+            w2.Add(this.RedoAction, null);
+            this.BestFitAction = new Gtk.Action("BestFitAction", Mono.Unix.Catalog.GetString("Best _Fit"), null, "gtk-zoom-fit");
+            this.BestFitAction.Sensitive = false;
+            this.BestFitAction.ShortLabel = Mono.Unix.Catalog.GetString("Best _Fit");
+            w2.Add(this.BestFitAction, null);
+            this.NormalSizeAction = new Gtk.Action("NormalSizeAction", Mono.Unix.Catalog.GetString("_Normal Size"), null, "gtk-zoom-100");
+            this.NormalSizeAction.Sensitive = false;
+            this.NormalSizeAction.ShortLabel = Mono.Unix.Catalog.GetString("_Normal Size");
+            w2.Add(this.NormalSizeAction, null);
+            this.ZoomOutAction = new Gtk.Action("ZoomOutAction", Mono.Unix.Catalog.GetString("Zoom _Out"), null, "gtk-zoom-out");
+            this.ZoomOutAction.Sensitive = false;
+            this.ZoomOutAction.ShortLabel = Mono.Unix.Catalog.GetString("Zoom _Out");
+            w2.Add(this.ZoomOutAction, null);
+            this.ZoomInAction = new Gtk.Action("ZoomInAction", Mono.Unix.Catalog.GetString("Zoom _In"), null, "gtk-zoom-in");
+            this.ZoomInAction.Sensitive = false;
+            this.ZoomInAction.ShortLabel = Mono.Unix.Catalog.GetString("Zoom _In");
+            w2.Add(this.ZoomInAction, null);
+            this.undoAction = new Gtk.Action("undoAction", null, null, "gtk-undo");
+            this.undoAction.Sensitive = false;
+            w2.Add(this.undoAction, null);
+            this.redoAction = new Gtk.Action("redoAction", null, null, "gtk-redo");
+            this.redoAction.Sensitive = false;
+            w2.Add(this.redoAction, null);
+            this.zoom100Action = new Gtk.Action("zoom100Action", null, null, "gtk-zoom-100");
+            this.zoom100Action.Sensitive = false;
+            w2.Add(this.zoom100Action, null);
+            this.zoomFitAction = new Gtk.Action("zoomFitAction", null, null, "gtk-zoom-fit");
+            this.zoomFitAction.Sensitive = false;
+            w2.Add(this.zoomFitAction, null);
+            this.zoomOutAction = new Gtk.Action("zoomOutAction", null, null, "gtk-zoom-out");
+            this.zoomOutAction.Sensitive = false;
+            w2.Add(this.zoomOutAction, null);
+            this.zoomInAction = new Gtk.Action("zoomInAction", null, null, "gtk-zoom-in");
+            this.zoomInAction.Sensitive = false;
+            w2.Add(this.zoomInAction, null);
+            this.helpAction = new Gtk.Action("helpAction", null, null, "gtk-help");
+            this.helpAction.Sensitive = false;
+            w2.Add(this.helpAction, null);
+            this.saveAsAction = new Gtk.Action("saveAsAction", null, null, "gtk-save-as");
+            w2.Add(this.saveAsAction, null);
+            w1.InsertActionGroup(w2, 0);
+            this.AddAccelGroup(w1.AccelGroup);
+            this.Name = "ThePimp.MainWindow";
+            this.Title = Mono.Unix.Catalog.GetString("The Pimp");
+            this.Icon = Stetic.IconLoader.LoadIcon(this, "stock_insert_image", Gtk.IconSize.Menu, 16);
+            this.WindowPosition = ((Gtk.WindowPosition)(4));
+            // Container child ThePimp.MainWindow.Gtk.Container+ContainerChild
+            this.vbox1 = new Gtk.VBox();
+            this.vbox1.Name = "vbox1";
+            // Container child vbox1.Gtk.Box+BoxChild
+            w1.AddUiFromString("<ui><menubar name='menubar1'><menu action='FileAction'><menuitem action='NewAction'/><menuitem action='OpenAction'/><menuitem action='SaveAction'/><menuitem action='SaveAsAction'/><menuitem action='QuitAction'/></menu><menu action='EditAction'><menuitem action='UndoAction'/><menuitem action='RedoAction'/></menu><menu action='ViewAction'><menuitem action='ZoomInAction'/><menuitem action='ZoomOutAction'/><menuitem action='BestFitAction'/><menuitem action='NormalSizeAction'/></menu><menu action='HelpAction'><menuitem action='HelpAction1'/><menuitem action='AboutAction'/></menu></menubar></ui>");
+            this.menubar1 = ((Gtk.MenuBar)(w1.GetWidget("/menubar1")));
+            this.menubar1.Name = "menubar1";
+            this.vbox1.Add(this.menubar1);
+            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.menubar1]));
+            w3.Position = 0;
+            w3.Expand = false;
+            w3.Fill = false;
+            // Container child vbox1.Gtk.Box+BoxChild
+            w1.AddUiFromString("<ui><toolbar name='toolbar1'><toolitem action='newAction'/><toolitem action='openAction'/><toolitem action='saveAction'/><toolitem action='saveAsAction'/><separator/><toolitem action='undoAction'/><toolitem action='redoAction'/><separator/><toolitem action='zoomInAction'/><toolitem action='zoomOutAction'/><toolitem action='zoomFitAction'/><toolitem action='zoom100Action'/><separator/><toolitem action='helpAction'/></toolbar></ui>");
+            this.toolbar1 = ((Gtk.Toolbar)(w1.GetWidget("/toolbar1")));
+            this.toolbar1.Name = "toolbar1";
+            this.toolbar1.ShowArrow = false;
+            this.toolbar1.ToolbarStyle = ((Gtk.ToolbarStyle)(0));
+            this.vbox1.Add(this.toolbar1);
+            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox1[this.toolbar1]));
+            w4.Position = 1;
+            w4.Expand = false;
+            w4.Fill = false;
+            // Container child vbox1.Gtk.Box+BoxChild
+            this.hpaned1 = new Gtk.HPaned();
+            this.hpaned1.CanFocus = true;
+            this.hpaned1.Name = "hpaned1";
+            this.hpaned1.Position = 639;
+            // Container child hpaned1.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]));
+            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;
+            this.vbox1.Add(this.hpaned1);
+            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox1[this.hpaned1]));
+            w11.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;
+            this.Add(this.vbox1);
+            if ((this.Child != null)) {
+                this.Child.ShowAll();
+            }
+            this.DefaultWidth = 840;
+            this.DefaultHeight = 680;
+            this.Show();
+            this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
+            this.openAction.Activated += new System.EventHandler(this.OnOpenActionActivated);
+            this.OpenAction.Activated += new System.EventHandler(this.OnOpenActionActivated);
+            this.QuitAction.Activated += new System.EventHandler(this.OnQuitActionActivated);
+            this.saveAsAction.Activated += new System.EventHandler(this.OnSaveAsActionActivated);
+        }
+    }
+}

ThePimp/gtk-gui/ThePimp.OpenFile.cs

@@ -24,7 +24,7 @@ namespace ThePimp {
             // Widget ThePimp.OpenFile
             this.Name = "ThePimp.OpenFile";
             this.Title = Mono.Unix.Catalog.GetString("Open File");
-            this.Icon = Stetic.IconLoader.LoadIcon(this, "gtk-open", Gtk.IconSize.Menu, 16);
+            this.Icon = Stetic.IconLoader.LoadIcon(this, "stock_open", Gtk.IconSize.Menu, 16);
             this.TypeHint = ((Gdk.WindowTypeHint)(1));
             this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.Modal = true;
@@ -73,8 +73,8 @@ namespace ThePimp {
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
-            this.DefaultWidth = 627;
-            this.DefaultHeight = 448;
+            this.DefaultWidth = 640;
+            this.DefaultHeight = 480;
             this.Show();
         }
     }

ThePimp/gtk-gui/ThePimp.SaveFile.cs

@@ -23,6 +23,8 @@ namespace ThePimp {
             Stetic.Gui.Initialize(this);
             // Widget ThePimp.SaveFile
             this.Name = "ThePimp.SaveFile";
+            this.Title = Mono.Unix.Catalog.GetString("Save File");
+            this.Icon = Stetic.IconLoader.LoadIcon(this, "stock_save", Gtk.IconSize.Menu, 16);
             this.WindowPosition = ((Gtk.WindowPosition)(4));
             this.HasSeparator = false;
             // Internal child ThePimp.SaveFile.VBox
@@ -69,8 +71,8 @@ namespace ThePimp {
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
-            this.DefaultWidth = 400;
-            this.DefaultHeight = 300;
+            this.DefaultWidth = 640;
+            this.DefaultHeight = 480;
             this.Show();
         }
     }

ThePimp/gtk-gui/ThePimp.ToolBox.cs

@@ -57,7 +57,7 @@ namespace ThePimp {
             Stetic.BinContainer.Attach(this);
             this.Name = "ThePimp.ToolBox";
             // Container child ThePimp.ToolBox.Gtk.Container+ContainerChild
-            this.table1 = new Gtk.Table(((uint)(3)), ((uint)(3)), false);
+            this.table1 = new Gtk.Table(((uint)(4)), ((uint)(4)), false);
             this.table1.Name = "table1";
             this.table1.RowSpacing = ((uint)(6));
             this.table1.ColumnSpacing = ((uint)(6));

ThePimp/gtk-gui/gui.stetic

@@ -7,7 +7,7 @@
   <import>
     <widget-library name="../Pimp.exe" internal="true" />
   </import>
-  <widget class="Gtk.Window" id="MainWindow" design-size="840 680">
+  <widget class="Gtk.Window" id="ThePimp.MainWindow" design-size="840 680">
     <action-group name="Default">
       <action id="newAction">
         <property name="Type">Action</property>
@@ -265,7 +265,7 @@
           <widget class="Gtk.HPaned" id="hpaned1">
             <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Position">408</property>
+            <property name="Position">639</property>
             <child>
               <widget class="Gtk.Notebook" id="notebook1">
                 <property name="MemberName" />
@@ -284,7 +284,7 @@
               <widget class="Gtk.VPaned" id="vpaned1">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
-                <property name="Position">60</property>
+                <property name="Position">76</property>
                 <child>
                   <widget class="Gtk.VBox" id="vbox2">
                     <property name="MemberName" />
@@ -305,9 +305,6 @@
                     <child>
                       <placeholder />
                     </child>
-                    <child>
-                      <placeholder />
-                    </child>
                   </widget>
                   <packing>
                     <property name="Resize">False</property>
@@ -339,6 +336,10 @@
                   </widget>
                 </child>
               </widget>
+              <packing>
+                <property name="Resize">False</property>
+                <property name="Shrink">False</property>
+              </packing>
             </child>
           </widget>
           <packing>
@@ -367,10 +368,10 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="ThePimp.OpenFile" design-size="627 448">
+  <widget class="Gtk.Dialog" id="ThePimp.OpenFile" design-size="640 480">
     <property name="MemberName" />
     <property name="Title" translatable="yes">Open File</property>
-    <property name="Icon">stock:gtk-open Menu</property>
+    <property name="Icon">stock:stock_open Menu</property>
     <property name="TypeHint">Dialog</property>
     <property name="WindowPosition">CenterOnParent</property>
     <property name="Modal">True</property>
@@ -440,10 +441,31 @@
     <child>
       <widget class="Gtk.Table" id="table1">
         <property name="MemberName" />
-        <property name="NRows">3</property>
-        <property name="NColumns">3</property>
+        <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">
             <property name="MemberName" />
@@ -693,8 +715,10 @@
       <placeholder />
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="ThePimp.SaveFile" design-size="400 300">
+  <widget class="Gtk.Dialog" id="ThePimp.SaveFile" design-size="640 480">
     <property name="MemberName" />
+    <property name="Title" translatable="yes">Save File</property>
+    <property name="Icon">stock:stock_save Menu</property>
     <property name="WindowPosition">CenterOnParent</property>
     <property name="Buttons">2</property>
     <property name="HelpButton">False</property>