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 257ebde..5412b46 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -11,7 +11,7 @@
    "listeners" : {
     "delete_event" : "  (   event) => {\n    return false;\n} ",
     "destroy" : "() =>  {\n Xcls_MainWindow.singleton().no_windows--;\n \n Resources.singleton().disconnect(_this.statusbar.handler_id);\n \n \n if (Xcls_MainWindow.singleton().no_windows < 1) {\n\n     Gtk.main_quit();\n }\n}",
-    "show" : "  ( ) => {\n    // hide the file editing..\n   \n    //this.hideViewEditing();\n    _this.statusbar.el.hide();\n     _this.statusbar_errors.el.hide();\n    _this.statusbar_warnings.el.hide();\n    _this.statusbar_depricated.el.hide();\n    \n  \n    Resources.singleton().checkResources();\n\n}",
+    "show" : "  ( ) => {\n    // hide the file editing..\n   \n    //this.hideViewEditing();\n    _this.statusbar.el.hide();\n     _this.statusbar_errors.el.hide();\n    _this.statusbar_warnings.el.hide();\n    _this.statusbar_depricated.el.hide();\n    _this.statusbar_compile_spinner.el.hide();\n  \n    Resources.singleton().checkResources();\n\n}",
     "key_release_event" : " (event) => {\n    \n    if (this.search_entry.el.is_visible()) {\n\t\tif (event.keyval == Gdk.Key.f && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\t    print(\"SAVE: ctrl-f  pressed\");\n\t\t\tthis.search_entry.el.grab_focus();\n\t\t    return false;\n\t\t}\n\t\t\n\t\tif (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\t    print(\"SAVE: ctrl-g  pressed\");\n\t\t\tthis.search_entry.forwardSearch(true);\n\t\t    return false;\n\t\t}\n\t\t\n\t}    \n\t\n\tif (event.keyval == Gdk.Key.n && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\tprint(\"SAVE: ctrl-n  pressed\");\n\t\tthis.openNewWindow();\n\t\treturn false;\n\t}\n\t\n   // print(event.key.keyval)\n    \n    return false;\n\n} \n\n"
    },
    "id" : "MainWindow",
@@ -618,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" : [
           {
@@ -643,6 +643,13 @@
             }
            ]
           },
+          {
+           "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}"
@@ -709,12 +716,6 @@
             }
            ]
           },
-          {
-           "id" : "statusbar_compilestatus_label",
-           "* pack" : "add",
-           "xtype" : "MenuItem",
-           "$ xns" : "Gtk"
-          },
           {
            "listeners" : {
             "button_press_event" : "() => {\n\tif (_this.windowstate.file == null) {\n\t\treturn true;\n\t}\n\t_this.windowstate.valasource.spawnExecute(_this.windowstate.file);\n\t\n\t_this.windowstate.compile_results.show(this.el,true);\n\t\n\treturn true;\n}"
@@ -736,6 +737,15 @@
            ]
           }
          ]
+        },
+        {
+         "id" : "statusbar_compile_spinner",
+         "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"
         }
        ]
       }