src/Builder4/ValaProjectSettings.bjs

src/Builder4/ValaProjectSettings.vala

diff --git a/src/Builder4/ValaProjectSettings.bjs b/src/Builder4/ValaProjectSettings.bjs
index d988f9f..d7e9d14 100644 (file)
--- a/src/Builder4/ValaProjectSettings.bjs
+++ b/src/Builder4/ValaProjectSettings.bjs
@@ -22,15 +22,15 @@
      "items" : [
       {
        "id" : "label_global",
-       "* pack" : false,
        "xtype" : "Label",
+       "* pack" : false,
        "$ xns" : "Gtk",
        "utf8 label" : "Global"
       },
       {
        "id" : "label_targets",
-       "xtype" : "Label",
        "* pack" : false,
+       "xtype" : "Label",
        "$ xns" : "Gtk",
        "utf8 label" : "Targets"
       },
@@ -51,8 +51,8 @@
           "changed" : "() => {\n    \n   _this.project.compilegroups.get(\"_default_\").compile_flags = this.el.text;\n   _this.project.writeConfig();\n//    _this.project.save();\n\n}"
          },
          "id" : "compile_flags",
-         "* pack" : "pack_start,false,false,0",
          "xtype" : "Entry",
+         "* pack" : "pack_start,false,false,0",
          "$ xns" : "Gtk",
          "utf8 placeholder_text" : "eg. -g --valasrc $BASEDIR "
         },
