src/Builder4/GtkView.bjs

src/Builder4/GtkView.vala

diff --git a/src/Builder4/GtkView.bjs b/src/Builder4/GtkView.bjs
index 53967a8..8d65426 100644 (file)
--- a/src/Builder4/GtkView.bjs
+++ b/src/Builder4/GtkView.bjs
@@ -12,15 +12,15 @@
     "size_allocate" : "(aloc) => {\n\n    this.width = aloc.width;\n    this.height =aloc.height;\n    }\n"
    },
    "id" : "GtkView",
-   "| void createThumb" : "() {\n    \n    \n    if (this.file == null) {\n        return;\n    }\n    var filename = this.file.getIconFileName(false);\n    \n    var  win = this.el.get_parent_window();\n    var width = win.get_width();\n    var height = win.get_height();\n\n    Gdk.Pixbuf screenshot = Gdk.pixbuf_get_from_window(win, 0, 0, width, height); // this.el.position?\n\n    screenshot.save(filename,\"png\");\n    return;\n    \n    \n    \n    \n    \n     \n    \n    // should we hold until it's printed...\n    \n      \n\n    \n    \n\n\n    \n     \n}\n",
    "# Gtk.Widget lastObj" : "null",
+   "| void createThumb" : "() {\n    \n    \n    if (this.file == null) {\n        return;\n    }\n    var filename = this.file.getIconFileName(false);\n    \n    var  win = this.el.get_parent_window();\n    var width = win.get_width();\n    var height = win.get_height();\n\n    Gdk.Pixbuf screenshot = Gdk.pixbuf_get_from_window(win, 0, 0, width, height); // this.el.position?\n\n    screenshot.save(filename,\"png\");\n    return;\n    \n    \n    \n    \n    \n     \n    \n    // should we hold until it's printed...\n    \n      \n\n    \n    \n\n\n    \n     \n}\n",
    "| void loadFile" : "(JsRender.JsRender file) \n{\n        file.compile_notice.connect(this.compileNotice);\n       // this.el.set_position((int)(this.el.max_position * 0.7));\n        this.el.set_position(this.el.max_position );\n        this.file = null;\n        \n        if (file.tree == null) {\n            return;\n        }\n        this.file = file;\n        if (this.lastObj != null) {\n            this.container.el.remove(this.lastObj);\n        }\n        \n        // hide the compile view at present..\n          \n        \n        var w = this.width;\n        var h = this.height;\n        \n        print(\"ALLOC SET SIZES %d, %d\\n\", w,h); \n        \n        // set the container size min to 500/500 or 20 px less than max..\n        w = int.max (w-20, 500);\n        h = int.max (h-20, 500); \n        \n        print(\"SET SIZES %d, %d\\n\", w,h);       \n        _this.container.el.set_size_request(w,h);\n        \n        _this.view_layout.el.set_size(w,h); // should be baded on calc.. -- see update_scrolled.\n        var rgba = Gdk.RGBA ();\n        rgba.parse (\"#ccc\");\n        _this.view_layout.el.override_background_color(Gtk.StateFlags.NORMAL, rgba);\n        \n        \n\tvar x = new JsRender.NodeToGtk(file.tree);\n        var obj = x.munge() as Gtk.Widget;\n        this.lastObj = null;\n\tif (obj == null) {\n        \treturn;\n\t}\n\tthis.lastObj = obj;\n        \n        this.container.el.add(obj);\n        obj.show_all();\n        \n         \n        \n}\n ",
    "int width" : 0,
    "Xcls_MainWindow main_window" : "",
    "xtype" : "VPaned",
    "# JsRender.JsRender file" : "null",
    "int height" : 0,
