From: Alan Knowles Date: Mon, 1 Jun 2015 10:12:46 +0000 (+0800) Subject: src/Builder4/About.vala.c X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=b472dbbba7cf507a9013bb4bc38fe5be14a53eb4 src/Builder4/About.vala.c src/Builder4/ClutterFiles.vala.c src/Builder4/DialogConfirm.vala.c src/Builder4/DialogPluginWebkit.vala.c src/Builder4/DialogSaveModule.vala.c src/Builder4/DialogSaveTemplate.vala.c src/Builder4/DialogTemplateSelect.vala.c src/Builder4/Editor.vala.c src/Builder4/EditProject.vala.c src/Builder4/FakeServer.vala.c src/Builder4/GtkView.vala.c src/Builder4/MainWindow.vala.c src/Builder4/ProjectSettings.vala.c src/Builder4/RooProjectProperties.vala.c src/Builder4/StandardErrorDialog.vala.c src/Builder4/ValaProjectSettings.vala.c src/Builder4/WindowAddProp.vala.c src/Builder4/WindowLeftProjects.vala.c src/Builder4/WindowLeftProps.vala.c src/Builder4/WindowLeftTree.vala.c src/Builder4/WindowRightPalete.vala.c src/Builder4/WindowRooView.vala.c src/Builder4/WindowState.vala.c src/Builder4/PopoverFileDetails.vala.c src/Builder4/ValaCompileErrors.vala.c src/Builder4/ValaCompileResults.vala.c src/Builder4/PopoverProperty.vala.c src/JsRender/Gtk.vala.c src/JsRender/JsRender.vala.c src/JsRender/Lang.vala.c src/JsRender/NodeToGlade.vala.c src/JsRender/NodeToGtk.vala.c src/JsRender/NodeToJs.vala.c src/JsRender/NodeToVala.vala.c src/JsRender/Node.vala.c src/JsRender/Roo.vala.c src/JsRender/PlainFile.vala.c src/Palete/Gir.vala.c src/Palete/Gtk.vala.c src/Palete/Javascript.vala.c src/Palete/Palete.vala.c src/Palete/RooDatabase.vala.c src/Palete/Roo.vala.c src/Palete/ValaSource.vala.c src/Palete/GirObject.vala.c src/Palete/VapiParser.vala.c src/Palete/ValaSourceCompiler.vala.c src/Palete/CompletionProvider.vala.c src/Project/Gtk.vala.c src/Project/Project.vala.c src/Project/Roo.vala.c src/Application.vala.c src/Main.vala.c src/Resources.vala.c src/Spawn.vala.c --- diff --git a/src/Builder4/WindowLeftProps.bjs b/src/Builder4/WindowLeftProps.bjs index 557ee24ec..989c87642 100644 --- a/src/Builder4/WindowLeftProps.bjs +++ b/src/Builder4/WindowLeftProps.bjs @@ -324,7 +324,7 @@ "items" : [ { "listeners" : { - "activate" : " ( ) =>{\n \n var s = _this.view.el.get_selection();\n Gtk.TreeIter iter;\n Gtk.TreeModel model;\n s.get_selected (out model, out iter);\n \n if (_this.view.popover == null) {\n \t\t _this.view.popover = new Xcls_PopoverProperty();\n \t\t _this.view.popover.mainwindow = _this.main_window;\n \t\t}\n \t\t\n \n _this.before_edit();\n _this.stop_editor();\n\t \n _this.keyrender.el.stop_editing(false);\n _this.keyrender.el.editable =false;\n\n _this.valrender.el.stop_editing(false);\n _this.valrender.el.editable =false;\n Gtk.TreeIter iter;\n var mod = this.el.get_model();\n\t mod.get_iter (out iter, path);\n\t \n \n\tGLib.Value gvaltype, gval;\n\tmod.get_value(iter, 1 , out gval); // one is key..\n\t\n mod.get_value(iter,0, out gvaltype);\n\n\t\t_this.view.popover.show(this.el, _this.node, (string)gvaltype, (string)gval);\n \n \n \n _this.startEditingKey(model.get_path(iter));\n}" + "activate" : " ( ) =>{\n \n var s = _this.view.el.get_selection();\n Gtk.TreeIter iter;\n Gtk.TreeModel mod;\n s.get_selected (out mod, out iter);\n \n if (_this.view.popover == null) {\n \t\t _this.view.popover = new Xcls_PopoverProperty();\n \t\t _this.view.popover.mainwindow = _this.main_window;\n \t\t}\n \t\t\n \n _this.before_edit();\n _this.stop_editor();\n\t \n _this.keyrender.el.stop_editing(false);\n _this.keyrender.el.editable =false;\n\n _this.valrender.el.stop_editing(false);\n _this.valrender.el.editable =false;\n \n \n\tGLib.Value gvaltype, gval;\n\tmod.get_value(iter, 1 , out gval); // one is key..\n\t\n mod.get_value(iter,0, out gvaltype);\n\n\t_this.view.popover.show(_this.view.el, _this.node, (string)gvaltype, (string)gval);\n \n \n \n // _this.startEditingKey(model.get_path(iter));\n}" }, "label" : "Edit (double click)", "* pack" : "append", diff --git a/src/Builder4/WindowLeftProps.vala b/src/Builder4/WindowLeftProps.vala index 7bbd7d98c..974d86854 100644 --- a/src/Builder4/WindowLeftProps.vala +++ b/src/Builder4/WindowLeftProps.vala @@ -1833,8 +1833,8 @@ public class Xcls_LeftProps : Object var s = _this.view.el.get_selection(); Gtk.TreeIter iter; - Gtk.TreeModel model; - s.get_selected (out model, out iter); + Gtk.TreeModel mod; + s.get_selected (out mod, out iter); if (_this.view.popover == null) { _this.view.popover = new Xcls_PopoverProperty(); @@ -1842,7 +1842,7 @@ public class Xcls_LeftProps : Object } - _this.before_edit(); + _this.before_edit(); _this.stop_editor(); _this.keyrender.el.stop_editing(false); @@ -1850,21 +1850,18 @@ public class Xcls_LeftProps : Object _this.valrender.el.stop_editing(false); _this.valrender.el.editable =false; - Gtk.TreeIter iter; - var mod = this.el.get_model(); - mod.get_iter (out iter, path); - - + + GLib.Value gvaltype, gval; mod.get_value(iter, 1 , out gval); // one is key.. mod.get_value(iter,0, out gvaltype); - _this.view.popover.show(this.el, _this.node, (string)gvaltype, (string)gval); + _this.view.popover.show(_this.view.el, _this.node, (string)gvaltype, (string)gval); - _this.startEditingKey(model.get_path(iter)); + // _this.startEditingKey(model.get_path(iter)); }); } diff --git a/src/Makefile.am b/src/Makefile.am index dc266ce33..8ad0e0845 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -133,6 +133,7 @@ builder4_SOURCES = \ Builder4/PopoverFileDetails.vala \ Builder4/ValaCompileErrors.vala \ Builder4/ValaCompileResults.vala \ + Builder4/PopoverProperty.vala \ Resources.vala