@@ -69,15 +69,15 @@
          "items" : [
           {
            "gboolean headers_visible" : false,
-           "xtype" : "TreeView",
            "* pack" : "add",
+           "xtype" : "TreeView",
            "string id" : "default_packages_tree",
            "$ xns" : "Gtk",
            "items" : [
             {
              "id" : "default_packages_tree_store",
-             "xtype" : "ListStore",
              "* pack" : "set_model",
+             "xtype" : "ListStore",
              "$ n_columns" : 2,
              "| void load" : "() {\n \n    var def = _this.project.compilegroups.get(\"_default_\");\n    var items  = def.packages;\n    \n    this.el.clear();\n    var pal = (Palete.Gtk) Palete.factory(\"Gtk\");\n    var pkgs = pal.packages();\n    print(\"ValaProjectSettings:packages load %d\\n\", pkgs.size);\n\n    Gtk.TreeIter citer;\n\n    for(var i =0 ; i < pkgs.size; i++) {\n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   pkgs.get(i) ); // title \n        this.el.set_value(citer, 1,   items.contains(pkgs.get(i)) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n",
              "$ columns" : "    typeof(string),  // 0 key type\n      typeof(bool)",
@@ -94,8 +94,8 @@
              "items" : [
               {
                "id" : "packages_render",
-               "xtype" : "CellRendererText",
                "* pack" : "pack_start,false",
+               "xtype" : "CellRendererText",
                "$ xns" : "Gtk"
               }
              ]
@@ -114,8 +114,8 @@
                 "toggled" : "(  path_string) =>  { \n    var m = _this.default_packages_tree_store.el;\n   Gtk.TreeIter iter;\n   Gtk.TreePath path = new Gtk.TreePath.from_string (path_string);\n   m.get_iter (out iter, path);\n   GLib.Value val;\n   m.get_value(iter, 1, out val);\n   m.set_value(iter, 1,  ((bool) val) ? false :true); \n     GLib.Value fval;  \n   m.get_value(iter, 0, out fval);\n   var fn = (string)fval;\n    \n    var def = _this.project.compilegroups.get(\"_default_\");\n    var items  = def.packages;\n    if ((bool)val) {\n        // renive\n        items.remove(fn);\n    } else {\n        items.add(fn);\n    }\n    \n}"
                },
                "id" : "packages_render_use",
-               "* pack" : "pack_start,false",
                "xtype" : "CellRendererToggle",
+               "* pack" : "pack_start,false",
                "$ xns" : "Gtk",
                "gboolean activatable" : true
               }
@@ -148,8 +148,8 @@
            "items" : [
             {
              "id" : "default_directory_tree_store",
-             "xtype" : "ListStore",
              "* pack" : "set_model",
+             "xtype" : "ListStore",
              "$ n_columns" : 1,
              "| void load" : "() {\n \n  this.el.clear();\n  \n    \n     var def = _this.project.compilegroups.get(\"_default_\");\n     var items  = def.sources;\n     \n \n    Gtk.TreeIter citer;\n\n    for(var i =0 ; i < items.size; i++) {\n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   items.get(i) ); // title \n        //this.el.set_value(citer, 1,   items.get(i) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n",
              "$ columns" : "    typeof(string)\n     ",
@@ -165,8 +165,8 @@
              "items" : [
               {
                "id" : "directory_render",
-               "xtype" : "CellRendererText",
                "* pack" : "pack_start,false",
+               "xtype" : "CellRendererText",
                "$ xns" : "Gtk"
               }
              ]
@@ -218,20 +218,20 @@
       },
       {
        "gint position" : 300,
-       "* pack" : "append_page,_this.label_targets.el",
        "xtype" : "HPaned",
+       "* pack" : "append_page,_this.label_targets.el",
        "$ xns" : "Gtk",
        "items" : [
         {
          "* init" : "{  \nthis.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n\n}\n",
-         "* pack" : "add1",
          "xtype" : "ScrolledWindow",
+         "* pack" : "add1",
          "$ xns" : "Gtk",
          "items" : [
           {
            "id" : "targets_tree_menu",
-           "xtype" : "Menu",
            "* pack" : "add",
+           "xtype" : "Menu",
            "$ xns" : "Gtk",
            "items" : [
             {
@@ -261,7 +261,7 @@
           },
           {
            "listeners" : {
-            "button_press_event" : " ( ev) => {\n    //console.log(\"button press?\");\n   \n    \n    if (ev.type != Gdk.EventType.BUTTON_PRESS  || ev.button != 3) {\n        //print(\"click\" + ev.type);\n        return false;\n    }\n    //Gtk.TreePath res;\n    //if (!this.el.get_path_at_pos((int)ev.x,(int)ev.y, out res, null, null, null) ) {\n    //    return true;\n    //}\n     \n  //  this.el.get_selection().select_path(res);\n     \n      //if (!this.get('/LeftTreeMenu').el)  { \n      //      this.get('/LeftTreeMenu').init(); \n      //  }\n        \n     _this.targets_tree_menu.el.set_screen(Gdk.Screen.get_default());\n     _this.targets_tree_menu.el.show_all();\n      _this.targets_tree_menu.el.popup(null, null, null,  3, ev.time);\n     //   print(\"click:\" + res.path.to_string());\n      return true;\n}",
+            "button_press_event" : " ( ev) => {\n    //console.log(\"button press?\");\n   \n    \n    if (ev.type != Gdk.EventType.DOUBLE_BUTTON_PRESS  || ev.button != 3) {\n        //print(\"click\" + ev.type);\n        return false;\n    }\n    //Gtk.TreePath res;\n    //if (!this.el.get_path_at_pos((int)ev.x,(int)ev.y, out res, null, null, null) ) {\n    //    return true;\n    //}\n     \n  //  this.el.get_selection().select_path(res);\n     \n      //if (!this.get('/LeftTreeMenu').el)  { \n      //      this.get('/LeftTreeMenu').init(); \n      //  }\n        \n     _this.targets_tree_menu.el.set_screen(Gdk.Screen.get_default());\n     _this.targets_tree_menu.el.show_all();\n      _this.targets_tree_menu.el.popup(null, null, null,  3, ev.time);\n     //   print(\"click:\" + res.path.to_string());\n      return true;\n}",
             "cursor_changed" : " ( ) => {\n\n    if (this.cursor != \"\") {\n         // save the values..\n     }\n     \n     // load the new values.\n     \n\n         Gtk.TreeModel mod;\n        Gtk.TreeIter iter;\n        if (!this.el.get_selection().get_selected(out mod, out iter)) {\n               print(\"nothing selected\\n\");\n            return;\n        }\n\n            \n       // add the directory..\n       \n       \n       GLib.Value val;\n        mod.get_value(iter,0, out val);\n       var fn =  (string) val;\n       \n       this.cursor = fn;\n       var cg = _this.project.compilegroups.get(fn);\n       _this.build_pack_target.el.set_text(cg.target_bin);\n       _this.build_compile_flags.el.set_text(cg.compile_flags);\n       // load the srouces\n\n\n  }"
            },
            "id" : "targets_tree",
@@ -272,8 +272,8 @@
            "items" : [
             {
              "id" : "targets_tree_store",
-             "* pack" : "set_model",
              "xtype" : "ListStore",
+             "* pack" : "set_model",
              "$ n_columns" : 2,
              "| void load" : "() {\n \n  this.el.clear();\n  \n    \n     var cg = _this.project.compilegroups;\n     \n   _this.targets_tree.cursor = \"\";\n    Gtk.TreeIter citer;\n    var iter = cg.map_iterator();\n   while(iter.next()) {\n        var key = iter.get_key();\n        if (key == \"_default_\") {\n            continue;\n        }\n    \n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   key ); // title \n        //this.el.set_value(citer, 1,   items.get(i) );\n    };\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n",
              "$ columns" : "    typeof(string),  // 0 key type\n     typeof(string) // ??\n     ",
@@ -292,8 +292,8 @@
                 "edited" : "  (path, newtext) => {\n     \n     Gtk.TreeIter  iter;\n        _this.targets_tree_store.el.get_iter(out iter, new Gtk.TreePath.from_string(path));\n       GLib.Value gval;\n        _this.targets_tree_store.el.get_value(iter,0, out gval);\n        var oldval = (string)gval;\n       if (oldval == newtext) {\n          return;\n        }\n         var cg = _this.project.compilegroups.get(oldval);\n        cg.name = newtext;\n        _this.project.compilegroups.unset(oldval);\n        _this.project.compilegroups.set(newtext, cg);\n    _this.targets_tree_store.load();\n  }"
                },
                "id" : "targets_render",
-               "* pack" : "pack_start,false",
                "xtype" : "CellRendererText",
+               "* pack" : "pack_start,false",
                "$ xns" : "Gtk",
                "gboolean editable" : true
               }
@@ -321,8 +321,8 @@
             "changed" : "()  => {\n        if (_this.targets_tree.cursor.length < 1) {\n        return;\n    }\n    _this.project.compilegroups.get(_this.targets_tree.cursor).target_bin = this.el.text;\n}"
            },
            "id" : "build_pack_target",
-           "* pack" : "pack_start,false,false,0",
            "xtype" : "Entry",
+           "* pack" : "pack_start,false,false,0",
            "$ xns" : "Gtk"
           },
           {
@@ -336,8 +336,8 @@
             "changed" : "() => {\n    if (_this.targets_tree.cursor.length < 1) {\n        return;\n    }\n    _this.project.compilegroups.get(_this.targets_tree.cursor).compile_flags = this.el.text;\n}"
            },
            "id" : "build_compile_flags",
-           "* pack" : "pack_start,false,false,0",
            "xtype" : "Entry",
+           "* pack" : "pack_start,false,false,0",
            "$ xns" : "Gtk"
           },
           {
@@ -358,8 +358,8 @@
              "items" : [
               {
                "id" : "files_tree_store",
-               "* pack" : "set_model",
                "xtype" : "ListStore",
+               "* pack" : "set_model",
                "$ n_columns" : 3,
                "| void load" : "() {\n \n  this.el.clear();\n  \n    \n     var def = _this.project.compilegroups.get(\"_default_\");\n     var items  = def.sources;\n     \n \n    Gtk.TreeIter citer;\n\n    for(var i =0 ; i < items.size; i++) {\n         this.el.append(out citer);   \n         \n        this.el.set_value(citer, 0,   items.get(i) ); // title \n        this.el.set_value(citer, 1,   \"dir\"); // type         \n        this.el.set_value(citer, 2,   false ); // checked \n        /*\n        var files = def.files(items.get(i));\n        \n         for(var j =0 ; j < files.size; j++) {\n            this.el.append(out citer);   \n         \n            this.el.set_value(citer, 0,   files.get(j) ); // title \n            this.el.set_value(citer, 1,   \"file\"); // type         \n            this.el.set_value(citer, 2,   false ); // checked \n\n        }\n        */\n        \n        //this.el.set_value(citer, 1,   items.get(i) );\n    }\n    this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING);\n    \n}\n ",
                "$ columns" : "    typeof(string),  // 0 file name\n     typeof(string), // type (dir orfile)\n     typeof(bool)  // is checked.\n     ",
@@ -375,8 +375,8 @@
                "items" : [
                 {
                  "id" : "files_render",
-                 "xtype" : "CellRendererText",
                  "* pack" : "pack_start,false",
+                 "xtype" : "CellRendererText",
                  "$ xns" : "Gtk"
                 }
                ]
@@ -395,8 +395,8 @@
                   "toggled" : "(  path_string) =>  { \n    var m = _this.default_packages_tree_store.el;\n   Gtk.TreeIter iter;\n   Gtk.TreePath path = new Gtk.TreePath.from_string (path_string);\n   m.get_iter (out iter, path);\n   GLib.Value val;\n   m.get_value(iter, 1, out val);\n   m.set_value(iter, 1,  ((bool) val) ? false :true); \n     GLib.Value fval;  \n   m.get_value(iter, 0, out fval);\n   var fn = (string)fval;\n    \n    var def = _this.project.compilegroups.get(\"_default_\");\n    var items  = def.packages;\n    if ((bool)val) {\n        // renive\n        items.remove(fn);\n    } else {\n        items.add(fn);\n    }\n    \n}"
                  },
                  "id" : "files_render_use",
-                 "* pack" : "pack_start,false",
                  "xtype" : "CellRendererToggle",
+                 "* pack" : "pack_start,false",
                  "$ xns" : "Gtk",
                  "gboolean activatable" : true
                 }

diff --git a/src/Builder4/ValaProjectSettings.vala b/src/Builder4/ValaProjectSettings.vala
index cf7ba35..09139c4 100644 (file)
--- a/src/Builder4/ValaProjectSettings.vala
+++ b/src/Builder4/ValaProjectSettings.vala
@@ -1100,7 +1100,7 @@ public class ValaProjectSettings : Object
                 //console.log("button press?");
                
                 
-                if (ev.type != Gdk.EventType.BUTTON_PRESS  || ev.button != 3) {
+                if (ev.type != Gdk.EventType.DOUBLE_BUTTON_PRESS  || ev.button != 3) {
                     //print("click" + ev.type);
                     return false;
                 }