-   "| void compileNotice" : "( string  type,   string file,   int line,   string  message) {\n    // if type = \"START\"... then we reset the tree?\n    // the issue is that the compiler is continually going..\n    // so editing a file etc.. may change things.?\n    // probably not an issue.\n    print(\"err %s / %s:%d / %s\\n\", type,file,line,message);\n    var cs = _this.compile_result_store;    \n    if (type ==\"START\") {\n        // reset the tree;\n        cs.el.clear();   \n        cs.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);   \n        return;\n    }\n\n    \n    var top = 0;\n    var title = \"\";\n    switch(type) {\n        case \"ERR\":\n            title = \"Errors\";\n            top =0;\n            break;\n        \n        case \"WARN\":\n            title = \"Warnings\";\n            top =1;\n            break;\n            \n        case \"DEPR\":\n            title = \"Depricated\";\n            top=2;\n            break;\n        \n        default:\n            title = type;\n            top =3;\n            break;\n    }\n            \n    \n     var tv = cs.nodeFindOrCreate(null, top.to_string(), title);\n     tv = cs.nodeFindOrCreate(tv, \"%d:%s\".printf(top, file), GLib.Path.get_basename( file) );\n      cs.nodeAppendOrCreate(tv, \"%d:%s:%d\".printf(top, file,line), file,line, message);\n    \n}\n ",
+   "| void compileNotice" : "( string  type,   string file,   int line,   string  message) {\n    // if type = \"START\"... then we reset the tree?\n    // the issue is that the compiler is continually going..\n    // so editing a file etc.. may change things.?\n    // probably not an issue.\n    print(\"err %s / %s:%d / %s\\n\", type,file,line,message);\n    var cs = _this.compile_result_store;    \n    if (type ==\"START\") {\n        // reset the tree;\n        cs.el.clear();   \n//        cs.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);   \n        return;\n    }\n    if (type ==\"END\") {\n        // reset the tree;\n\n        _this.compile_tree.el.expand_all(); \n        cs.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);   \n        return;\n    }\n    \n    var top = 0;\n    var title = \"\";\n    switch(type) {\n        case \"ERR\":\n            title = \"Errors\";\n            top =0;\n            break;\n        \n        case \"WARN\":\n            title = \"Warnings\";\n            top =1;\n            break;\n            \n        case \"DEPR\":\n            title = \"Depricated\";\n            top=2;\n            break;\n        \n        default:\n            title = type;\n            top =3;\n            break;\n    }\n            \n    \n     var tv = cs.nodeFindOrCreate(null, top.to_string(), title);\n     var ftv = cs.nodeFindOrCreate(tv, \"%d:%s\".printf(top, file), GLib.Path.get_basename( file) );\n     \n      cs.nodeAppendOrCreate(ftv, \"%d:%s:%d\".printf(top, file,line), file,line, message);         \n      \n  \n ",
    "$ xns" : "Gtk",
    "items" : [
     {
@@ -30,14 +30,14 @@
      "items" : [
       {
        "id" : "view_layout",
-       "xtype" : "Layout",
        "* pack" : "add",
+       "xtype" : "Layout",
        "$ xns" : "Gtk",
        "items" : [
         {
          "id" : "container",
-         "* pack" : "put,10,10",
          "xtype" : "HBox",
+         "* pack" : "put,10,10",
          "$ xns" : "Gtk"
         }
        ]
@@ -46,8 +46,8 @@
     },
     {
      "id" : "compile_view",
-     "xtype" : "VBox",
      "* pack" : "pack2,true,true",
+     "xtype" : "VBox",
      "gboolean homogeneous" : false,
      "$ xns" : "Gtk",
      "items" : [
@@ -71,14 +71,14 @@
        "items" : [
         {
          "* init" : "{\n this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n \n\n}\n",
-         "* pack" : "add",
          "xtype" : "ScrolledWindow",
+         "* pack" : "add",
          "$ xns" : "Gtk",
          "items" : [
           {
            "id" : "compile_tree",
-           "* pack" : "add",
            "xtype" : "TreeView",
+           "* pack" : "add",
            "$ xns" : "Gtk",
            "items" : [
             {
@@ -101,8 +101,8 @@
              "items" : [
               {
                "id" : "renderer",
-               "xtype" : "CellRendererText",
                "* pack" : "pack_start,true",
+               "xtype" : "CellRendererText",
                "$ xns" : "Gtk"
               }
              ]
@@ -118,8 +118,8 @@
          "items" : [
           {
            "gboolean show_line_marks" : true,
-           "xtype" : "View",
            "* pack" : "add",
+           "xtype" : "View",
            "$ xns" : "GtkSource",
            "gboolean show_line_numbers" : true,
            "gboolean editable" : false

diff --git a/src/Builder4/GtkView.vala b/src/Builder4/GtkView.vala
index a71c244..48afe1f 100644 (file)
--- a/src/Builder4/GtkView.vala
+++ b/src/Builder4/GtkView.vala
@@ -149,10 +149,16 @@ public class Xcls_GtkView : Object
         if (type =="START") {
             // reset the tree;
             cs.el.clear();   
-            cs.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);   
+    //        cs.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);   
             return;
         }
+        if (type =="END") {
+            // reset the tree;
     
+            _this.compile_tree.el.expand_all(); 
+            cs.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);   
+            return;
+        }
         
         var top = 0;
         var title = "";
@@ -180,10 +186,9 @@ public class Xcls_GtkView : Object
                 
         
          var tv = cs.nodeFindOrCreate(null, top.to_string(), title);
-         tv = cs.nodeFindOrCreate(tv, "%d:%s".printf(top, file), GLib.Path.get_basename( file) );
-          cs.nodeAppendOrCreate(tv, "%d:%s:%d".printf(top, file,line), file,line, message);
-        
-    }
+         var ftv = cs.nodeFindOrCreate(tv, "%d:%s".printf(top, file), GLib.Path.get_basename( file) );
+         
+          cs.nodeAppendOrCreate(ftv, "%d:%s:%d".printf(top, file,line), file,line, message);
     public class Xcls_ScrolledWindow2 : Object 
     {
         public Gtk.ScrolledWindow el;