src/Builder4/WindowLeftProps.bjs

src/Builder4/WindowLeftProps.vala

diff --git a/src/Builder4/WindowLeftProps.bjs b/src/Builder4/WindowLeftProps.bjs
index fb535e6..5262ae1 100644 (file)
--- a/src/Builder4/WindowLeftProps.bjs
+++ b/src/Builder4/WindowLeftProps.bjs
@@ -26,7 +26,7 @@
    "|              void startEditingKey" : "( Gtk.TreePath path) {\n    \n     if (!this.stop_editor()) {\n        return;\n     }\n  \n    // others... - fill in options for true/false?\n    \n       \n    GLib.Timeout.add_full(GLib.Priority.DEFAULT,10 , () => {\n        this.allow_edit  = true;\n        this.keyrender.el.editable = true;\n     \n        this.view.el.set_cursor_on_cell(\n            path,\n            this.keycol.el,\n            this.keyrender.el,\n            true\n        );\n               \n        return false;\n    });\n      \n    \n}\n",
    "@ void show_add_props" : "(string type)",
    "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
-   "| Gtk.TreeIter keyToIter" : "(string oldkey,  string type, string key, string kvalue) {\n\n\tvar m = _this.model.el;\n\t\n\t\n\tm.foreach((model, path,  iter) => {\n\t\t \n        \n        \t  \n       \n\t\t GLib.Value gvaltype, gval;\n\t\t mod.get_value(iter, 1 , out gval); // one is key..\n\t\t\n\t     mod.get_value(iter,0, out gvaltype);\n\t     \n\t      if (oldkey == ((string)gval) && type == ((string)gvaltype)) {\n   \t \t      this.updateIter(iter, type, key, kvalue);\n\t \t  }\n\t     \n\n\t\treturn false;\n\t});\n\t\n\t\n\n\n}\n",
+   "| Gtk.TreeIter keyToIter" : "(string oldkey,  string type, string key ) {\n\n\tvar m = _this.model.el;\n\t\n\t\n\tm.foreach((model, path,  iter) => {\n\t\t \n        \n        \t  \n       \n\t\t GLib.Value gvaltype, gval,kvalue;\n\t\t mod.get_value(iter, 1 , out gval); // one is key..\n\t\t\n\t     mod.get_value(iter,0, out gvaltype);\n\t     \n \t     mod.get_value(iter,3, out kvalue);\n\t     \n\t      if (oldkey == ((string)gval) && type == ((string)gvaltype)) {\n   \t \t      this.updateIter(iter, type, key, (string)kvalue);\n\t \t  }\n\t     \n\n\t\treturn false;\n\t});\n\t\n\t\n\n\n}\n",
    "$ homogeneous" : "false   ",
    "# Xcls_MainWindow main_window" : "null",
    "|              void addProp" : " (string in_type, string key, string value, string value_type) {\n      // info includes key, val, skel, etype..\n      //console.dump(info);\n        //type = info.type.toLowerCase();\n        //var data = this.toJS();\n          \n    var type = in_type == \"signals\" ? \"listener\" : in_type;\n      \n    var fkey = (value_type.length > 0 ? value_type + \" \" : \"\") + key;\n              \n    if (type == \"listener\") {\n        if (this.node.listeners.has_key(key)) {\n            return;\n        }\n        this.node.listeners.set(key,value);\n    } else  {\n    \n        if (this.node.props.has_key(fkey)) {\n            return;\n        }\n        this.node.props.set(fkey,value);\n    }\n            \n      \n    // add a row???\n    this.load(this.file, this.node);\n    \n    \n    \n    /// need to find the row which I've just added..\n    \n    \n    var s = this.view.el.get_selection();\n    s.unselect_all();\n    \n    print(\"trying to find new iter\");\n  \n    this.model.el.foreach((model, path, iter) => {\n        GLib.Value gval;\n    \n        this.model.el.get_value(iter, 0 , out gval);\n        if ((string)gval != type) {\n            print(\"not type: %s = %s\\n\", (string)gval , type);\n            return false;\n        }\n        this.model.el.get_value(iter, 1 , out gval);\n        if ((string)gval != fkey) {\n            print(\"not key: %s = %s\\n\", (string)gval , fkey);\n            return false;\n        }\n        // delay this?\n        GLib.Timeout.add_full(GLib.Priority.DEFAULT,40 , () => {\n        \n            this.startEditingValue(this.model.el.get_path(iter));\n            return false;\n        });\n        //s.select_iter(iter);\n        return true; \n    });\n    \n    \n    \n              \n}\n",

diff --git a/src/Builder4/WindowLeftProps.vala b/src/Builder4/WindowLeftProps.vala
index bd7d25d..9d034d6 100644 (file)
--- a/src/Builder4/WindowLeftProps.vala
+++ b/src/Builder4/WindowLeftProps.vala
@@ -435,7 +435,7 @@ public class Xcls_LeftProps : Object
           
         
     }
-    public Gtk.TreeIter keyToIter (string oldkey,  string type, string key, string kvalue) {
+    public Gtk.TreeIter keyToIter (string oldkey,  string type, string key ) {
     
        var m = _this.model.el;
        
@@ -445,13 +445,15 @@ public class Xcls_LeftProps : Object
             
                  
            
-                GLib.Value gvaltype, gval;
+                GLib.Value gvaltype, gval,kvalue;
                 mod.get_value(iter, 1 , out gval); // one is key..
                
             mod.get_value(iter,0, out gvaltype);
             
+            mod.get_value(iter,3, out kvalue);
+            
              if (oldkey == ((string)gval) && type == ((string)gvaltype)) {
-                             this.updateIter(iter, type, key, kvalue);
+                             this.updateIter(iter, type, key, (string)kvalue);
                  }