{
"build_module" : "builder",
+ "gen_extended" : false,
"items" : [
{
"# Gtk.Widget lastObj" : "null",
"# Xcls_MainWindow main_window" : "",
"$ xns" : "Gtk",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
- "Gtk.SourceSearchContext searchcontext" : "",
+ "GtkSource.SearchContext searchcontext" : "",
"bool hexpand" : true,
"bool vexpand" : true,
"id" : "WindowRooView",
+ "int last_error_counter" : 0,
"int last_search_end" : 0,
"items" : [
{
"$ xns" : "Gtk",
- "* pack" : "pack_start,true,true,0",
+ "bool vexpand" : true,
"id" : "notebook",
"items" : [
{
"$ xns" : "Gtk",
"* pack" : "append_page,_this.label_preview.el",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+ "bool vexpand" : true,
"id" : "paned",
"items" : [
{
"$ homogeneous" : false,
"$ xns" : "Gtk",
- "* pack" : "pack1,true,true",
+ "* pack" : "set_start_child",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+ "bool vexpand" : true,
"id" : "viewbox",
"items" : [
{
"$ homogeneous" : true,
"$ vexpand" : false,
"$ xns" : "Gtk",
- "* pack" : "pack_start,false,true,0",
"Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
"items" : [
{
"$ xns" : "Gtk",
- "* pack" : "pack_start,false,false,0",
"label" : "Redraw",
"listeners" : {
"clicked" : [
{
"$ active" : true,
"$ xns" : "Gtk",
- "* pack" : "pack_start,false,false,0",
"id" : "AutoRedraw",
"label" : "Auto Redraw On",
"listeners" : {
},
{
"$ xns" : "Gtk",
- "* pack" : "pack_start,false,false,0",
"label" : "Full Redraw",
"listeners" : {
"clicked" : [
" () => {",
" _this.view.redraws = 99;",
- " _this.view.el.web_context.clear_cache(); ",
+ " // _this.view.el.web_context.clear_cache(); ",
" //_this.view.renderJS(true);",
" FakeServerCache.clear();",
" _this.view.reInit();",
"xtype" : "Box"
},
{
- "$ shadow_type" : "Gtk.ShadowType.IN",
- "$ xns" : "Gtk",
+ "# GLib.DateTime lastRedraw" : "null",
+ "# WebKit.WebInspector inspector" : "",
+ "# bool pendingRedraw" : false,
+ "# bool refreshRequired" : false,
+ "# int redraws" : 0,
+ "# string renderedData" : "\"\"",
+ "# string runhtml" : "\"\"",
+ "# string runjs" : "\"\"",
+ "$ xns" : "WebKit",
"* init" : [
- " this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);",
+ " {",
+ " // this may not work!?",
+ " var settings = this.el.get_settings();",
+ " settings.enable_developer_extras = true;",
+ " ",
+ " ",
+ " var fs= new FakeServer(this.el);",
+ " fs.ref();",
+ " // this was an attempt to change the url perms.. did not work..",
+ " // settings.enable_file_access_from_file_uris = true;",
+ " // settings.enable_offline_web_application_cache - true;",
+ " // settings.enable_universal_access_from_file_uris = true;",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ "",
+ " // FIXME - base url of script..",
+ " // we need it so some of the database features work.",
+ " this.el.load_html( \"Render not ready\" , ",
+ " //fixme - should be a config option!",
+ " // or should we catch stuff and fix it up..",
+ " \"http://localhost/app.Builder/\"",
+ " );",
+ " ",
+ " ",
+ " //this.el.open('file:///' + __script_path__ + '/../builder.html');",
+ " /*",
+ " Gtk.drag_dest_set",
+ " (",
+ " this.el, //",
+ " Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT,",
+ " null, // list of targets",
+ " Gdk.DragAction.COPY // what to do with data after dropped ",
+ " );",
+ " ",
+ " // print(\"RB: TARGETS : \" + LeftTree.atoms[\"STRING\"]);",
+ " Gtk.drag_dest_set_target_list(this.el, this.get('/Window').targetList);",
+ " */",
+ " GLib.Timeout.add_seconds(1, () =>{",
+ " //print(\"run refresh?\");",
+ " if (this.el == null) {",
+ " return false;",
+ " }",
+ " this.runRefresh(); ",
+ " return true;",
+ " });",
+ " ",
+ " ",
+ "}",
+ ""
+ ],
+ "bool vexpand" : true,
+ "id" : "view",
+ "listeners" : {
+ "load_changed" : [
+ "(le) => {",
+ " if (le != WebKit.LoadEvent.FINISHED) {",
+ " return;",
+ " }",
+ " if (this.runjs.length < 1) {",
+ " return;",
+ " }",
+ " // this.el.run_javascript(this.runjs, null);",
+ " FakeServerCache.remove( this.runjs);",
+ " this.runjs = \"\";",
+ "}"
+ ],
+ "ready_to_show" : [
+ "( ) => {",
+ " this.initInspector();",
+ "",
+ "}",
+ ""
+ ],
+ "script_dialog" : [
+ "(dialog) => {",
+ "",
+ "\tif (this.el == null) {",
+ "\t\treturn true;",
+ "\t}",
+ "",
+ "\tvar msg = dialog.get_message();",
+ "\tif (msg.length < 4) {",
+ "\t\treturn false;",
+ "\t}",
+ "\t ",
+ "\t //GLib.debug(\"script dialog got %s\", msg);",
+ "\t ",
+ "\tif (msg.substring(0,4) != \"IPC:\") {",
+ "\t\treturn false;",
+ "\t}",
+ "\tvar ar = msg.split(\":\", 3);",
+ "\tif (ar.length < 3) {",
+ "\t\treturn false;",
+ "\t}",
+ "",
+ "\tswitch(ar[1]) {",
+ "\t",
+ "\t\tcase \"SAVEHTML\":",
+ "\t\t // GLib.debug(\"GOT saveHTML %d\", ar[2].length);",
+ "\t\t _this.file.saveHTML(ar[2]);",
+ "\t\t _this.createThumb();",
+ "\t\t return true;",
+ "\t\t ",
+ "\t\tdefault:",
+ "\t\t return false;",
+ "\t}",
+ " ",
+ "}"
+ ]
+ },
+ "xtype" : "WebView",
+ "| void initInspector" : [
+ "() {",
+ " ",
" ",
+ " ",
+ " // this.inspector.open_window.connect(() => {",
+ " this.inspector = this.el.get_inspector();",
+ " ",
+ " this.inspector.open_window.connect(() => {",
+ " print(\"inspector attach\\n\");",
+ " var wv = this.inspector.get_web_view();",
+ " if (wv != null) {",
+ " print(\"got inspector web view\\n\");",
+ " ",
+ " var cn = _this.inspectorcontainer.el.get_first_child();",
+ " if (cn != null) {",
+ " _this.inspectorcontainer.el.remove(cn);",
+ " }",
+ " ",
+ " _this.inspectorcontainer.el.append(wv);",
+ " wv.show();",
+ " } else {",
+ "\t print(\"got inspector web view FAILED\\n\");",
+ " //this.inspector.close();",
+ " ",
+ " //this.inspector = null;",
+ " ",
+ " ",
+ " }",
+ " return true;",
+ " ",
+ " });",
+ " this.inspector.show();",
+ " ",
+ " ",
+ " ",
+ "}",
""
],
- "* pack" : "pack_end,true,true,0",
- "id" : "viewcontainer",
- "items" : [
- {
- "# GLib.DateTime lastRedraw" : "null",
- "# WebKit.WebInspector inspector" : "",
- "# bool pendingRedraw" : false,
- "# bool refreshRequired" : false,
- "# int redraws" : 0,
- "# string renderedData" : "\"\"",
- "# string runhtml" : "\"\"",
- "# string runjs" : "\"\"",
- "$ xns" : "WebKit",
- "* init" : [
- " {",
- " // this may not work!?",
- " var settings = this.el.get_settings();",
- " settings.enable_developer_extras = true;",
- " ",
- " ",
- " var fs= new FakeServer(this.el);",
- " fs.ref();",
- " // this was an attempt to change the url perms.. did not work..",
- " // settings.enable_file_access_from_file_uris = true;",
- " // settings.enable_offline_web_application_cache - true;",
- " // settings.enable_universal_access_from_file_uris = true;",
- " ",
- " ",
- " ",
- " ",
- " ",
- "",
- " // FIXME - base url of script..",
- " // we need it so some of the database features work.",
- " this.el.load_html( \"Render not ready\" , ",
- " //fixme - should be a config option!",
- " // or should we catch stuff and fix it up..",
- " \"http://localhost/app.Builder/\"",
- " );",
- " ",
- " ",
- " //this.el.open('file:///' + __script_path__ + '/../builder.html');",
- " /*",
- " Gtk.drag_dest_set",
- " (",
- " this.el, //",
- " Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT,",
- " null, // list of targets",
- " Gdk.DragAction.COPY // what to do with data after dropped ",
- " );",
- " ",
- " // print(\"RB: TARGETS : \" + LeftTree.atoms[\"STRING\"]);",
- " Gtk.drag_dest_set_target_list(this.el, this.get('/Window').targetList);",
- " */",
- " GLib.Timeout.add_seconds(1, () =>{",
- " //print(\"run refresh?\");",
- " if (this.el == null) {",
- " return false;",
- " }",
- " this.runRefresh(); ",
- " return true;",
- " });",
- " ",
- " ",
- "}",
- ""
- ],
- "* pack" : "add",
- "id" : "view",
- "listeners" : {
- "drag_drop" : [
- " ( ctx, x, y,time, ud) => {",
- " return false;",
- " /*",
- "\tprint(\"TARGET: drag-drop\");",
- " var is_valid_drop_site = true;",
- " ",
- " ",
- " Gtk.drag_get_data",
- " (",
- " w, // will receive 'drag-data-received' signal ",
- " ctx, /* represents the current state of the DnD ",
- " this.get('/Window').atoms[\"STRING\"], /* the target type we want ",
- " time /* time stamp ",
- " );",
- " ",
- " ",
- " /* No target offered by source => error ",
- " ",
- "",
- "\treturn is_valid_drop_site;",
- "\t*/",
- "}"
- ],
- "load_changed" : [
- "(le) => {",
- " if (le != WebKit.LoadEvent.FINISHED) {",
- " return;",
- " }",
- " if (this.runjs.length < 1) {",
- " return;",
- " }",
- " // this.el.run_javascript(this.runjs, null);",
- " FakeServerCache.remove( this.runjs);",
- " this.runjs = \"\";",
- "}"
- ],
- "script_dialog" : [
- " (dialog) => {",
- " ",
- " ",
- " if (this.el == null) {",
- " return true;",
- " }",
- " ",
- " var msg = dialog.get_message();",
- " if (msg.length < 4) {",
- " return false;",
- " }",
- " if (msg.substring(0,4) != \"IPC:\") {",
- " return false;",
- " }",
- " var ar = msg.split(\":\", 3);",
- " if (ar.length < 3) {",
- " return false;",
- " }",
- "",
- " switch(ar[1]) {",
- " case \"SAVEHTML\":",
- "\t print(\"GOT saveHTML %d?\\n\", ar[2].length);",
- " _this.file.saveHTML(ar[2]);",
- " return true;",
- " default:",
- " return false;",
- " }",
- " ",
- "}"
- ],
- "show" : [
- " ( ) => {",
- " this.initInspector();;",
- "}"
- ]
- },
- "xtype" : "WebView",
- "| void initInspector" : [
- "() {",
- " ",
- " /* if (this.inspector == this.el.get_inspector()) {",
- " this.inspector.show();",
- " this.inspector.open_window(); ",
- " print(\"init inspecter called, and inspector is the same as existing\\n\");",
- " return;",
- " }",
- " print(\"new inspector?\\n\");",
- "*/",
- " this.inspector = this.el.get_inspector();",
- " this.inspector.ref();",
- " ",
- " // got a new inspector...",
- " ",
- " this.inspector.open_window.connect(() => {",
- " this.inspector = this.el.get_inspector();",
- " print(\"inspector attach\\n\");",
- " var wv = this.inspector.get_web_view();",
- " if (wv != null) {",
- " print(\"got inspector web view\\n\");",
- " ",
- " var cn = _this.inspectorcontainer.el.get_child();",
- " if (cn != null) {",
- " _this.inspectorcontainer.el.remove(cn);",
- " }",
- " ",
- " _this.inspectorcontainer.el.add(wv);",
- " wv.show();",
- " } else {",
- " //this.inspector.close();",
- " ",
- " //this.inspector = null;",
- " ",
- " ",
- " }",
- " return true;",
- " ",
- " });",
- " /*",
- " this.inspector.closed.connect(() => {",
- " print(\"inspector closed?!?\");",
- " // if this happens destroy the webkit..",
- " // recreate it..",
- " this.el.stop_loading();",
- " ",
- " if (_this.viewbox.el.get_parent() == null) {",
- " return;",
- " }",
- " ",
- " ",
- " _this.viewbox.el.remove(_this.viewcontainer.el);",
- " _this.el.remove(_this.inspectorcontainer.el); ",
- " ",
- " // destory seems to cause problems.",
- " //this.el.destroy();",
- " //_this.viewcontainer.el.destroy();",
- " //_this.inspectorcontainer.el.destroy();",
- "",
- " this.el = null; ",
- " var nv =new Xcls_viewcontainer(_this);",
- " nv.ref();",
- " _this.viewbox.el.pack_end(nv.el,true,true,0);",
- " ",
- " var inv =new Xcls_inspectorcontainer(_this);",
- " inv.ref();",
- " _this.el.pack2(inv.el,true,true);",
- " ",
- " inv.el.show_all();",
- " nv.el.show_all();",
- " //while(Gtk.events_pending ()) Gtk.main_iteration ();",
- " //_this.view.renderJS(true); ",
- " _this.view.refreshRequired = true;",
- " ",
- " }); ",
- " */",
- " ",
- " this.inspector.show();",
- "}",
- ""
- ],
- "| void reInit" : [
- "() {",
- " print(\"reInit?\");",
- " // if this happens destroy the webkit..",
- " // recreate it..",
- " this.el.stop_loading();",
- " ",
- " if (_this.viewbox.el.get_parent() == null) {",
- " return;",
- " }",
- " ",
- " ",
- " _this.viewbox.el.remove(_this.viewcontainer.el);",
- " _this.paned.el.remove(_this.inspectorcontainer.el); ",
- " ",
- " // destory seems to cause problems.",
- " //this.el.destroy();",
- " //_this.viewcontainer.el.destroy();",
- " //_this.inspectorcontainer.el.destroy();",
- " var inv =new Xcls_inspectorcontainer(_this);",
- " inv.ref();",
- " _this.paned.el.pack2(inv.el,true,true);",
- " ",
- " ",
- " this.el = null; ",
- " var nv =new Xcls_viewcontainer(_this);",
- " nv.ref();",
- " _this.viewbox.el.pack_end(nv.el,true,true,0);",
- " ",
- " ",
- " inv.el.show_all();",
- " nv.el.show_all();",
- " //while(Gtk.events_pending ()) Gtk.main_iteration ();",
- " //_this.view.renderJS(true); ",
- " _this.view.refreshRequired = true;",
- "}",
- ""
- ],
- "| void renderJS" : [
- "(bool force) {",
- "",
- " // this is the public redraw call..",
- " // we refresh in a loop privately..",
- " var autodraw = _this.AutoRedraw.el.active;",
- " if (!autodraw && !force) {",
- " print(\"Skipping redraw - no force, and autodraw off\");",
- " return;",
- " }",
- " ",
- " this.refreshRequired = true;",
- "}",
- ""
- ],
- "| void runRefresh" : [
- " () ",
- "{",
- " // this is run every 2 seconds from the init..",
- "",
- " ",
- " ",
- " if (!this.refreshRequired) {",
- " // print(\"no refresh required\");",
- " return;",
- " }",
- "",
- " if (this.lastRedraw != null) {",
- " // do not redraw if last redraw was less that 5 seconds ago.",
- " if ((int64)(new DateTime.now_local()).difference(this.lastRedraw) < 5000 ) {",
- " return;",
- " }",
- " }",
- " ",
- " if (_this.file == null) {",
- " return;",
- " }",
- " ",
- " ",
- " this.refreshRequired = false;",
- " // print(\"HTML RENDERING\");",
- " ",
- " ",
- " //this.get('/BottomPane').el.show();",
- " //this.get('/BottomPane').el.set_current_page(2);// webkit inspector",
- " _this.file.webkit_page_id = this.el.get_page_id();",
- " ",
- " var js = _this.file.toSourcePreview();",
- "",
- " if (js.length < 1) {",
- " print(\"no data\");",
- " return;",
- " }",
- "// var data = js[0];",
- " this.redraws++;",
- " ",
- " var project = _this.file.project; ",
- "",
- " //print (project.fn);",
- " // set it to non-empty.",
- " ",
- "// runhtml = runhtml.length ? runhtml : '<script type=\"text/javascript\"></script>'; ",
- "",
- "",
- "// this.runhtml = this.runhtml || '';",
- " ",
- " ",
- " // then we need to reload the browser using",
- " // load_html_string..",
- "",
- " // then trigger a redraw once it's loaded..",
- " this.pendingRedraw = true;",
- "",
- " var runhtml = \"<script type=\\\"text/javascript\\\">\\n\" ;",
- " string builderhtml;",
- " ",
- " try {",
- " GLib.FileUtils.get_contents(BuilderApplication.configDirectory() + \"/resources/roo.builder.js\", out builderhtml);",
- " } catch (Error e) {",
- " builderhtml = \"\";",
- " }",
- "",
- " runhtml += builderhtml + \"\\n\";",
- " runhtml += \"</script>\\n\" ;",
- "",
- " // fix to make sure they are the same..",
- " this.runhtml = project.runhtml;",
- " // need to modify paths",
- "",
- " string inhtml;",
- " var base_template = _this.file.project.base_template;",
- " ",
- " if (base_template.length > 0 && !FileUtils.test(",
- " BuilderApplication.configDirectory() + \"/resources/\" + base_template, FileTest.EXISTS) ",
- " ) {",
- " print(\"invalid base_template name - using default: %s\\n\", base_template);",
- " base_template = \"\";",
- " ",
- " }",
- " try {",
- " GLib.FileUtils.get_contents(",
- " BuilderApplication.configDirectory() + \"/resources/\" + ",
- " (base_template.length > 0 ? base_template : \"roo.builder.html\")",
- " , out inhtml);",
- " ",
- " } catch (Error e) {",
- " inhtml = \"\";",
- " } ",
- " this.renderedData = js;",
- "",
- "",
- " string js_src = js + \"\\n\" +",
- "\t\"Roo.onReady(function() {\\n\" +",
- "\t\"if (\" + _this.file.name +\".show) \" + _this.file.name +\".show({});\\n\" +",
- "\t\"Roo.XComponent.build();\\n\" +",
- "\t\"});\\n\";",
- "\t",
- " // print(\"render js: \" + js);",
- " //if (!this.ready) {",
- " // console.log('not loaded yet');",
- " //}",
- " this.lastRedraw = new DateTime.now_local();",
- "",
- "",
- " //this.runjs = js_src;",
- " var fc = FakeServerCache.factory_with_data(js_src);",
- " this.runjs = fc.fname;",
- " ",
- " var html = inhtml.replace(\"</head>\", runhtml + this.runhtml + ",
- " \"<script type=\\\"text/javascript\\\" src=\\\"xhttp://localhost\" + fc.fname + \"\\\"></script>\" + ",
- " // \"<script type=\\\"text/javascript\\\">\\n\" +",
- " // js_src + \"\\n\" + ",
- " // \"</script>\" + ",
- " ",
- " \"</head>\");",
- " //print(\"LOAD HTML \" + html);",
- " ",
- " var rootURL = _this.file.project.rootURL;",
- " ",
- " ",
- " ",
- " this.el.load_html( html , ",
- " //fixme - should be a config option!",
- " (rootURL.length > 0 ? rootURL : \"xhttp://localhost/roobuilder/\")",
- " );",
- " ",
- " // force the inspector... ",
- " // this.initInspector();",
- " ",
- " // - no need for this, the builder javascript will call it when build is complete",
- " //GLib.Timeout.add_seconds(1, () => {",
- " // this.el.run_javascript(\"Builder.saveHTML()\",null);",
- " // return false;",
- " //});",
- "// print( \"before render\" + this.lastRedraw);",
- "// print( \"after render\" + (new Date()));",
- " ",
- "}",
- " "
- ]
- }
+ "| void reInit" : [
+ "() {",
+ " print(\"reInit?\");",
+ " // if this happens destroy the webkit..",
+ " // recreate it..",
+ " this.el.stop_loading();",
+ " ",
+ " if (_this.viewbox.el.get_parent() == null) {",
+ " return;",
+ " }",
+ " ",
+ " /*",
+ " _this.viewbox.el.remove(_this.viewcontainer.el);",
+ " //_this.paned.el.remove(_this.inspectorcontainer.el); ",
+ " ",
+ " // destory seems to cause problems.",
+ " //this.el.destroy();",
+ " //_this.viewcontainer.el.destroy();",
+ " //_this.inspectorcontainer.el.destroy();",
+ " var inv =new Xcls_inspectorcontainer(_this);",
+ " ",
+ " _this.paned.el.set_end_child(inv.el);",
+ " _this.inspectorcontainer = inv;",
+ " ",
+ " this.el = null; ",
+ " var nv =new Xcls_viewcontainer(_this);",
+ " // nv.ref();",
+ " _this.viewbox.el.append(nv.el);",
+ " ",
+ " _this.viewcontainer = nv;",
+ " inv.el.show();",
+ " nv.el.show();",
+ " //while(Gtk.events_pending ()) Gtk.main_iteration ();",
+ " //_this.view.renderJS(true); ",
+ " _this.view.refreshRequired = true;",
+ " ",
+ " */",
+ "}",
+ ""
],
- "xtype" : "ScrolledWindow"
+ "| void renderJS" : [
+ "(bool force) {",
+ "",
+ " // this is the public redraw call..",
+ " // we refresh in a loop privately..",
+ " var autodraw = _this.AutoRedraw.el.active;",
+ " if (!autodraw && !force) {",
+ " print(\"Skipping redraw - no force, and autodraw off\");",
+ " return;",
+ " }",
+ " ",
+ " this.refreshRequired = true;",
+ " ",
+ "}",
+ ""
+ ],
+ "| void runRefresh" : [
+ "() ",
+ "{",
+ " // this is run every 2 seconds from the init..",
+ "",
+ " ",
+ " if (!this.refreshRequired) {",
+ " // print(\"no refresh required\");",
+ " return;",
+ " }",
+ "",
+ " if (this.lastRedraw != null) {",
+ " // do not redraw if last redraw was less that 5 seconds ago.",
+ " if ((int64)(new DateTime.now_local()).difference(this.lastRedraw) < 5000 ) {",
+ " return;",
+ " }",
+ " }",
+ " ",
+ " if (_this.file == null) {",
+ " return;",
+ " }",
+ " ",
+ " ",
+ " this.refreshRequired = false;",
+ " // print(\"HTML RENDERING\");",
+ " ",
+ " ",
+ " //this.get('/BottomPane').el.show();",
+ " //this.get('/BottomPane').el.set_current_page(2);// webkit inspector",
+ " _this.file.webkit_page_id = this.el.get_page_id();",
+ " ",
+ " var js = _this.file.toSourcePreview();",
+ "",
+ " if (js.length < 1) {",
+ " print(\"no data\");",
+ " return;",
+ " }",
+ "// var data = js[0];",
+ " this.redraws++;",
+ " ",
+ " var project = (Project.Roo) _this.file.project; ",
+ "",
+ " //print (project.fn);",
+ " // set it to non-empty.",
+ " ",
+ "// runhtml = runhtml.length ? runhtml : '<script type=\"text/javascript\"></script>'; ",
+ "",
+ "",
+ "// this.runhtml = this.runhtml || '';",
+ " ",
+ " ",
+ " // then we need to reload the browser using",
+ " // load_html_string..",
+ "",
+ " // then trigger a redraw once it's loaded..",
+ " this.pendingRedraw = true;",
+ "",
+ " var runhtml = \"<script type=\\\"text/javascript\\\">\\n\" ;",
+ " uint8[] builderhtml;",
+ " ",
+ " try {",
+ " GLib. File.new_for_uri(\"resource:///html/roo.builder.js\").load_contents(null, out builderhtml, null);",
+ " } catch (Error e) {",
+ " builderhtml = {};",
+ " }",
+ "",
+ " runhtml += (string) builderhtml + \"\\n\";",
+ " runhtml += \"</script>\\n\" ;",
+ "",
+ " // fix to make sure they are the same..",
+ " this.runhtml = project.runhtml;",
+ " // need to modify paths",
+ "",
+ " uint8[] inhtml;",
+ " var base_template = project.base_template;",
+ " var f = GLib. File.new_for_uri(\"resource:///html/\" + base_template);",
+ " ",
+ " if (base_template.length > 0 && !f.query_exists(null)) {",
+ " ",
+ " GLib.debug(\"invalid base_template name - using default: %s\", base_template);",
+ " f = GLib. File.new_for_uri(\"resource:///html/roo.builder.html\");",
+ " ",
+ " }",
+ " try {",
+ "\t f.load_contents(null, out inhtml, null);",
+ " ",
+ " ",
+ " } catch (Error e) {",
+ " inhtml = {};",
+ " } ",
+ " this.renderedData = js;",
+ "",
+ "",
+ " string js_src = js + \"",
+ "Roo.onReady(function() {",
+ "if (\" + _this.file.name +\".show) {",
+ "\t\t\" + _this.file.name +\".show({});",
+ "\t\t(function() { ",
+ "\t\t\tBuilder.saveHTML.defer(100, Builder);",
+ "\t\t}).defer(100);",
+ "}",
+ "Roo.XComponent.build();",
+ "});\\n\";",
+ "\t",
+ " // print(\"render js: \" + js);",
+ " //if (!this.ready) {",
+ " // console.log('not loaded yet');",
+ " //}",
+ " this.lastRedraw = new DateTime.now_local();",
+ "",
+ "",
+ " //this.runjs = js_src;",
+ " var fc = FakeServerCache.factory_with_data(js_src);",
+ " this.runjs = fc.fname;",
+ " var html = (string) inhtml;",
+ "\thtml = html.replace(\"</head>\", runhtml + this.runhtml + ",
+ " \"<script type=\\\"text/javascript\\\" src=\\\"xhttp://localhost\" + fc.fname + \"\\\"></script>\" + ",
+ " // \"<script type=\\\"text/javascript\\\">\\n\" +",
+ " // js_src + \"\\n\" + ",
+ " // \"</script>\" + ",
+ " ",
+ " \"</head>\");",
+ " //print(\"LOAD HTML \" + html);",
+ " ",
+ " var rootURL = project.rootURL;",
+ "",
+ " ",
+ " ",
+ " this.el.load_html( html , ",
+ " //fixme - should be a config option!",
+ " (rootURL.length > 0 ? rootURL : \"xhttp://localhost/roobuilder/\")",
+ " );",
+ " this.initInspector(); ",
+ " // force the inspector... ",
+ " // this.initInspector();",
+ " ",
+ " // - no need for this, the builder javascript will call it when build is complete",
+ " //GLib.Timeout.add_seconds(1, () => {",
+ " // this.el.run_javascript(\"Builder.saveHTML()\",null);",
+ " // return false;",
+ " //});",
+ "// print( \"before render\" + this.lastRedraw);",
+ "// print( \"after render\" + (new Date()));",
+ " ",
+ "}",
+ " "
+ ]
}
],
"xtype" : "Box"
},
{
- "$ shadow_type" : "Gtk.ShadowType.IN",
"$ xns" : "Gtk",
- "* init" : [
- " this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);",
- " ",
- ""
- ],
- "* pack" : "pack2,true,true",
+ "* pack" : "set_end_child",
+ "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+ "bool vexpand" : true,
"id" : "inspectorcontainer",
- "xtype" : "ScrolledWindow"
+ "xtype" : "Box"
}
],
"xtype" : "Paned"
"$ xns" : "Gtk",
"* pack" : "append_page,_this.label_code.el",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+ "bool vexpand" : true,
"int spacing" : 0,
"items" : [
{
"$ xns" : "Gtk",
"bool vexpand" : true,
+ "id" : "sourceviewscroll",
"items" : [
{
+ "# Gtk.CssProvider? css" : "null",
"# JsRender.Node? node_selected" : "null",
"# bool button_is_pressed" : false,
"# bool key_is_pressed" : false,
"# bool loading" : true,
+ "# id" : "sourceview",
"# int editable_start_pos" : "-1",
"# string prop_selected" : "\"\"",
- "$ xns" : "Gtk",
+ "$ xns" : "GtkSource",
"* init" : [
- "{",
- " ",
- " ",
- " var description = Pango.FontDescription.from_string(\"monospace\");",
- " description.set_size(8000);",
- " this.el.override_font(description);",
+ "\t{",
+ "",
+ "\t ",
+ "",
+ "\tthis.loading = true;",
+ "\t//var buf = this.el.get_buffer();",
+ "\t//buf.notify.connect(this.onCursorChanged);",
+ "",
+ "",
+ "\tvar attrs = new GtkSource.MarkAttributes();",
+ "\tattrs.set_icon_name ( \"process-stop\"); ",
+ "\tattrs.query_tooltip_text.connect(( mark) => {",
+ "\t\t//print(\"tooltip query? %s\\n\", mark.name);",
+ "\t\treturn mark.name;",
+ "\t});",
+ "",
+ "\tthis.el.set_mark_attributes (\"ERR\", attrs, 1);",
+ "",
+ "\t var wattrs = new GtkSource.MarkAttributes();",
+ "\twattrs.set_icon_name ( \"process-stop\"); ",
+ "\twattrs.query_tooltip_text.connect(( mark) => {",
+ "\t\t//print(\"tooltip query? %s\\n\", mark.name);",
+ "\t\treturn mark.name;",
+ "\t});",
+ "",
+ "\tthis.el.set_mark_attributes (\"WARN\", wattrs, 1);",
+ "",
+ "",
+ "",
+ "\t var dattrs = new GtkSource.MarkAttributes();",
+ "\tdattrs.set_icon_name ( \"process-stop\"); ",
+ "\tdattrs.query_tooltip_text.connect(( mark) => {",
+ "\t\t//print(\"tooltip query? %s\\n\", mark.name);",
+ "\t\treturn mark.name;",
+ "\t});",
+ "",
+ "\tthis.el.set_mark_attributes (\"DEPR\", dattrs, 1);",
+ "",
+ "",
+ "\tvar gattrs = new GtkSource.MarkAttributes();",
+ "\tvar grey = Gdk.RGBA();",
+ "\tgrey.parse ( \"#ccc\");",
+ "\tgattrs.set_background ( grey);",
+ "",
+ "",
+ "\tthis.el.set_mark_attributes (\"grey\", gattrs, 1);",
+ "",
"",
- " this.loading = true;",
- " //var buf = this.el.get_buffer();",
- " //buf.notify.connect(this.onCursorChanged);",
- " ",
- " ",
- " 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);",
- " ",
- " ",
- " ",
- " 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);",
- " ",
- " ",
- " var gattrs = new Gtk.SourceMarkAttributes();",
- " var grey = Gdk.RGBA();",
- " grey.parse ( \"#ccc\");",
- " gattrs.set_background ( grey);",
" ",
- " ",
- " this.el.set_mark_attributes (\"grey\", gattrs, 1);",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- "}",
- " "
+ "",
+ "",
+ "\t}",
+ ""
],
- "* pack" : "add",
- "gboolean editable" : false,
- "gboolean show_line_marks" : true,
- "gboolean show_line_numbers" : true,
- "id" : "sourceview",
+ "* pack" : "set_child",
+ "bool editable" : false,
+ "bool show_line_marks" : true,
+ "bool show_line_numbers" : true,
+ "css_classes" : "{ \"code-editor\" }",
"items" : [
{
- "$ xns" : "Gtk",
+ "$ xns" : "GtkSource",
+ "* init" : [
+ "{",
+ "\tvar buf = this.el;",
+ "\tbuf.create_tag (\"bold\", \"weight\", Pango.Weight.BOLD);",
+ "\tbuf.create_tag (\"type\", \"weight\", Pango.Weight.BOLD, \"foreground\", \"#204a87\");",
+ "\tbuf.create_tag (\"keyword\", \"weight\", Pango.Weight.BOLD, \"foreground\", \"#a40000\");",
+ "\tbuf.create_tag (\"text\", \"weight\", Pango.Weight.NORMAL, \"foreground\", \"#729fcf\");",
+ "\tbuf.create_tag (\"number\", \"weight\", Pango.Weight.BOLD, \"foreground\", \"#ad7fa8\");",
+ "\tbuf.create_tag (\"method\", \"weight\", Pango.Weight.BOLD, \"foreground\", \"#729fcf\");",
+ "\tbuf.create_tag (\"property\", \"weight\", Pango.Weight.BOLD, \"foreground\", \"#BC1F51\");",
+ "\tbuf.create_tag (\"variable\", \"weight\", Pango.Weight.BOLD, \"foreground\", \"#A518B5\");",
+ "",
+ "",
+ "\tbuf.create_tag (\"ERR\", \"weight\", Pango.Weight.BOLD, \"background\", \"pink\");",
+ "\tbuf.create_tag (\"WARN\", \"weight\", Pango.Weight.BOLD, \"background\", \"#ABF4EB\");",
+ "\tbuf.create_tag (\"DEPR\", \"weight\", Pango.Weight.BOLD, \"background\", \"#EEA9FF\");",
+ "}",
+ "",
+ ""
+ ],
"* pack" : "set_buffer",
"bool dirty" : false,
+ "bool in_cursor_change" : false,
"id" : "buffer",
"int error_line" : "-1",
+ "int last_line" : "-1",
"listeners" : {
"changed" : [
" () => {",
- " ",
- "",
+ " ",
" // check syntax??",
" // ??needed..??",
" // _this.save_button.el.sensitive = true;",
" print(\"- PREVIEW EDITOR CHANGED--\");",
"",
" this.dirty = true; ",
- " this.checkSyntax(); // this calls backs and highlights errors.. in theory... ",
+ " // this.checkSyntax(); // this calls backs and highlights errors.. in theory... ",
"",
"",
"",
"\t",
"\tif (_this.sourceview.editable_start_pos > -1) {",
"\t\t",
- "\t\tvar buf = (Gtk.SourceBuffer)_this.sourceview.el.get_buffer();",
+ "\t\tvar buf = (GtkSource.Buffer)_this.sourceview.el.get_buffer();",
"\t\t",
" //print(\"cursor changed : %d\\n\", buf.cursor_position);",
" Gtk.TextIter spos,epos;",
"",
" ",
""
+ ],
+ "cursor_moved" : [
+ "( ) => {",
+ "GLib.debug(\"cursor moved called\");",
+ "",
+ "",
+ " \tif (this.in_cursor_change ) {",
+ " GLib.debug(\"cursor changed : %d [ignoring nested call)\", this.el.cursor_position);",
+ " return;",
+ " }",
+ " ",
+ " GLib.debug(\"cursor changed : %d\", this.el.cursor_position);",
+ " Gtk.TextIter cpos;",
+ " this.el.get_iter_at_offset(out cpos, this.el.cursor_position);",
+ " ",
+ " var ln = cpos.get_line();",
+ " if (this.last_line == ln ){",
+ " \treturn;",
+ "\t}",
+ "\tthis.last_line = ln;",
+ " var node = _this.file.lineToNode(ln);",
+ "",
+ " if (node == null) {",
+ " print(\"can not find node\\n\");",
+ " return;",
+ " }",
+ " this.in_cursor_change = true;",
+ " var ltree = _this.main_window.windowstate.left_tree;",
+ " ltree.model.selectNode(node);",
+ " this.in_cursor_change = false;",
+ "}",
+ ""
]
},
- "xtype" : "SourceBuffer",
- "| bool checkSyntax" : [
- " () {",
- " ",
- " ",
- " var str = this.toString();",
- " ",
- " // needed???",
- " if (this.error_line > 0) {",
- " Gtk.TextIter start;",
- " Gtk.TextIter end; ",
- " this.el.get_bounds (out start, out end);",
- "",
- " this.el.remove_source_marks (start, end, \"WARN\");",
- " this.el.remove_source_marks (start, end, \"ERR\"); ",
- "",
- " }",
- " ",
- " if (str.length < 1) {",
- " print(\"checkSyntax - empty string?\\n\");",
- " return false;",
- " }",
- " ",
- " if (_this.file == null) {",
- " return false;",
- " }",
- " var p = _this.file.project.palete;",
- " ",
- " ",
- " if (_this.file.language != \"js\") {",
- "\t\treturn false; // fake syntax error.",
- "\t}",
- "\t",
- " //Gee.HashMap<int,string> ret_x;",
- "",
- "\treturn p.javascriptHasErrors(",
- "\t\t_this.main_window.windowstate,",
- " str, ",
- " null, // prop - not relivant.",
- " _this.file, ",
- " null",
- " ); ",
- " ",
- "}",
- ""
- ],
- "| bool highlightErrors" : [
- "( Gee.HashMap<int,string> validate_res) {",
- " ",
- " this.error_line = validate_res.size;",
- "\t",
- " 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;",
- "}"
- ],
+ "xtype" : "Buffer",
"| string toString" : [
" () {",
" ",
"}",
" "
]
+ },
+ {
+ "$ xns" : "Gtk",
+ "* pack" : "add_controller",
+ "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 false;",
+ "\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 false ;",
+ "\t}",
+ " ",
+ "\t//this.button_is_pressed = true;",
+ "\t//return false;",
+ " // print(event.key.keyval)",
+ " ",
+ " return false;",
+ " ",
+ " ",
+ "}",
+ ""
+ ]
+ },
+ "xtype" : "EventControllerKey"
}
],
"listeners" : {
- "button_press_event" : [
- "( ) => {",
- " ",
- "\tthis.button_is_pressed = true;",
- "\treturn false;",
- "}\t ",
- ""
- ],
- "button_release_event" : [
- "() => {",
- "",
- "\tprint(\"BUTTON RELEASE EVENT\\n\");",
- "\tthis.onCursorChanged();",
- "\tthis.button_is_pressed = false;",
- "\treturn false;",
- "}"
- ],
- "key_press_event" : [
- " (event) => {",
+ "query_tooltip" : [
+ "(x, y, keyboard_tooltip, tooltip) => {",
"\t",
- "\tif (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//GLib.debug(\"query tooltip\");",
+ "\tGtk.TextIter iter;",
+ "\tint trailing;",
+ "\t",
+ "\tvar yoff = (int) _this.sourceviewscroll.el.vadjustment.value;",
+ "\t",
+ "\tthis.el.get_iter_at_position (out iter, out trailing, x, y + yoff);",
+ "\t ",
+ "\tvar l = iter.get_line();",
+ "\t//GLib.debug(\"query tooltip line %d\", (int) l);",
+ "\tvar marks = _this.buffer.el.get_source_marks_at_line(l, null);",
+ "\t//GLib.debug(\"query tooltip line marks %d\", (int) marks.length());",
+ "\tvar str = \"\";",
+ "\tmarks.@foreach((m) => { ",
+ "\t\t//GLib.debug(\"got mark %s\", m.name);",
+ "\t\tstr += (str.length > 0 ? \"\\n\" : \"\") + m.name;",
+ "\t});",
+ "\t// true if there is a mark..",
+ "\tif (str.length > 0 ) {",
+ "\t\t\ttooltip.set_text( str);",
"\t}",
- " ",
- "\tthis.button_is_pressed = true;",
- "\treturn false;",
- "}\t ",
- " "
- ],
- "key_release_event" : [
- "() => { ",
- "\tthis.key_is_pressed = false;",
- "\treturn false;",
- "}",
- ""
+ "\treturn str.length > 0 ? true : false;",
+ "",
+ "}"
]
},
- "xtype" : "SourceView",
+ "string name" : "roo-view",
+ "xtype" : "View",
"| string toString" : [
"() {",
" Gtk.TextIter s;",
"| void clearGreySelection" : [
"() {",
" // clear all the marks..",
- " var sbuf = (Gtk.SourceBuffer)this.el.buffer;",
+ " var sbuf = (GtkSource.Buffer)this.el.buffer;",
" ",
" Gtk.TextIter start;",
" Gtk.TextIter end; ",
"}",
""
],
- "| void highlightErrorsJson" : [
- " (string type, Json.Object obj) {",
- " // this is a hook for the vala code - it has no value in javascript ",
- " // as we only have one error ususally....",
- " return ;",
- " ",
- " ",
- "",
- "",
- "}"
- ],
"| void loadFile" : [
"( ) {",
" this.loading = true;",
" ",
" ",
" buf.set_text(\"\",0);",
- " var sbuf = (Gtk.SourceBuffer) buf;",
+ " ",
"",
" ",
"",
" ",
"// print(\"setting str %d\\n\", str.length);",
" buf.set_text(str, str.length);",
- " var lm = Gtk.SourceLanguageManager.get_default();",
+ " var lm = GtkSource.LanguageManager.get_default();",
" ",
" //?? is javascript going to work as js?",
" ",
- " ((Gtk.SourceBuffer)(buf)) .set_language(lm.get_language(_this.file.language));",
+ " ((GtkSource.Buffer)(buf)) .set_language(lm.get_language(_this.file.language));",
" ",
" ",
- " Gtk.TextIter start;",
- " Gtk.TextIter end; ",
- " ",
- " sbuf.get_bounds (out start, out end);",
- " sbuf.remove_source_marks (start, end, null); // remove all marks..",
+ " _this.main_window.windowstate.updateErrorMarksAll();",
" ",
+ " // restore the cursor position?",
+ " // after reloading the contents.",
" GLib.Timeout.add(500, () => {",
- "",
+ "\t\t_this.buffer.in_cursor_change = true;",
" print(\"RESORTING cursor to = %d\\n\", cpos);",
"\t\tGtk.TextIter cpos_iter;",
"\t\tbuf.get_iter_at_offset(out cpos_iter, cpos);",
"\t\tbuf.place_cursor(cpos_iter); ",
"\t\t",
"\t\tthis.el.get_vadjustment().set_value(vadj_pos);;",
- "\t\t",
- "",
- "\t\tthis.onCursorChanged();",
+ "\t\t_this.buffer.in_cursor_change = false;",
+ " ",
"\t\t",
"\t\t",
- "\t\t_this.buffer.checkSyntax();",
+ "\t\t//_this.buffer.checkSyntax();",
"\t\treturn false;",
"\t});",
"\t\t",
""
],
"| void nodeSelected" : [
- "(JsRender.Node? sel, bool scroll ) {",
+ "(JsRender.Node? sel, bool scroll) {",
" ",
" ",
- "\t",
+ " if (this.loading) {",
+ " \treturn;",
+ "\t}",
" // this is connected in widnowstate",
+ " print(\"Roo-view - node selected\\n\");",
+ " var buf = this.el.get_buffer();",
+ " ",
+ " var sbuf = (GtkSource.Buffer) buf;",
"",
- "",
- "\t// not sure why.... ",
- " while(Gtk.events_pending()) {",
- " Gtk.main_iteration();",
+ " ",
+ " ",
+ " ",
+ " // clear all the marks..",
+ " Gtk.TextIter start;",
+ " Gtk.TextIter end; ",
+ " ",
+ " sbuf.get_bounds (out start, out end);",
+ " sbuf.remove_source_marks (start, end, \"grey\");",
+ " ",
+ " this.node_selected = sel;",
+ " if (sel == null) {",
+ " // no highlighting..",
+ " return;",
" }",
+ " Gtk.TextIter iter; ",
+ " sbuf.get_iter_at_line(out iter, sel.line_start);",
" ",
- " this.node_selected = sel;",
" ",
- " // this.updateGreySelection(scroll);",
+ " Gtk.TextIter cur_iter;",
+ " sbuf.get_iter_at_offset(out cur_iter, sbuf.cursor_position);",
" ",
+ " //var cur_line = cur_iter.get_line();",
+ " //if (cur_line > sel.line_start && cur_line < sel.line_end) {",
" ",
+ " //} else {",
+ " if (! _this.buffer.in_cursor_change) {",
+ " \tthis.el.scroll_to_iter(iter, 0.1f, true, 0.0f, 0.5f);",
+ "\t}",
" ",
- "}",
- "",
- " ",
- ""
- ],
- "| void onCursorChanged" : [
- "(/*ParamSpec ps*/) {",
- "",
- "\t\tif (!this.key_is_pressed && !this.button_is_pressed) {",
- "\t\t\treturn;",
- "\t\t}",
- "",
- "\t if (this.loading) {",
- " return;",
- " }",
- " // if (ps.name != \"cursor-position\") {",
- " // return;",
- " // }",
- "",
- " var buf = this.el.get_buffer();",
- " //print(\"cursor changed : %d\\n\", buf.cursor_position);",
- " Gtk.TextIter cpos;",
- " buf.get_iter_at_offset(out cpos, buf.cursor_position);",
- " ",
- " var ln = cpos.get_line();",
- " ",
- " ",
- " // --- select node at line....",
- " ",
- " var node = _this.file.lineToNode(ln+1);",
- " ",
- " if (node == null) {",
- " print(\"can not find node\\n\");",
- " return;",
- " }",
- " var prop = node.lineToProp(ln+1);",
- " print(\"prop : %s\", prop == null ? \"???\" : prop);",
- " ",
- " ",
- " // ---------- this selects the tree's node...",
- " ",
- " var ltree = _this.main_window.windowstate.left_tree;",
- " var tp = ltree.model.treePathFromNode(node);",
- " print(\"got tree path %s\\n\", tp);",
- " if (tp != \"\") {",
- "\t ",
- "\t ",
- "\t //print(\"changing cursor on tree..\\n\");",
- "\t ",
- " ",
- " ",
- " // let's try allowing editing on the methods.",
- " // a little klunky at present..",
- " this.prop_selected = \"\";",
- " if (prop != null) {",
- " \t\t//see if we can find it..",
- " \t\tvar kv = prop.split(\":\");",
- " \t\tif (kv[0] == \"p\") {",
- " \t\t",
- "\t \t\t//var k = prop.get_key(kv[1]);",
- "\t \t\t// fixme -- need to determine if it's an editable property...",
- "\t \t\tthis.prop_selected = prop;",
- "\t \t\t",
- " \t\t} else if (kv[0] == \"l\") {",
- " \t\t\t this.prop_selected = prop;",
- " \t\t\t",
- " \t\t}",
- " }",
- " ltree.view.setCursor(tp, \"editor\");",
- " // ltree.view.el.set_cursor(new Gtk.TreePath.from_string(tp), null, false); ",
- " //this.nodeSelected(node,false);",
+ " ",
+ " ",
+ " for (var i = 0; i < buf.get_line_count();i++) {",
+ " if (i < sel.line_start || i > sel.line_end) {",
+ " ",
+ " sbuf.get_iter_at_line(out iter, i);",
+ " sbuf.create_source_mark(null, \"grey\", iter);",
" ",
- " // scrolling is disabled... as node selection calls scroll 10ms after it changes.",
- " ",
" }",
- " ",
- " // highlight the node..",
+ " ",
+ " }",
+ " ",
+ "",
"}",
- " "
+ ""
],
"| void updateGreySelection" : [
"(bool scroll) { ",
"\tvar sel = this.node_selected;",
"\tprint(\"node selected\\n\");",
" var buf = this.el.get_buffer();",
- " var sbuf = (Gtk.SourceBuffer) buf;",
+ " var sbuf = (GtkSource.Buffer) buf;",
"",
" ",
" this.clearGreySelection();",
"items" : [
{
"$ xns" : "Gtk",
- "* init" : [
- "var description = Pango.FontDescription.from_string(\"monospace\");",
- "\tdescription.set_size(8000);",
- "\t this.el.override_font(description);",
- "",
- ""
- ],
"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) {",
+ "\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\tvar res = _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" : "roo-search-entry",
"string placeholder_text" : "Press enter to search",
"xtype" : "SearchEntry",
"| void forwardSearch" : [
},
{
"$ 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" : "ImageMenuItem",
- "| 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"
},
{
"items" : [
{
"$ xns" : "Gtk",
- "* prop" : "image",
- "string icon_name" : "emblem-system",
- "xtype" : "Image"
- },
- {
- "$ xns" : "Gtk",
- "* prop" : "popup",
+ "* pack" : false,
+ "* prop" : "popover",
"id" : "search_settings",
"items" : [
{
"$ 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",
+ "* init" : [
+ "{",
+ "\tthis.el.show();",
+ "}",
+ ""
+ ],
+ "id" : "multiline",
+ "string label" : "Multi-line (add \\n)",
+ "xtype" : "CheckButton"
+ }
],
- "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();",
- "}",
- ""
- ],
- "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"
}
],
"\t",
" ",
" ",
- "\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",
"\ts.set_search_text(txt);",
"\tGtk.TextIter beg, st,en;",
- "\t ",
+ "\tbool has_wrapped_around;",
"\tthis.buffer.el.get_start_iter(out beg);",
- "\tthis.searchcontext.forward(beg, out st, out en);",
+ "\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)) {",
+ "\tif (!this.searchcontext.backward(beg, out st, out en, out has_wrapped_around)) {",
"\t",
"\t\tthis.last_search_end = 0;",
"\t\treturn;",
" if (this.file == null) {",
" return;",
" }",
+ " ",
"\tif (this.notebook.el.page > 0 ) {",
" return;",
" }",
" ",
- " var filename = this.file.getIconFileName(false);",
- " ",
- " var win = this.el.get_parent_window();",
- " var width = win.get_width();",
- " // var height = win.get_height();",
- " try { ",
- " Gdk.Pixbuf screenshot = Gdk.pixbuf_get_from_window(win, 0, 0, width, this.paned.el.position);",
- " screenshot.save(filename,\"png\");",
- " } catch(Error e) {",
- " //noop",
- " }",
+ " \tthis.file.widgetToIcon(this.view.el); ",
"",
" ",
" ",
"\t\treturn;",
"\t}",
"\tthis.notebook.el.page = 1;",
- "\tGtk.TextIter beg, st,en, stl;",
- "\t",
+ "\tGtk.TextIter beg, st,en;",
+ "\tbool has_wrapped_around;",
"\tvar buf = this.sourceview.el.get_buffer();",
"\tbuf.get_iter_at_offset(out beg, this.last_search_end);",
- "\tif (!this.searchcontext.forward(beg, out st, out en)) {",
+ "\tif (!this.searchcontext.forward(beg, out st, out en, out has_wrapped_around)) {",
"\t\tthis.last_search_end = 0;",
"\t\treturn;",
"\t}",
" return;",
" }",
" var prop = node.lineToProp(ln+1);",
- " print(\"prop : %s\", prop == null ? \"???\" : prop);",
+ " print(\"prop : %s\", prop == null ? \"???\" : prop.name);",
" ",
" ",
" // ---------- this selects the tree's node...",
" ",
" var ltree = _this.main_window.windowstate.left_tree;",
- " var tp = ltree.model.treePathFromNode(node);",
- " print(\"got tree path %s\\n\", tp);",
- " if (tp == \"\") {",
- "\t\treturn;",
- "\t}",
+ " ltree.model.selectNode(node);",
+ " ",
" //_this.sourceview.allow_node_scroll = false; /// block node scrolling..",
"\t ",
" ",
" // let's try allowing editing on the methods.",
" // a little klunky at present..",
"\t_this.sourceview.prop_selected = \"\";",
+ "\t/*",
" if (prop != null) {",
"\t\t//see if we can find it..",
"\t\tvar kv = prop.split(\":\");",
"\t\t\t",
"\t\t}",
" }",
- " ltree.view.setCursor(tp, \"editor\");",
+ " */",
" // ltree.view.el.set_cursor(new Gtk.TreePath.from_string(tp), null, false); ",
" _this.sourceview.nodeSelected(node,false);",
" ",
" this.view.renderJS(true);",
" this.notebook.el.page = 0;// gtk preview ",
" this.sourceview.loadFile(); ",
- " ",
+ " this.last_error_counter = -1;",
+ " this.updateErrorMarks();",
"}",
" ",
" "
],
"| void scroll_to_line" : [
"(int line) {",
- " this.notebook.el.page = 1;// code preview...",
- " ",
- " GLib.Timeout.add(500, () => {",
+ " // code preview...",
" ",
+ " GLib.Timeout.add(100, () => {",
" ",
+ "\t\tthis.notebook.el.set_current_page( 1 );",
"\t ",
"\t ",
"\t\t var buf = this.sourceview.el.get_buffer();",
"\t ",
- "\t\tvar sbuf = (Gtk.SourceBuffer) buf;",
+ "\t\tvar sbuf = (GtkSource.Buffer) buf;",
"",
"",
"\t\tGtk.TextIter iter; ",
" ",
"}",
""
+ ],
+ "| void updateErrorMarks" : [
+ "() {",
+ "\t",
+ " ",
+ "",
+ "\tvar buf = _this.buffer.el;",
+ "\tGtk.TextIter start;",
+ "\tGtk.TextIter end; ",
+ "\tbuf.get_bounds (out start, out end);",
+ "",
+ "",
+ " ",
+ "\tGLib.debug(\"highlight errors\");\t\t ",
+ "",
+ "\t // we should highlight other types of errors..",
+ "",
+ " ",
+ "",
+ "\t ",
+ "\tif (_this.file == null) {",
+ "\t\tGLib.debug(\"file is null?\");",
+ "\t\treturn;",
+ "",
+ "\t}",
+ "\tvar ar = this.file.getErrors();",
+ "\tif (ar.size < 1) {",
+ "\t\tbuf.remove_tag_by_name (\"ERR\", start, end);",
+ "\t\tbuf.remove_tag_by_name (\"WARN\", start, end);",
+ "\t\tbuf.remove_tag_by_name (\"DEPR\", start, end);",
+ "\t\tbuf.remove_source_marks (start, end, \"ERR\");",
+ "\t\tbuf.remove_source_marks (start, end, \"WARN\");",
+ "\t\tbuf.remove_source_marks (start, end, \"DEPR\");",
+ "\t\tthis.last_error_counter = file.error_counter ;",
+ "\t\tGLib.debug(\"higjlight has no errors\");",
+ "\t\treturn;",
+ "\t}",
+ " \tif (this.last_error_counter == file.error_counter) {",
+ "\t\treturn;",
+ "\t}",
+ "",
+ "\tvar tlines = buf.get_line_count () +1;",
+ "\t",
+ " ",
+ "\t ",
+ "\tbuf.remove_source_marks (start, end, \"ERR\");",
+ "\tbuf.remove_source_marks (start, end, \"WARN\");",
+ "\tbuf.remove_source_marks (start, end, \"DEPR\");",
+ "\tbuf.remove_tag_by_name (\"ERR\", start, end);",
+ "\tbuf.remove_tag_by_name (\"WARN\", start, end);",
+ "\tbuf.remove_tag_by_name (\"DEPR\", start, end);",
+ "\tforeach(var diag in ar) { ",
+ "\t",
+ "\t\t",
+ "\t Gtk.TextIter iter;",
+ "// print(\"get inter\\n\");",
+ "\t var eline = (int)diag.range.start.line ;",
+ "\t var eline_to = (int)diag.range.end.line;",
+ "\t if (eline > tlines || eline < 0) {",
+ "\t return;",
+ "\t }",
+ "\t ",
+ "\t ",
+ "\t buf.get_iter_at_line( out iter, eline);",
+ "\t ",
+ "\t \t buf.get_iter_at_line_offset( out start, ",
+ " \t \teline, (int)diag.range.start.character); ",
+ " \t buf.get_iter_at_line_offset( out end, ",
+ " \t \teline_to, (int)diag.range.end.character); ",
+ " \t \t",
+ "\t buf.apply_tag_by_name(diag.category, start, end);",
+ "\t ",
+ "\t ",
+ "\t\tvar msg = \"Line: %d %s : %s\".printf(eline+1, diag.category, diag.message);",
+ "\t buf.create_source_mark( msg, diag.category, iter);",
+ "\t GLib.debug(\"set line %d to %s\", eline, msg);",
+ "\t //this.marks.set(eline, msg);",
+ "\t}",
+ "\tthis.last_error_counter = file.error_counter ;",
+ "",
+ "",
+ "",
+ " ",
+ "",
+ "}"
]
}
],
- "modOrder" : "",
- "name" : "WindowRooView",
- "parent" : "",
- "path" : "/home/alan/gitlive/roobuilder/src/Builder4/WindowRooView.bjs",
- "permname" : "",
- "title" : ""
+ "name" : "WindowRooView"
}
\ No newline at end of file
projects / roobuilder / blobdiff