src/Builder4/PopoverProperty.bjs

src/Builder4/PopoverProperty.vala

diff --git a/src/Builder4/PopoverProperty.bjs b/src/Builder4/PopoverProperty.bjs
index 4508698..fb8e837 100644 (file)
--- a/src/Builder4/PopoverProperty.bjs
+++ b/src/Builder4/PopoverProperty.bjs
@@ -79,7 +79,7 @@
            "$ columns" : "typeof(string),typeof(string)",
            "n_columns" : 2,
            "$ xns" : "Gtk",
-           "| void loadData" : "  (string kflag) {\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n    \n    // vala signal.. '@'\n    // raw value '$'\n    // user defined property '#'\n    // user defined method '|'\n    // special property '*' => prop  |args|ctor|init\n    \n    \n    \n   /// el.append(out iter);\n    \n     \n   // el.set_value(iter, 0, \"\");\n   // el.set_value(iter, 1, \"aaa  - Just add Element - aaa\");\n\n    el.append(out iter);\n    el.set(iter, 0, \"\", 1,   \"Normal Property\", -1);\n\n\tif (_this.file.xtype == \"Gtk\") {\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t }\n\t\t\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"#\", 1,   \"User defined property\", -1);\n\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop | args | ctor | init )\", -1);\n\t\t\n\t\tel.append(out iter);\n\t    el.set(iter, 0, \"@\", 1,   \"Vala Signal\", -1);\n\t} else { \n\t\t// javascript\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\t\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop )\", -1);\n\t\n\t}\n\t\n\t\n\n                                     \n}\n"
+           "| void loadData" : "  (string kflag) {\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n    \n    // vala signal.. '@'\n    // raw value '$'\n    // user defined property '#'\n    // user defined method '|'\n    // special property '*' => prop  |args|ctor|init\n    \n    \n    \n   /// el.append(out iter);\n    \n     \n   // el.set_value(iter, 0, \"\");\n   // el.set_value(iter, 1, \"aaa  - Just add Element - aaa\");\n\n    el.append(out iter);\n    el.set(iter, 0, \"\", 1,   \"Normal Property\", -1);\n\tif (kflag == \"\") {\n\t\t _this.kflag.el.set_active_iter(iter);\n\t }\n\tif (_this.file.xtype == \"Gtk\") {\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"#\", 1,   \"User defined property\", -1);\n\t\tif (kflag == \"#\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\tif (kflag == \"|\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop | args | ctor | init )\", -1);\n\t\tif (kflag == \"*\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t\tel.append(out iter);\n\t    el.set(iter, 0, \"@\", 1,   \"Vala Signal\", -1);\n\t\tif (kflag == \"@\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\t\n\t} else { \n\t\t// javascript\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"$\", 1,   \"Raw Property (not escaped)\", -1);\n\t\tif (kflag == \"$\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"|\", 1,   \"User defined method\", -1);\n\t\tif (kflag == \"|\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\tel.append(out iter);\n\t\tel.set(iter, 0, \"*\", 1,   \"Special property (eg. prop )\", -1);\n\t\tif (kflag == \"*\") {\n\t\t\t _this.kflag.el.set_active_iter(iter);\n\t\t}\n\t\n\t}\n\t\n\t\n\n                                     \n}\n"
           }
          ]
         },

diff --git a/src/Builder4/PopoverProperty.vala b/src/Builder4/PopoverProperty.vala
index b49363a..d800016 100644 (file)
--- a/src/Builder4/PopoverProperty.vala
+++ b/src/Builder4/PopoverProperty.vala
@@ -338,35 +338,56 @@ public class Xcls_PopoverProperty : Object
         
             el.append(out iter);
             el.set(iter, 0, "", 1,   "Normal Property", -1);
-        
+               if (kflag == "") {
+                        _this.kflag.el.set_active_iter(iter);
+                }
                if (_this.file.xtype == "Gtk") {
                        el.append(out iter);
                        el.set(iter, 0, "$", 1,   "Raw Property (not escaped)", -1);
                        if (kflag == "$") {
                                 _this.kflag.el.set_active_iter(iter);
-                        }
+                       }
                        
                        el.append(out iter);
                        el.set(iter, 0, "#", 1,   "User defined property", -1);
+                       if (kflag == "#") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
         
                        el.append(out iter);
                        el.set(iter, 0, "|", 1,   "User defined method", -1);
-        
+                       if (kflag == "|") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
                        el.append(out iter);
                        el.set(iter, 0, "*", 1,   "Special property (eg. prop | args | ctor | init )", -1);
+                       if (kflag == "*") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
                        
                        el.append(out iter);
                    el.set(iter, 0, "@", 1,   "Vala Signal", -1);
+                       if (kflag == "@") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
+                       
                } else { 
                        // javascript
                        el.append(out iter);
                        el.set(iter, 0, "$", 1,   "Raw Property (not escaped)", -1);
-        
+                       if (kflag == "$") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
                        el.append(out iter);
                        el.set(iter, 0, "|", 1,   "User defined method", -1);
-                       
+                       if (kflag == "|") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
                        el.append(out iter);
                        el.set(iter, 0, "*", 1,   "Special property (eg. prop )", -1);
+                       if (kflag == "*") {
+                                _this.kflag.el.set_active_iter(iter);
+                       }
                
                }