{
"build_module" : "builder",
+ "gen_extended" : false,
"items" : [
{
+ "# GtkSource.SearchContext searchcontext" : "null",
"# JsRender.JsRender? file" : "null",
"# JsRender.Node node" : "null",
"# JsRender.NodeProp? prop" : "null",
"# string activeEditor" : "\"\"",
"$ homogeneous" : false,
"$ xns" : "Gtk",
- "* pack" : "add",
"@ void save" : "()",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
- "Gtk.SourceSearchContext searchcontext" : "null",
"bool hexpand" : true,
"bool vexpand" : true,
"int last_search_end" : 0,
{
"$ homogeneous" : false,
"$ xns" : "Gtk",
- "* pack" : "pack_start,false,true",
"Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
+ "bool hexpand" : true,
"items" : [
{
"$ xns" : "Gtk",
- "* pack" : "add",
- "bool always_show_image" : true,
"id" : "save_button",
- "items" : [
- {
- "$ xns" : "Gtk",
- "* prop" : "image",
- "string icon_name" : "document-save",
- "xtype" : "Image"
- }
- ],
"label" : "Save",
"listeners" : {
"clicked" : [
},
{
"$ xns" : "Gtk",
- "* pack" : "add",
"bool hexpand" : true,
"xtype" : "Label"
},
"}",
""
],
- "* pack" : "add",
- "bool draw_value" : true,
+ "bool draw_value" : false,
"bool has_origin" : true,
"bool sensitive" : true,
"int digits" : 0,
"change_value" : [
"(st, val ) => {",
"\t ",
- "\t try {",
- "\t _this.view.css.load_from_data(",
- "\t \t\t\"#editor-view { font: %dpx Monospace; }\".printf((int)val)",
- "\t \t\t);",
- " } catch (Error e) {}",
+ "\t ",
+ "\t _this.view.css.load_from_string(",
+ "\t \t\t\"#editor-view { font: %dpx monospace; }\".printf((int)val)",
+ "\t );",
+ " ",
" \treturn false;",
"}"
]
},
{
"$ xns" : "Gtk",
- "* pack" : "add",
- "bool always_show_image" : true,
"id" : "close_btn",
"items" : [
{
"$ xns" : "Gtk",
- "* prop" : "image",
+ "* prop" : "child",
+ "Gtk.IconSize icon_size" : "Gtk.IconSize.NORMAL",
"string icon_name" : "window-close",
"xtype" : "Image"
}
" "
]
},
+ "string icon_name" : "window-close",
"xtype" : "Button"
}
],
},
{
"$ xns" : "Gtk",
- "* init" : [
- "this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);",
- ""
- ],
+ "Gtk.PolicyType hscrollbar_policy" : "Gtk.PolicyType.AUTOMATIC",
+ "Gtk.PolicyType vscrollbar_policy" : "Gtk.PolicyType.AUTOMATIC",
+ "bool overlay_scrolling" : false,
"bool vexpand" : true,
"id" : "RightEditor",
"items" : [
{
+ "# Gtk.CssProvider css" : "null",
"$ gboolean auto_indent" : true,
- "$ show_line_numbers" : true,
- "$ xns" : "Gtk",
+ "$ xns" : "GtkSource",
"* init" : [
- " ",
"",
- "\tthis.css = new Gtk.CssProvider();",
- "\ttry {",
- "\t\tthis.css.load_from_data(\"#editor-view { font: 10px Monospace;}\");",
- "\t} catch (Error e) {}",
- "\tthis.el.get_style_context().add_provider(this.css,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);",
+ "",
+ "this.css = new Gtk.CssProvider();",
+ "",
+ "this.css.load_from_string(",
+ "\t\"#editor-view { font: 12px monospace;}\"",
+ ");",
+ " ",
+ "Gtk.StyleContext.add_provider_for_display(",
+ "\tthis.el.get_display(),",
+ "\tthis.css,",
+ "\tGtk.STYLE_PROVIDER_PRIORITY_APPLICATION",
+ ");",
+ "\t",
+ " ",
"\t ",
- "\t\t ",
"",
- "\ttry { ",
- "\t\tthis.el.completion.add_provider(new Palete.CompletionProvider(_this));",
- " } catch (GLib.Error e) {}",
- " ",
- "\tthis.el.completion.unblock_interactive();",
- "\tthis.el.completion.select_on_show\t\t\t= true; // select",
- "\tthis.el.completion.show_headers\t\t\t= false;",
- "\tthis.el.completion.remember_info_visibility\t\t= true;",
- " ",
- " ",
- " var attrs = new Gtk.SourceMarkAttributes();",
- " var pink = Gdk.RGBA();",
- " pink.parse ( \"pink\");",
- " attrs.set_background ( pink);",
- " attrs.set_icon_name ( \"process-stop\"); ",
- " attrs.query_tooltip_text.connect(( mark) => {",
- " //print(\"tooltip query? %s\\n\", mark.name);",
- " return mark.name;",
- " });",
- " ",
- " this.el.set_mark_attributes (\"ERR\", attrs, 1);",
- " ",
- " var wattrs = new Gtk.SourceMarkAttributes();",
- " var blue = Gdk.RGBA();",
- " blue.parse ( \"#ABF4EB\");",
- " wattrs.set_background ( blue);",
- " wattrs.set_icon_name ( \"process-stop\"); ",
- " wattrs.query_tooltip_text.connect(( mark) => {",
- " //print(\"tooltip query? %s\\n\", mark.name);",
- " return mark.name;",
- " });",
- " ",
- " this.el.set_mark_attributes (\"WARN\", wattrs, 1);",
- " ",
+ " ",
+ "this.el.completion.add_provider(new Palete.CompletionProvider(_this));",
" ",
- " ",
- " var dattrs = new Gtk.SourceMarkAttributes();",
- " var purple = Gdk.RGBA();",
- " purple.parse ( \"#EEA9FF\");",
- " dattrs.set_background ( purple);",
- " dattrs.set_icon_name ( \"process-stop\"); ",
- " dattrs.query_tooltip_text.connect(( mark) => {",
- " //print(\"tooltip query? %s\\n\", mark.name);",
- " return mark.name;",
- " });",
- " ",
- " this.el.set_mark_attributes (\"DEPR\", dattrs, 1);",
- " ",
- " ",
- " this.el.get_space_drawer().set_matrix(null);",
- " this.el.get_space_drawer().set_types_for_locations( ",
- "\t\tGtk.SourceSpaceLocationFlags.ALL,",
- "\t\tGtk.SourceSpaceTypeFlags.ALL",
- " );",
- " this.el.get_space_drawer().set_enable_matrix(true);",
- " /*",
- " Gtk.SourceDrawSpacesFlags.LEADING + ",
+ "",
+ "this.el.completion.unblock_interactive();",
+ "this.el.completion.select_on_show = true; // select",
+ "",
+ "this.el.completion.remember_info_visibility\t = true;",
+ "",
+ "",
+ "var attrs = new GtkSource.MarkAttributes();",
+ "var pink = Gdk.RGBA();",
+ "pink.parse ( \"pink\");",
+ "attrs.set_background ( pink);",
+ "attrs.set_icon_name ( \"process-stop\"); ",
+ "attrs.query_tooltip_text.connect(( mark) => {",
+ " GLib.debug(\"tooltip query? %s\", mark.name);",
+ " return strdup( mark.name);",
+ "});",
+ " attrs.query_tooltip_markup.connect(( mark) => {",
+ " GLib.debug(\"tooltip query? %s\", mark.name);",
+ " return strdup( mark.name);",
+ "});",
+ "this.el.set_mark_attributes (\"ERR\", attrs, 1);",
+ "attrs.ref();",
+ " var wattrs = new GtkSource.MarkAttributes();",
+ "var blue = Gdk.RGBA();",
+ "blue.parse ( \"#ABF4EB\");",
+ "wattrs.set_background ( blue);",
+ "wattrs.set_icon_name ( \"process-stop\"); ",
+ "wattrs.query_tooltip_text.connect(( mark) => {",
+ " GLib.debug(\"tooltip query? %s\", mark.name);",
+ " return strdup(mark.name);",
+ "});",
+ "wattrs.query_tooltip_markup.connect(( mark) => {",
+ " GLib.debug(\"tooltip query? %s\", mark.name);",
+ " return strdup(mark.name);",
+ "});",
+ "this.el.set_mark_attributes (\"WARN\", wattrs, 1);",
+ "wattrs.ref();",
+ "",
+ "",
+ " var dattrs = new GtkSource.MarkAttributes();",
+ "var purple = Gdk.RGBA();",
+ "purple.parse ( \"#EEA9FF\");",
+ "dattrs.set_background ( purple);",
+ "dattrs.set_icon_name ( \"process-stop\"); ",
+ "dattrs.query_tooltip_text.connect(( mark) => {",
+ "\tGLib.debug(\"tooltip query? %s\", mark.name);",
+ " return strdup(mark.name);",
+ "});",
+ "dattrs.query_tooltip_markup.connect(( mark) => {",
+ "\tGLib.debug(\"tooltip query? %s\", mark.name);",
+ " return strdup(mark.name);",
+ "});",
+ "this.el.set_mark_attributes (\"DEPR\", dattrs, 1);",
+ "dattrs.ref(); ",
+ "",
+ " this.el.get_space_drawer().set_matrix(null);",
+ " this.el.get_space_drawer().set_types_for_locations( ",
+ "\tGtkSource.SpaceLocationFlags.ALL,",
+ "\tGtkSource.SpaceTypeFlags.ALL",
+ ");",
+ "this.el.get_space_drawer().set_enable_matrix(true);",
+ "/*",
+ "Gtk.SourceDrawSpacesFlags.LEADING + ",
"Gtk.SourceDrawSpacesFlags.TRAILING + ",
"Gtk.SourceDrawSpacesFlags.TAB + ",
"Gtk.SourceDrawSpacesFlags.SPACE",
- " */"
+ "*/"
],
- "* pack" : "add",
- "Gtk.CssProvider css" : "null",
+ "* prop" : "child",
+ "bool has_tooltip" : true,
+ "bool hexpand" : true,
"bool insert_spaces_instead_of_tabs" : true,
+ "bool vexpand" : true,
+ "boolean show_line_marks" : true,
+ "boolean show_line_numbers" : true,
"gboolean highlight_current_line" : true,
- "gboolean show_line_marks" : true,
"id" : "view",
"indent_width" : 4,
"items" : [
{
- "$ xns" : "Gtk",
- "* pack" : "set_buffer",
+ "$ Gee.HashMap<int,string>? xmarks" : "null",
+ "$ xns" : "GtkSource",
+ "$ xtype" : "Buffer",
+ "* prop" : "buffer",
"bool check_queued" : false,
- "bool check_running" : false,
+ "bool enable_undo" : true,
"id" : "buffer",
"int error_line" : "-1",
"listeners" : {
" // this.get('/LeftPanel.model').changed( str , false);",
" return ;",
"}",
- "",
- " ",
""
]
},
- "xtype" : "SourceBuffer",
"| bool checkSyntax" : [
" () {",
" ",
- " if (this.check_running) {",
- " print(\"Check is running\\n\");",
- " if (this.check_queued) { ",
- " print(\"Check is already queued\");",
- " return true;",
- " }",
- " this.check_queued = true;",
- " print(\"Adding queued Check \");",
- " GLib.Timeout.add_seconds(1, () => {",
- " this.check_queued = false;",
- " ",
- " this.checkSyntax();",
- " return false;",
- " });",
" ",
- "",
- " return true;",
- " }",
" var str = this.toString();",
" ",
" // needed???",
" return true;",
" }",
" ",
- " if (_this.file.xtype == \"PlainFile\") {",
+ " // bit presumptiona",
+ " if (_this.file.xtype == \"PlainFile\" && _this.file.project.xtype == \"Gtk\") {",
" ",
" // assume it's gtk...",
- " this.check_running = true;",
- " ",
- " if (!BuilderApplication.valasource.checkPlainFileSpawn(",
- "\t _this.file,",
- "\t str",
- "\t )) {",
- " this.check_running = false;",
- " }",
- "\t",
+ " ",
+ "\t\tBuilderApplication.valacompilequeue.addFile( ",
+ "\t\t\tPalete.ValaCompileRequestType.FILE_CHANGE, ",
+ "\t\t\t_this.file , str, false) ;",
+ " ",
+ "",
" return true;",
" ",
" }",
" if (_this.file == null) {",
" return true;",
" }",
- " var p = _this.file.project.palete;",
+ " ",
" ",
"",
+ " ",
" ",
- " this.check_running = true;",
- " ",
- " ",
- " if (_this.file.language == \"js\") {",
- " this.check_running = false;",
- " print(\"calling validate javascript\\n\"); ",
- " Gee.HashMap<int,string> errors;",
- " p.javascriptHasErrors(",
- " \t\t_this.window.windowstate,",
- " str, ",
- " _this.prop,",
- " _this.file, // no reference not node?",
- " out errors",
- " );",
- " return this.highlightErrors(errors); ",
- " ",
- " }",
- " ",
- " ",
- " print(\"calling validate vala\\n\"); ",
+ " GLib.debug(\"calling validate\"); ",
" // clear the buttons.",
" ",
- " ",
- " if (! BuilderApplication.valasource.checkFileWithNodePropChange(",
- " _this.file,",
- " _this.node,",
- " _this.prop, ",
- " str",
- " )) {",
- " this.check_running = false;",
- " } ",
+ " BuilderApplication.valacompilequeue.addProp( ",
+ " \t\tPalete.ValaCompileRequestType.PROP_CHANGE,",
+ "\t\t\t_this.file,",
+ "\t\t\t_this.node,",
+ "\t\t\t_this.prop,",
+ "\t\t\tstr); ",
" ",
" ",
" ",
"| bool highlightErrors" : [
"( Gee.HashMap<int,string> validate_res) {",
" ",
- " this.error_line = validate_res.size;",
+ "\tthis.error_line = validate_res.size;",
"",
- " if (this.error_line < 1) {",
- " return true;",
- " }",
- " var tlines = this.el.get_line_count ();",
- " Gtk.TextIter iter;",
- " var valiter = validate_res.map_iterator();",
- " while (valiter.next()) {",
- " ",
- " // print(\"get inter\\n\");",
- " var eline = valiter.get_key();",
- " if (eline > tlines) {",
- " continue;",
- " }",
- " this.el.get_iter_at_line( out iter, eline);",
- " //print(\"mark line\\n\");",
- " this.el.create_source_mark(valiter.get_value(), \"ERR\", iter);",
- " } ",
- " return false;",
- " }"
+ "\tif (this.error_line < 1) {",
+ "\t\treturn true;",
+ "\t}",
+ "\tvar tlines = this.el.get_line_count ();",
+ "\tGtk.TextIter iter;",
+ "\tvar valiter = validate_res.map_iterator();",
+ "\twhile (valiter.next()) {",
+ "",
+ "\t// print(\"get inter\\n\");",
+ "\t\tvar eline = valiter.get_key();",
+ "\t\tif (eline > tlines) {",
+ "\t\t\tcontinue;",
+ "\t\t}",
+ "\t\tthis.el.get_iter_at_line( out iter, eline);",
+ "\t\t//print(\"mark line\\n\");",
+ "\t\tthis.el.create_source_mark(valiter.get_value(), \"ERR\", iter);",
+ "\t} ",
+ "\treturn false;",
+ "}"
],
"| bool highlightErrorsJson" : [
"(string type, Json.Object obj) {",
- " Gtk.TextIter start;",
- " Gtk.TextIter end; ",
- " this.el.get_bounds (out start, out end);",
- " ",
- " this.el.remove_source_marks (start, end, type);",
- " ",
- " ",
- " // we should highlight other types of errors..",
- " ",
- " if (!obj.has_member(type)) {",
- " print(\"Return has no errors\\n\");",
- " return true;",
- " }",
- " ",
- " if (_this.window.windowstate.state != WindowState.State.CODEONLY ",
- " ",
- " ) {",
- " return true;",
- " } ",
- " ",
- " ",
- " var err = obj.get_object_member(type);",
- " ",
- " ",
- " if (_this.file == null) {",
- " return true;",
- " ",
- " }",
- " var valafn = _this.file.path;",
+ "\tGtk.TextIter start;",
+ "\tGtk.TextIter end; ",
+ "\tthis.el.get_bounds (out start, out end);",
+ "",
+ "\tthis.el.remove_source_marks (start, end, type);",
+ "\tGLib.debug(\"highlight errors\");\t\t ",
+ "",
+ "\t // we should highlight other types of errors..",
+ "",
+ "\tif (!obj.has_member(type)) {",
+ "\t\tGLib.debug(\"Return has no errors\\n\");",
+ "\t\treturn true;",
+ "\t}",
+ "",
+ "\tif (_this.window.windowstate.state != WindowState.State.CODEONLY ",
+ "\t\t&&",
+ "\t\t_this.window.windowstate.state != WindowState.State.CODE",
+ "\t\t) {",
+ "\t\tGLib.debug(\"windowstate != CODEONLY?\");",
+ "\t\t",
+ "\t\treturn true;",
+ "\t} ",
+ "",
+ "\t//this.marks = new Gee.HashMap<int,string>();",
+ "\tvar err = obj.get_object_member(type);",
" ",
- " if (_this.file.xtype != \"PlainFile\") {",
+ "\tif (_this.file == null) {",
+ "\t\tGLib.debug(\"file is null?\");",
+ "\t\treturn true;",
"",
+ "\t}",
+ "\tvar valafn = _this.file.path;",
"",
- " ",
- " ",
- " valafn = \"\";",
- " try { ",
- " var regex = new Regex(\"\\\\.bjs$\");",
- " // should not happen",
- " ",
- " ",
- " valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , \".vala\");",
- " } catch (GLib.RegexError e) {",
- " return true;",
- " } ",
+ "\tif (_this.file.xtype != \"PlainFile\") {",
"",
+ "\t\tvalafn = \"\";",
+ "\t\ttry { ",
+ "\t\t\tvar regex = new Regex(\"\\\\.bjs$\");",
+ "\t\t\t// should not happen",
+ "\t \t\tvalafn = regex.replace(_this.file.path,_this.file.path.length , 0 , \".vala\");",
+ "\t\t} catch (GLib.RegexError e) {",
+ "\t\t\treturn true;",
+ "\t\t} ",
"",
"",
- " }",
- " if (!err.has_member(valafn)) {",
- " print(\"File path has no errors\\n\");",
- " return true;",
- " }",
"",
- " var lines = err.get_object_member(valafn);",
- " ",
- " var offset = 1;",
- " if (obj.has_member(\"line_offset\")) {",
- " offset = (int)obj.get_int_member(\"line_offset\") + 1;",
- " }",
- " ",
+ "\t}",
+ "\tif (!err.has_member(valafn)) {",
+ "\t\tGLib.debug(\"File path has no errors\");",
+ "\t\treturn true;",
+ "\t}",
"",
- " ",
- " ",
- " var tlines = this.el.get_line_count () +1;",
- " ",
- " lines.foreach_member((obj, line, node) => {",
- " ",
- " Gtk.TextIter iter;",
- " // print(\"get inter\\n\");",
- " var eline = int.parse(line) - offset;",
- " print(\"GOT ERROR on line %s -- converted to %d\\n\", line,eline);",
- " ",
- " ",
- " if (eline > tlines || eline < 0) {",
- " return;",
- " }",
- " this.el.get_iter_at_line( out iter, eline);",
- " //print(\"mark line\\n\");",
- " var msg = \"Line: %d\".printf(eline+1);",
- " var ar = lines.get_array_member(line);",
- " for (var i = 0 ; i < ar.get_length(); i++) {",
- "\t\t msg += (msg.length > 0) ? \"\\n\" : \"\";",
- "\t\t msg += ar.get_string_element(i);",
+ "\tvar lines = err.get_object_member(valafn);",
+ "\t",
+ "\tvar offset = 1;",
+ "\tif (obj.has_member(\"line_offset\")) { // ?? why??",
+ "\t\toffset = (int)obj.get_int_member(\"line_offset\") + 1;",
+ "\t}",
+ "",
+ "",
+ "\tvar tlines = this.el.get_line_count () +1;",
+ "\t",
+ "\tif (_this.prop != null) {",
+ "\t",
+ "\t\ttlines = _this.prop.end_line + 1;",
+ "\t\toffset = _this.prop.start_line + 1;",
+ "\t",
+ "\t}",
+ "\t",
+ "",
+ "",
+ "\tlines.foreach_member((obj, line, node) => {",
+ "\t\t",
+ "\t Gtk.TextIter iter;",
+ "// print(\"get inter\\n\");",
+ "\t var eline = int.parse(line) - offset;",
+ "\t GLib.debug(\"GOT ERROR on line %s -- converted to %d (offset = %d)\\n\", line,eline, offset);",
+ "\t ",
+ "\t ",
+ "\t if (eline > tlines || eline < 0) {",
+ "\t return;",
"\t }",
- " ",
- " ",
- " this.el.create_source_mark(msg, type, iter);",
- " } );",
- " return false;",
- " ",
+ "\t ",
+ "\t ",
+ "\t this.el.get_iter_at_line( out iter, eline);",
+ "\t //print(\"mark line\\n\");",
+ "\t var msg = \"\";",
+ "\t var ar = lines.get_array_member(line);",
+ "\t for (var i = 0 ; i < ar.get_length(); i++) {",
+ "\t \tif (ar.get_string_element(i) == \"Success\") {",
+ "\t \t\tcontinue;",
+ " \t\t}",
+ "\t\t\tmsg += (msg.length > 0) ? \"\\n\" : \"\";",
+ "\t\t\tmsg += ar.get_string_element(i);",
+ "\t\t}",
+ "\t\tif (msg == \"\") {",
+ "\t\t\treturn;",
+ "\t\t}",
+ "\t\tmsg = \"Line: %d\".printf(eline+1) + \" \" + msg;",
+ "\t this.el.create_source_mark(msg, type, iter);",
+ "\t GLib.debug(\"set line %d to %m\", eline, msg);",
+ "\t // this.marks.set(eline, msg);",
+ "\t} );",
+ "\treturn false;",
"",
"",
"",
"",
- "}",
+ "",
+ "\t}",
""
],
"| string toString" : [
"}",
" "
]
+ },
+ {
+ "$ xns" : "Gtk",
+ "listeners" : {
+ "key_released" : [
+ "(keyval, keycode, state) => {",
+ "",
+ " ",
+ " if (keyval == Gdk.Key.s && (state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
+ " GLib.debug(\"SAVE: ctrl-S pressed\");",
+ " _this.saveContents();",
+ " return;",
+ " }",
+ " ",
+ " if (keyval == Gdk.Key.g && (state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
+ "\t GLib.debug(\"SAVE: ctrl-g pressed\");",
+ "\t\t_this.forwardSearch(true);",
+ "\t return;",
+ "\t}",
+ "\tif (keyval == Gdk.Key.f && (state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
+ "\t GLib.debug(\"SAVE: ctrl-f pressed\");",
+ "\t\t_this.search_entry.el.grab_focus();",
+ "\t return;",
+ "\t}",
+ " ",
+ " // print(event.key.keyval)",
+ " ",
+ " return;",
+ " ",
+ " ",
+ "}",
+ ""
+ ]
+ },
+ "xtype" : "EventControllerKey"
}
],
"listeners" : {
- "key_release_event" : [
- " (event) => {",
- " ",
- " if (event.keyval == Gdk.Key.s && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
- " GLib.debug(\"SAVE: ctrl-S pressed\");",
- " _this.saveContents();",
- " return false;",
- " }",
- " ",
- " if (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
- "\t GLib.debug(\"SAVE: ctrl-g pressed\");",
- "\t\t_this.forwardSearch(true);",
- "\t return true;",
- "\t}",
- "\tif (event.keyval == Gdk.Key.f && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
- "\t GLib.debug(\"SAVE: ctrl-f pressed\");",
- "\t\t_this.search_entry.el.grab_focus();",
- "\t return true;",
- "\t}",
- " ",
- " // print(event.key.keyval)",
- " ",
- " return false;",
+ "query_tooltip" : [
+ "(x, y, keyboard_tooltip, tooltip) => {",
+ "\t",
+ "\t//GLib.debug(\"query tooltip\");",
+ "\tGtk.TextIter iter;",
+ "\tint trailing;",
+ "\t",
+ "\tvar yoff = (int) _this.RightEditor.el.vadjustment.value;",
+ "\t",
+ "\t// I think this is problematic - if it's compliing / updating at same time as query.",
+ "\t",
+ "\t//if (_this.window.statusbar_compile_spinner.el.spinning) {",
+ "\t//\treturn false;",
+ "\t//}",
+ "\t",
+ "\tthis.el.get_iter_at_position (out iter, out trailing, x, y + yoff);",
+ "\t ",
+ "\tvar l = iter.get_line();",
"",
- "} ",
+ "\t",
+ "\t ",
+ "\t// GLib.debug(\"query tooltip line %d\", (int) l);",
+ "\tif (l < 0) {",
"",
- " "
+ "\t\treturn false;",
+ "\t}",
+ "\t/*",
+ "\tif (_this.buffer.marks != null && _this.buffer.marks.has_key(l)) {",
+ "\t\tGLib.debug(\"line %d setting tip to %s\", l, _this.buffer.marks.get(l));",
+ "\t\ttooltip.set_text(_this.buffer.marks.get(l).dup());",
+ "\t\treturn true;",
+ "\t}",
+ " ",
+ "\treturn false;",
+ "\t*/",
+ "\t",
+ "\t ",
+ "\t// this crashes?? - not sure why.",
+ "\tvar marks = _this.buffer.el.get_source_marks_at_line(l, \"ERR\");",
+ "\tif (marks.is_empty()) {",
+ "\t\tmarks = _this.buffer.el.get_source_marks_at_line(l, \"WARN\");",
+ "\t}",
+ "\tif (marks.is_empty()) {",
+ "\t\tmarks = _this.buffer.el.get_source_marks_at_line(l, \"DEPR\");",
+ "\t}",
+ "\t",
+ "\t// GLib.debug(\"query tooltip line %d marks %d\", (int)l, (int) marks.length());",
+ "\tvar str = \"\";",
+ "\tmarks.@foreach((m) => { ",
+ "\t\t//GLib.debug(\"got mark %s\", m.name);",
+ "\t\tstr += (str.length > 0 ? \"\\n\" : \"\") + m.category + \": \" + m.name;",
+ "\t});",
+ "\t// true if there is a mark..",
+ "\tif (str.length > 0 ) {",
+ "\t\ttooltip.set_text( str );",
+ "\t}",
+ "\treturn str.length > 0 ? true : false;",
+ "\t ",
+ "}",
+ ""
]
},
"string name" : "editor-view",
"uint tab_width" : 4,
- "xtype" : "SourceView",
+ "xtype" : "View",
"| void load" : [
" (string str) {",
"",
"// show the help page for the active node..",
" //this.get('/Help').show();",
- "",
- "",
+ " ",
" // this.get('/BottomPane').el.set_current_page(0);",
- " var buf = (Gtk.SourceBuffer)this.el.get_buffer();",
+ " \tGLib.debug(\"load called - Reset undo buffer\");",
+ " \t",
+ " var buf = (GtkSource.Buffer)this.el.get_buffer();",
+ " buf.begin_irreversible_action();",
" buf.set_text(str, str.length);",
- " buf.set_undo_manager(null);",
+ " buf.end_irreversible_action();",
" ",
- " var lm = Gtk.SourceLanguageManager.get_default();",
+ " var lm = GtkSource.LanguageManager.get_default();",
" var lang = \"vala\";",
" if (_this.file != null) {",
" lang = _this.file.language;",
" lm.get_language(lang);",
" ",
" ",
- " ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); ",
+ " ((GtkSource.Buffer)(this.el.get_buffer())) .set_language(lg); ",
"",
" this.el.insert_spaces_instead_of_tabs = true;",
" if (lg != null) {",
},
{
"$ xns" : "Gtk",
+ "* pack" : "append",
"Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
"bool homogeneous" : false,
"bool vexpand" : false,
"items" : [
{
"$ xns" : "Gtk",
- "* init" : [
- "var description = Pango.FontDescription.from_string(\"monospace\");",
- "\tdescription.set_size(8000);",
- "\t this.el.set_property(\"font-desc\",description);",
- "",
- ""
- ],
+ "Gtk.CssProvider css" : "",
"bool hexpand" : true,
"id" : "search_entry",
- "int width_request" : 300,
+ "items" : [
+ {
+ "$ xns" : "Gtk",
+ "listeners" : {
+ "key_pressed" : [
+ "(keyval, keycode, state) => {",
+ "",
+ "\tif (keyval == Gdk.Key.g && (state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
+ "\t GLib.debug(\"SAVE: ctrl-g pressed\");",
+ "\t\t_this.forwardSearch(true);",
+ "\t return true;",
+ "\t}",
+ " ",
+ " ",
+ " \tif (keyval == Gdk.Key.Return && _this.search_entry.el.text.length > 0) {",
+ "\t\t_this.forwardSearch(true);",
+ "\t\t",
+ "\t\t",
+ "\t return true;",
+ "",
+ "\t} ",
+ " // print(event.key.keyval)",
+ " ",
+ " return false;",
+ "}",
+ ""
+ ]
+ },
+ "xtype" : "EventControllerKey"
+ }
+ ],
"listeners" : {
- "changed" : [
- "() => {",
- "\t/*",
- "\tif (this.el.text == \"\") {",
- "\t\t_this.search_results.el.hide();",
- "\t\treturn;",
- "\t}",
- "\tvar res = 0;",
- "\tswitch(_this.windowstate.state) {",
- "\t\tcase WindowState.State.CODEONLY:",
- "\t\t///case WindowState.State.CODE:",
- "\t\t\t// search the code being edited..",
- "\t\t\tres = _this.windowstate.code_editor_tab.search(this.el.text);",
- "\t\t\t",
- "\t\t\tbreak;",
- "\t\tcase WindowState.State.PREVIEW:",
- "\t\t\tif (_this.windowstate.file.xtype == \"Gtk\") {",
- "\t\t\t\t res = _this.windowstate.window_gladeview.search(this.el.text);",
- "\t\t\t} else { ",
- "\t\t\t\t res = _this.windowstate.window_rooview.search(this.el.text);\t\t\t",
- "\t\t\t}",
- "\t\t",
- "\t\t",
- "\t\t\tbreak;",
- "\t}",
- "\t_this.search_results.el.show();",
- "\tif (res > 0) {",
- "\t\t_this.search_results.el.label = \"%d Matches\".printf(res);",
- "\t} else {",
- "\t\t_this.search_results.el.label = \"No Matches\";",
- "\t}",
- "\t\t",
- "\t*/",
- "\t",
- "}",
- ""
- ],
- "key_press_event" : [
- "(event) => {",
- " if (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {",
- "\t GLib.debug(\"SAVE: ctrl-g pressed\");",
- "\t\t_this.forwardSearch(true);",
- "\t return true;",
- "\t}",
- " ",
- " ",
- " \tif (event.keyval == Gdk.Key.Return && this.el.text.length > 0) {",
- "\t\t//var res =",
- "\t\t _this.search(this.el.text);",
- "\t\t _this.search_results.updateResults();",
- "",
- "\t\tGLib.Timeout.add_seconds(2,() => {",
- "\t\t\t _this.search_results.updateResults();",
- "\t\t\t return false;",
- "\t\t });",
- "\t ",
- "\t\t",
- "\t return true;",
+ "search_changed" : [
+ "( ) => {",
"",
- "\t} ",
- " // print(event.key.keyval)",
- " ",
- " return false;",
+ "_this.search(_this.search_entry.el.text);",
+ "\t _this.search_results.updateResults();",
"",
- "} "
+ "\tGLib.Timeout.add_seconds(1,() => {",
+ "\t\t _this.search_results.updateResults();",
+ "\t\t return false;",
+ "\t });",
+ "}",
+ ""
]
},
+ "string name" : "editor-search-entry",
"string placeholder_text" : "Press enter to search",
+ "uint search_delay" : 3,
"xtype" : "SearchEntry",
"| void forwardSearch" : [
"(bool change_focus) {",
},
{
"$ xns" : "Gtk",
- "* pack" : "add",
- "items" : [
- {
- "$ xns" : "Gtk",
- "* pack" : "add",
- "bool always_show_image" : true,
- "bool visible" : false,
- "id" : "search_results",
- "listeners" : {
- "button_press_event" : [
- "() => {",
- "/*",
- " if (this.popup == null) {",
- " this.popup = new Xcls_ValaCompileErrors();",
- " this.popup.window = _this;",
- " }",
- " ",
- " ",
- " this.popup.show(this.notices, this.el);",
- " */",
- " return true;",
- "}"
- ]
- },
- "xtype" : "MenuItem",
- "| void updateResults" : [
- "() {",
- "\tthis.el.visible = true;",
- "\t",
- "\tvar res = _this.searchcontext.get_occurrences_count();",
- "\tif (res < 0) {",
- "\t\t_this.search_results.el.label = \"??? Matches\";\t\t",
- "\t\treturn;",
- "\t}",
- "",
- "\t_this.nextBtn.el.sensitive = false;",
- "\t_this.backBtn.el.sensitive = false;\t",
- "",
- "\tif (res > 0) {",
- "\t\t_this.search_results.el.label = \"%d Matches\".printf(res);",
- "\t\t_this.nextBtn.el.sensitive = true;",
- "\t\t_this.backBtn.el.sensitive = true;",
- "\t\treturn;",
- "\t} ",
- "\t_this.search_results.el.label = \"No Matches\";",
- "\t",
- "}"
- ]
- }
- ],
- "xtype" : "MenuBar"
+ "id" : "search_results",
+ "int margin_end" : 4,
+ "int margin_start" : 4,
+ "string label" : "No Results",
+ "xtype" : "Label",
+ "| void updateResults" : [
+ "() {",
+ "\tthis.el.visible = true;",
+ "\t",
+ "\tvar res = _this.searchcontext.get_occurrences_count();",
+ "\tif (res < 0) {",
+ "\t\t_this.search_results.el.label = \"??? Matches\";\t\t",
+ "\t\treturn;",
+ "\t}",
+ "",
+ "\t_this.nextBtn.el.sensitive = false;",
+ "\t_this.backBtn.el.sensitive = false;\t",
+ "",
+ "\tif (res > 0) {",
+ "\t\t_this.search_results.el.label = \"%d Matches\".printf(res);",
+ "\t\t_this.nextBtn.el.sensitive = true;",
+ "\t\t_this.backBtn.el.sensitive = true;",
+ "\t\treturn;",
+ "\t} ",
+ "\t_this.search_results.el.label = \"No Matches\";",
+ "\t",
+ "}"
+ ]
},
{
"$ xns" : "Gtk",
"bool always_show_image" : true,
"bool sensitive" : false,
"id" : "nextBtn",
- "items" : [
- {
- "$ xns" : "Gtk",
- "* prop" : "image",
- "string icon_name" : "go-down",
- "xtype" : "Image"
- }
- ],
"listeners" : {
- "button_press_event" : [
+ "clicked" : [
"(event) => {",
"",
"\t_this.forwardSearch(true);",
"\t",
- "\treturn true;",
+ "\t ",
"}",
""
]
},
- "string label" : "Next",
+ "string icon_name" : "go-down",
"xtype" : "Button"
},
{
"bool always_show_image" : true,
"bool sensitive" : false,
"id" : "backBtn",
- "items" : [
- {
- "$ xns" : "Gtk",
- "* prop" : "image",
- "string icon_name" : "go-up",
- "xtype" : "Image"
- }
- ],
"listeners" : {
- "button_press_event" : [
+ "clicked" : [
"(event) => {",
"",
"\t_this.backSearch(true);",
- "\t",
- "\treturn true;",
+ "\t ",
"}",
""
]
},
- "string label" : "Previous",
+ "string icon_name" : "go-up",
"xtype" : "Button"
},
{
"$ xns" : "Gtk",
+ "bool always_show_arrow" : true,
"bool always_show_image" : true,
"items" : [
{
"$ xns" : "Gtk",
- "* prop" : "image",
- "string icon_name" : "emblem-system",
- "xtype" : "Image"
- },
- {
- "$ xns" : "Gtk",
- "* prop" : "popup",
+ "* prop" : "popover",
"id" : "search_settings",
"items" : [
{
"$ xns" : "Gtk",
- "* init" : [
- "{",
- "\tthis.el.show();",
- "}",
- ""
- ],
- "id" : "case_sensitive",
- "string label" : "Case Sensitive",
- "xtype" : "CheckMenuItem"
- },
- {
- "$ xns" : "Gtk",
- "* init" : [
- "{",
- "\tthis.el.show();",
- "}",
- ""
- ],
- "id" : "regex",
- "string label" : "Regex",
- "xtype" : "CheckMenuItem"
- },
- {
- "$ xns" : "Gtk",
- "* init" : [
- "{",
- "\tthis.el.show();",
- "}",
- ""
+ "* prop" : "child",
+ "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+ "int spacing" : 0,
+ "items" : [
+ {
+ "$ xns" : "Gtk",
+ "* init" : [
+ "{",
+ "\tthis.el.show();",
+ "}",
+ ""
+ ],
+ "id" : "case_sensitive",
+ "string label" : "Case Sensitive",
+ "xtype" : "CheckButton"
+ },
+ {
+ "$ xns" : "Gtk",
+ "* init" : [
+ "{",
+ "\tthis.el.show();",
+ "}",
+ ""
+ ],
+ "id" : "regex",
+ "string label" : "Regex",
+ "xtype" : "CheckButton"
+ },
+ {
+ "$ xns" : "Gtk",
+ "id" : "multiline",
+ "string label" : "Multi-line (add \\n)",
+ "xtype" : "CheckButton"
+ }
],
- "id" : "multiline",
- "string label" : "Multi-line (add \\n)",
- "xtype" : "CheckMenuItem"
+ "xtype" : "Box"
}
],
- "xtype" : "Menu"
+ "xtype" : "Popover"
}
],
- "string label" : "Settings",
+ "string icon_name" : "emblem-system",
"xtype" : "MenuButton"
}
],
" if (_this.file.xtype != \"PlainFile\") {",
" // in theory these properties have to exist!?!",
" \tthis.prop.val = str;",
- " this.window.windowstate.left_props.reload();",
+ " //this.window.windowstate.left_props.reload();",
" } else {",
" _this.file.setSource( str );",
" }",
"| int search" : [
"(string in_txt) {",
"",
- "\tvar s = new Gtk.SourceSearchSettings();",
+ "\tvar s = new GtkSource.SearchSettings();",
"\ts.case_sensitive = _this.case_sensitive.el.active;",
"\ts.regex_enabled = _this.regex.el.active;\t",
"\ts.wrap_around = false;",
"\t",
- "\tthis.searchcontext = new Gtk.SourceSearchContext(this.buffer.el,s);",
+ "\tthis.searchcontext = new GtkSource.SearchContext(this.buffer.el,s);",
"\tthis.searchcontext.set_highlight(true);",
"\tvar txt = in_txt;",
"\t",
"\t ",
"\tthis.buffer.el.get_start_iter(out beg);",
"\tbool has_wrapped_around;",
- "\tthis.searchcontext.forward2(beg, out st, out en, out has_wrapped_around);",
+ "\tthis.searchcontext.forward(beg, out st, out en, out has_wrapped_around);",
"\tthis.last_search_end = 0;",
"\t",
"\treturn this.searchcontext.get_occurrences_count();",
"\tbool has_wrapped_around;",
"\tthis.buffer.el.get_iter_at_offset(out beg, this.last_search_end -1 );",
"\t",
- "\tif (!this.searchcontext.backward2(beg, out st, out en, out has_wrapped_around)) {",
- "\t",
+ "\tif (!this.searchcontext.backward(beg, out st, out en, out has_wrapped_around)) {",
"\t\tthis.last_search_end = 0;",
"\t} else {",
"\t\tthis.last_search_end = en.get_offset();",
"\t\tthis.buffer.el.place_cursor(st);",
"\t\tthis.view.el.scroll_to_iter(st, 0.1f, true, 0.0f, 0.5f);",
"\t}",
- " ",
+ "",
"}",
""
],
"\tGtk.TextIter beg, st,en;",
"\t bool has_wrapped_around;",
"\tthis.buffer.el.get_iter_at_offset(out beg, this.last_search_end);",
- "\tif (!this.searchcontext.forward2(beg, out st, out en, out has_wrapped_around)) {",
+ "\tif (!this.searchcontext.forward(beg, out st, out en, out has_wrapped_around)) {",
"\t",
"\t\tthis.last_search_end = 0; // not sure if this should happen",
"\t} else {",
" ",
"\t\tvar buf = this.view.el.get_buffer();",
"",
- "\t\tvar sbuf = (Gtk.SourceBuffer) buf;",
+ "\t\tvar sbuf = (GtkSource.Buffer) buf;",
"",
"",
"\t\tGtk.TextIter iter; ",
"",
" // find the text for the node..",
" this.view.load( prop.val );",
+ " ",
+ " ",
" this.close_btn.el.show(); ",
" ",
" } else {",
" }",
" ",
"}"
+ ],
+ "| void updateErrorMarks" : [
+ "(GLib.ListStore? ar) {",
+ "\t",
+ " ",
+ "\t",
+ "\t var buf = _this.buffer.el;",
+ "\tGtk.TextIter start;",
+ "\tGtk.TextIter end; ",
+ "\tbuf.get_bounds (out start, out end);",
+ "",
+ "\tbuf.remove_source_marks (start, end, \"ERR\");",
+ "\tbuf.remove_source_marks (start, end, \"WARN\");",
+ "\tbuf.remove_source_marks (start, end, \"DEPR\");",
+ "\tGLib.debug(\"highlight errors\");\t\t ",
+ "",
+ "\t // we should highlight other types of errors..",
+ "",
+ "\tif (ar == null || ar.get_n_items() < 1) {",
+ "\t\tGLib.debug(\"Return has no errors\\n\");",
+ "\t\treturn;",
+ "\t}",
+ "",
+ "\tif (_this.window.windowstate.state != WindowState.State.CODEONLY ",
+ "\t\t&&",
+ "\t\t_this.window.windowstate.state != WindowState.State.CODE",
+ "\t\t) {",
+ "\t\tGLib.debug(\"windowstate != CODEONLY?\");",
+ "\t\t",
+ "\t\treturn;",
+ "\t} ",
+ "",
+ "\t ",
+ "\tif (_this.file == null) {",
+ "\t\tGLib.debug(\"file is null?\");",
+ "\t\treturn;",
+ "",
+ "\t}",
+ " ",
+ "",
+ " ",
+ "\t",
+ "\tvar offset = 1;",
+ "\t ",
+ "",
+ "\tvar tlines = buf.get_line_count () +1;",
+ "\t",
+ "\tif (_this.prop != null) {",
+ "\t",
+ "\t\ttlines = _this.prop.end_line + 1;",
+ "\t\toffset = _this.prop.start_line + 1;",
+ "\t",
+ "\t}",
+ "\t ",
+ "\tfor (var i = 0; i < ar.get_n_items();i++) {",
+ "\t\tvar err = (Palete.CompileError) ar.get_item(i);",
+ "\t\t",
+ "\t Gtk.TextIter iter;",
+ "// print(\"get inter\\n\");",
+ "\t var eline = err.line - offset;",
+ "\t GLib.debug(\"GOT ERROR on line %d -- converted to %d (offset = %d)\",",
+ "\t \terr.line ,eline, offset);",
+ "\t ",
+ "\t ",
+ "\t if (eline > tlines || eline < 0) {",
+ "\t return;",
+ "\t }",
+ "\t ",
+ "\t ",
+ "\t buf.get_iter_at_line( out iter, eline);",
+ "\t ",
+ "\t ",
+ "\t\tvar msg = \"Line: %d %s : %s\".printf(eline+1, err.category, err.msg);",
+ "\t buf.create_source_mark( msg, err.category, iter);",
+ "\t GLib.debug(\"set line %d to %m\", eline, msg);",
+ "\t // this.marks.set(eline, msg);",
+ "\t}",
+ "\treturn ;",
+ "",
+ "",
+ "",
+ " ",
+ "",
+ "}"
]
}
],
- "modOrder" : "",
- "name" : "Editor",
- "parent" : "",
- "path" : "/home/alan/gitlive/roobuilder/src/Builder4/Editor.bjs",
- "permname" : "",
- "title" : ""
+ "name" : "Editor"
}
\ No newline at end of file
projects / roobuilder / blobdiff