From 70db87d917cdd3d85ab62fe1e01b90851e90030a Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Thu, 16 Jul 2015 16:35:32 +0800
Subject: [PATCH] src/Builder4/MainWindow.bjs src/Builder4/MainWindow.vala

---
 src/Builder4/MainWindow.bjs  | 74 ++++++++++++++++++------------------
 src/Builder4/MainWindow.vala | 16 ++++----
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index aa78db3fe..032b86608 100644
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -99,49 +99,49 @@
            "$ xns" : "Gtk"
           }
          ]
-        }
-       ]
-      },
-      {
-       "listeners" : {
-        "clicked" : "  ( ) => {\n   _this.windowstate.switchState(WindowState.State.FILES);\n      \n\n}"
-       },
-       "* pack" : false,
-       "xtype" : "Button",
-       "width_request" : 50,
-       "$ xns" : "Gtk",
-       "height_request" : 50,
-       "$ tooltop_text" : "\"Open File\"",
-       "items" : [
+        },
         {
-         "xtype" : "Image",
-         "utf8 icon_name" : "document-open",
-         "* pack" : "set_image",
-         "$ xns" : "Gtk"
+         "listeners" : {
+          "clicked" : "  ( ) => {\n   _this.windowstate.switchState(WindowState.State.FILES);\n      \n\n}"
+         },
+         "* pack" : false,
+         "xtype" : "Button",
+         "width_request" : 50,
+         "$ xns" : "Gtk",
+         "height_request" : 50,
+         "$ tooltop_text" : "\"Open File\"",
+         "items" : [
+          {
+           "xtype" : "Image",
+           "utf8 icon_name" : "document-open",
+           "* pack" : "set_image",
+           "$ xns" : "Gtk"
+          }
+         ]
+        },
+        {
+         "listeners" : {
+          "clicked" : "  ( ) => {\n  \n    _this.windowstate.switchState(WindowState.State.PREVIEW);\n    \n\n}"
+         },
+         "utf8 tooltip_text" : "Back",
+         "xtype" : "Button",
+         "* pack" : false,
+         "width_request" : 50,
+         "$ xns" : "Gtk",
+         "height_request" : 50,
+         "items" : [
+          {
+           "* pack" : "set_image",
+           "xtype" : "Image",
+           "utf8 icon_name" : "go-previous",
+           "$ xns" : "Gtk"
+          }
+         ]
         }
        ]
       }
      ]
     },
-    {
-     "listeners" : {
-      "clicked" : "  ( ) => {\n  \n    _this.windowstate.switchState(WindowState.State.PREVIEW);\n    \n\n}"
-     },
-     "utf8 tooltip_text" : "Back",
-     "xtype" : "Button",
-     "* pack" : false,
-     "width_request" : 50,
-     "$ xns" : "Gtk",
-     "height_request" : 50,
-     "items" : [
-      {
-       "* pack" : "set_image",
-       "xtype" : "Image",
-       "utf8 icon_name" : "go-previous",
-       "$ xns" : "Gtk"
-      }
-     ]
-    },
     {
      "id" : "vbox",
      "* pack" : "add",
diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index a1f28852e..d5bcd237e 100644
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -71,11 +71,9 @@ public class Xcls_MainWindow : Object
         var child_0 = new Xcls_headerbar( _this );
         child_0.ref();
         this.el.set_titlebar (  child_0.el  );
-        var child_1 = new Xcls_Button13( _this );
+        var child_1 = new Xcls_vbox( _this );
         child_1.ref();
-        var child_2 = new Xcls_vbox( _this );
-        child_2.ref();
-        this.el.add (  child_2.el  );
+        this.el.add (  child_1.el  );
 
         // init method
 
@@ -196,8 +194,6 @@ public class Xcls_MainWindow : Object
             var child_0 = new Xcls_Box3( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el  );
-            var child_1 = new Xcls_Button11( _this );
-            child_1.ref();
         }
 
         // user defined functions
@@ -222,6 +218,10 @@ public class Xcls_MainWindow : Object
             var child_0 = new Xcls_MenuButton4( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
+            var child_1 = new Xcls_Button11( _this );
+            child_1.ref();
+            var child_2 = new Xcls_Button13( _this );
+            child_2.ref();
         }
 
         // user defined functions
@@ -425,7 +425,6 @@ public class Xcls_MainWindow : Object
     }
 
 
-
     public class Xcls_Button11 : Object
     {
         public Gtk.Button el;
@@ -483,7 +482,6 @@ public class Xcls_MainWindow : Object
     }
 
 
-
     public class Xcls_Button13 : Object
     {
         public Gtk.Button el;
@@ -543,6 +541,8 @@ public class Xcls_MainWindow : Object
     }
 
 
+
+
     public class Xcls_vbox : Object
     {
         public Gtk.Box el;
-- 
2.39.2