Fix #5829 - Messing around with flutter API

[roobuilder] / src / Builder4 / MainWindow.bjs

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index 2a59f57..5412b46 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -62,9 +62,9 @@
              "listeners" : {
               "activate" : "( ) => {\n       _this.openNewWindow();\n}"
              },
+             "xtype" : "MenuItem",
              "string label" : "Open a new Window",
              "* pack" : "append",
-             "xtype" : "MenuItem",
              "$ xns" : "Gtk"
             },
             {
@@ -76,26 +76,26 @@
              "listeners" : {
               "activate" : " ( ) => {\n         Resources.singleton().fetchStart();\n}"
              },
+             "* pack" : "append",
              "xtype" : "MenuItem",
              "string label" : "Download updated Resources",
-             "* pack" : "append",
              "$ xns" : "Gtk"
             },
             {
              "listeners" : {
               "activate" : "() => {\n    About.singleton().el.show();\n    }"
              },
+             "string label" : "About the Builder",
              "* pack" : "append",
              "xtype" : "MenuItem",
-             "string label" : "About the Builder",
              "$ xns" : "Gtk"
             }
            ]
           },
           {
+           "xtype" : "Image",
            "utf8 icon_name" : "help-about",
            "* pack" : "set_image",
-           "xtype" : "Image",
            "$ xns" : "Gtk"
           }
          ]
@@ -111,9 +111,9 @@
          "$ tooltop_text" : "\"Open File\"",
          "items" : [
           {
+           "* pack" : "set_image",
            "xtype" : "Image",
            "utf8 icon_name" : "document-open",
-           "* pack" : "set_image",
            "$ xns" : "Gtk"
           }
          ]
@@ -130,9 +130,9 @@
          "bool visible" : false,
          "items" : [
           {
+           "utf8 icon_name" : "go-previous",
            "* pack" : "set_image",
            "xtype" : "Image",
-           "utf8 icon_name" : "go-previous",
            "$ xns" : "Gtk"
           }
          ]
@@ -272,9 +272,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "go-previous",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -308,9 +308,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "document-properties",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -344,9 +344,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "emblem-system",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -384,9 +384,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "list-add",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "list-add",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -420,9 +420,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "format-justify-left",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -456,9 +456,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "appointment-new",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -492,9 +492,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "folder-new",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -528,9 +528,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "document-new",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "document-new",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -564,9 +564,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "user-trash",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -584,7 +584,6 @@
        ]
       },
       {
-       "id" : "statusbar_compile_spinner",
        "bool homogeneous" : false,
        "xtype" : "Box",
        "* pack" : "pack_end,false,true,0",
@@ -592,9 +591,9 @@
        "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
        "items" : [
         {
+         "string label" : "   ",
          "* pack" : "pack_start,true,true,0",
          "xtype" : "Label",
-         "string label" : "   ",
          "$ xns" : "Gtk"
         },
         {
@@ -619,8 +618,8 @@
          "| void forwardSearch" : "(bool change_focus) {\n\tswitch(_this.windowstate.state) {\n\t\tcase WindowState.State.CODEONLY:\n\t\tcase WindowState.State.CODE:\n\t\t\t// search the code being edited..\n\t\t\t_this.windowstate.code_editor.forwardSearch(change_focus);\n\t\t\t\n\t\t\tbreak;\n\t\tcase WindowState.State.PREVIEW:\n\t\t\tif (_this.windowstate.file.xtype == \"Gtk\") {\n\t\t\t\t_this.windowstate.window_gladeview.forwardSearch(change_focus);\n\t\t\t} else { \n\t\t\t\t _this.windowstate.window_rooview.forwardSearch(change_focus);\n\t\t\t}\n\t\t\n\t\t\tbreak;\n\t}\n\t\n}\n"
         },
         {
-         "* pack" : "pack_end,false,true,0",
          "xtype" : "MenuBar",
+         "* pack" : "add",
          "$ xns" : "Gtk",
          "items" : [
           {
@@ -636,14 +635,21 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "utf8 icon_name" : "system-search",
              "* pack" : "set_image",
              "xtype" : "Image",
-             "utf8 icon_name" : "system-search",
              "bool sensitive" : false,
              "$ xns" : "Gtk"
             }
            ]
           },
+          {
+           "id" : "statusbar_compilestatus_label",
+           "xtype" : "MenuItem",
+           "* pack" : "add",
+           "string label" : "Compile Status:",
+           "$ xns" : "Gtk"
+          },
           {
            "listeners" : {
             "button_press_event" : "() => {\n    if (this.popup == null) {\n        this.popup = new Xcls_ValaCompileErrors();\n        this.popup.window = _this;\n    }\n   \n    \n    this.popup.show(this.notices, this.el);\n    return true;\n}"
@@ -659,9 +665,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "* pack" : "set_image",
              "xtype" : "Image",
              "utf8 icon_name" : "dialog-error",
-             "* pack" : "set_image",
              "$ xns" : "Gtk"
             }
            ]
@@ -681,9 +687,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "utf8 icon_name" : "dialog-warning",
              "* pack" : "set_image",
              "xtype" : "Image",
-             "utf8 icon_name" : "dialog-warning",
              "$ xns" : "Gtk"
             }
            ]
@@ -703,9 +709,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "xtype" : "Image",
              "utf8 icon_name" : "dialog-information",
              "* pack" : "set_image",
-             "xtype" : "Image",
              "$ xns" : "Gtk"
             }
            ]
@@ -723,9 +729,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "utf8 icon_name" : "media-playback-start",
              "* pack" : "set_image",
              "xtype" : "Image",
-             "utf8 icon_name" : "media-playback-start",
              "$ xns" : "Gtk"
             }
            ]
@@ -737,6 +743,7 @@
          "xtype" : "Spinner",
          "* pack" : "add",
          "| void stop" : "() {\n this.el.stop();\n  this.el.hide();\n}\n",
+         "string tooltip_text" : "Compiling",
          "$ xns" : "Gtk",
          "| void start" : "() {\n  this.el.show();\n  this.el.start();  \n}\n"
         }