src/Builder4/MainWindow.bjs

src/Builder4/MainWindow.vala

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index 1a85be0..2113e57 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -31,21 +31,22 @@
    "items" : [
     {
      "id" : "headerbar",
-     "* pack" : "set_titlebar",
      "xtype" : "HeaderBar",
+     "* pack" : "set_titlebar",
      "bool show_close_button" : true,
      "$ xns" : "Gtk",
      "string title" : "Application Builder",
      "items" : [
       {
        "* pack" : "pack_start",
-       "xtype" : "HBox",
+       "xtype" : "Box",
        "$ xns" : "Gtk",
+       "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
        "items" : [
         {
          "bool use_popover" : false,
-         "* pack" : "add",
          "xtype" : "MenuButton",
+         "* pack" : "add",
          "$ xns" : "Gtk",
          "items" : [
           {
@@ -59,9 +60,9 @@
              "listeners" : {
               "activate" : "  ( ) => {\n        Xcls_MainWindow.singleton().no_windows++;\n        var w = new Xcls_MainWindow();\n        w.ref();\n\n        w.el.show_all();\n        w.initChildren();\n        w.windowstate.switchState(WindowState.State.FILES);\n}"
              },
+             "string label" : "Open a new Window",
              "* pack" : "append",
              "xtype" : "MenuItem",
-             "string label" : "Open a new Window",
              "$ xns" : "Gtk"
             },
             {
@@ -73,26 +74,26 @@
              "listeners" : {
               "activate" : " ( ) => {\n         Resources.singleton().fetchStart();\n}"
              },
+             "xtype" : "MenuItem",
              "string label" : "Download updated Resources",
              "* pack" : "append",
-             "xtype" : "MenuItem",
              "$ xns" : "Gtk"
             },
             {
              "listeners" : {
               "activate" : "() => {\n    About.singleton().el.show();\n    }"
              },
+             "* pack" : "append",
              "xtype" : "MenuItem",
              "string label" : "About the Builder",
-             "* pack" : "append",
              "$ xns" : "Gtk"
             }
            ]
           },
           {
+           "utf8 icon_name" : "help-about",
            "* pack" : "set_image",
            "xtype" : "Image",
-           "utf8 icon_name" : "help-about",
            "$ xns" : "Gtk"
           }
          ]
@@ -103,8 +104,8 @@
     },
     {
      "id" : "vbox",
-     "xtype" : "VBox",
      "* pack" : "add",
+     "xtype" : "VBox",
      "$ xns" : "Gtk",
      "$ homogeneous" : false,
      "items" : [
@@ -118,26 +119,26 @@
        "items" : [
         {
          "id" : "leftpane",
-         "* pack" : "add1",
          "xtype" : "VBox",
+         "* pack" : "add1",
          "$ xns" : "Gtk",
          "items" : [
           {
            "id" : "editpane",
-           "* pack" : "pack_start,false,true,0",
            "xtype" : "VPaned",
+           "* pack" : "pack_start,false,true,0",
            "$ xns" : "Gtk",
            "items" : [
             {
              "id" : "tree",
-             "* pack" : "add1",
              "xtype" : "VBox",
+             "* pack" : "add1",
              "$ xns" : "Gtk"
             },
             {
              "id" : "props",
-             "* pack" : "add2",
              "xtype" : "VBox",
+             "* pack" : "add2",
              "$ xns" : "Gtk"
             }
            ]
@@ -216,8 +217,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -225,16 +226,16 @@
                     "clicked" : "  ( ) => {\n  \n    _this.windowstate.switchState(WindowState.State.PREVIEW);\n    \n\n}"
                    },
                    "utf8 tooltip_text" : "Back",
-                   "xtype" : "Button",
                    "* pack" : false,
+                   "xtype" : "Button",
                    "width_request" : 50,
                    "$ xns" : "Gtk",
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "go-previous",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -252,8 +253,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -268,9 +269,9 @@
                    "$ tooltop_text" : "\"Open File\"",
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "document-open",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -288,8 +289,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -304,9 +305,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "document-properties",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "document-properties",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -324,8 +325,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -340,9 +341,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "emblem-system",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -364,8 +365,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -380,9 +381,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "list-add",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -400,8 +401,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -416,9 +417,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "format-justify-left",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "format-justify-left",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -436,8 +437,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -452,9 +453,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "appointment-new",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -472,8 +473,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -488,9 +489,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "folder-new",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "folder-new",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -508,8 +509,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -524,9 +525,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "document-new",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -544,8 +545,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -560,9 +561,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "user-trash",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "user-trash",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -581,20 +582,20 @@
       },
       {
        "bool homogeneous" : false,
-       "* pack" : "pack_end,false,true,0",
        "xtype" : "HBox",
+       "* pack" : "pack_end,false,true,0",
        "$ xns" : "Gtk",
        "items" : [
         {
+         "* pack" : "pack_start,true,true,0",
          "xtype" : "Label",
          "string label" : "   ",
-         "* pack" : "pack_start,true,true,0",
          "$ xns" : "Gtk"
         },
         {
          "bool show_text" : true,
-         "ulong handler_id" : "-1",
          "id" : "statusbar",
+         "ulong handler_id" : "-1",
          "* init" : "{\n     this.handler_id = Resources.singleton().updateProgress.connect((pos,total) => {\n        if (pos < 1) {\n            this.el.hide();\n            _this.mainpane.el.set_sensitive(true);\n            \n            return;\n        }\n         _this.mainpane.el.set_sensitive(false);\n         this.el.show();\n         this.el.set_fraction ((1.0f * pos) / (1.0f * total));\n         this.el.set_text(\"Fetching Resource : %s/%s\".printf(pos.to_string(), total.to_string()));\n       \n     });\n}\n",
          "xtype" : "ProgressBar",
          "* pack" : "pack_start,true,true,0",
@@ -606,9 +607,9 @@
          "$ xns" : "Gtk",
          "items" : [
           {
+           "xtype" : "MenuItem",
            "string label" : "Compile Status:",
            "* pack" : "add",
-           "xtype" : "MenuItem",
            "$ xns" : "Gtk"
           },
           {
@@ -626,9 +627,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "xtype" : "Image",
              "utf8 icon_name" : "dialog-error",
              "* pack" : "set_image",
-             "xtype" : "Image",
              "$ xns" : "Gtk"
             }
            ]
@@ -648,9 +649,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "* pack" : "set_image",
              "xtype" : "Image",
              "utf8 icon_name" : "dialog-warning",
-             "* pack" : "set_image",
              "$ xns" : "Gtk"
             }
            ]
@@ -670,9 +671,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "utf8 icon_name" : "dialog-information",
              "* pack" : "set_image",
              "xtype" : "Image",
-             "utf8 icon_name" : "dialog-information",
              "$ xns" : "Gtk"
             }
            ]

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index bbf73d4..deeb59b 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -150,26 +150,26 @@ public class Xcls_MainWindow : Object
             // set gobject values
             this.el.title = "Application Builder";
             this.el.show_close_button = true;
-            var child_0 = new Xcls_HBox3( _this );
+            var child_0 = new Xcls_Box3( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el  );
         }
 
         // user defined functions
     }
-    public class Xcls_HBox3 : Object
+    public class Xcls_Box3 : Object
     {
-        public Gtk.HBox el;
+        public Gtk.Box el;
         private Xcls_MainWindow  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_HBox3(Xcls_MainWindow _owner )
+        public Xcls_Box3(Xcls_MainWindow _owner )
         {
             _this = _owner;
-            this.el = new Gtk.HBox( true, 0 );
+            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
 
             // my vars (dec)