From 121e9063612522d9b62098c8da2d8a1b075a375f Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 2 Jun 2015 20:47:13 +0800 Subject: [PATCH] src/Builder4/Editor.bjs src/Builder4/Editor.vala --- src/Builder4/Editor.bjs | 2 +- src/Builder4/Editor.vala | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs index 4c0fbc6cd..c4f481bed 100644 --- a/src/Builder4/Editor.bjs +++ b/src/Builder4/Editor.bjs @@ -9,7 +9,7 @@ "items" : [ { "# Xcls_MainWindow window" : "null", - "| Gee.ArrayList search" : "(string txt) {\n\tvar ret = new Gee.ArrayList();\n\n\tvar str = this.buffer.toString();\n\n\tvar lines = str.split(\"\\n\");\n\tfor (var i = 0 ; i < lines.length; i++) {\n\tif (lines[i].contains(txt)) {\n\t\tret.add(i);\n\t}\n \n\t}\n\treturn ret;\n}\n", + "| Gee.ArrayList search" : "(string txt) {\n\n\tvar s = new Gtk.SourceSearchSettings();\n\t\n\tvar sctx = new Gtk.SourceSearchContext(this.buffer,s);\n\tsctx.set_highlight(true);\n\ts.set_search_text(txt);\n\t\n\n\n\tvar ret = new Gee.ArrayList();\n\n\tvar str = this.buffer.toString();\n\n\tvar lines = str.split(\"\\n\");\n\tfor (var i = 0 ; i < lines.length; i++) {\n\tif (lines[i].contains(txt)) {\n\t\tret.add(i);\n\t}\n \n\t}\n\treturn ret;\n}\n", "| bool saveContents" : " () {\n \n \n if (_this.file == null) {\n return true;\n }\n \n \n \n \n \n var str = _this.buffer.toString();\n \n _this.buffer.checkSyntax();\n \n \n \n // LeftPanel.model.changed( str , false);\n _this.dirty = false;\n _this.save_button.el.sensitive = false;\n \n // find the text for the node..\n if (_this.file.xtype != \"PlainFile\") {\n if (ptype == \"listener\") {\n this.node.listeners.set(key,str);\n \n } else {\n this.node.props.set(key,str);\n }\n } else {\n _this.file.setSource( str );\n }\n \n // call the signal..\n this.save();\n \n return true;\n\n} ", "# string activeEditor" : "\"\"", "| void scroll_to_line" : "(int line) {\n\n\tGLib.Timeout.add(500, () => {\n \n\t\tvar buf = this.view.el.get_buffer();\n\n\t\tvar sbuf = (Gtk.SourceBuffer) buf;\n\n\n\t\tGtk.TextIter iter; \n\t\tsbuf.get_iter_at_line(out iter, line);\n\t\tthis.view.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f);\n\t\treturn false;\n\t}); \n}\n", diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index 8db47873f..a4ed0d58a 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -60,6 +60,15 @@ public class Editor : Object // user defined functions public Gee.ArrayList search (string txt) { + + var s = new Gtk.SourceSearchSettings(); + + var sctx = new Gtk.SourceSearchContext(this.buffer,s); + sctx.set_highlight(true); + s.set_search_text(txt); + + + var ret = new Gee.ArrayList(); var str = this.buffer.toString(); -- 2.39.2