From: Alan Knowles Date: Thu, 28 May 2015 07:27:02 +0000 (+0800) Subject: src/Builder4/About.vala.c X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=c59bdc2b62d7a7578bc66b69a46e8de3b689bd81 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/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/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/Editor.bjs b/src/Builder4/Editor.bjs index b52764e7a..fcd47ef38 100644 --- a/src/Builder4/Editor.bjs +++ b/src/Builder4/Editor.bjs @@ -68,7 +68,7 @@ "id" : "view", "* init" : " \n var description = Pango.FontDescription.from_string(\"monospace\");\n description.set_size(8000);\n this.el.override_font(description);\n\n\n \n var attrs = new Gtk.SourceMarkAttributes();\n var pink = Gdk.RGBA();\n pink.parse ( \"pink\");\n attrs.set_background ( pink);\n attrs.set_icon_name ( \"process-stop\"); \n attrs.query_tooltip_text.connect(( mark) => {\n //print(\"tooltip query? %s\\n\", mark.name);\n return mark.name;\n });\n \n this.el.set_mark_attributes (\"ERR\", attrs, 1);\n \n var wattrs = new Gtk.SourceMarkAttributes();\n var blue = Gdk.RGBA();\n blue.parse ( \"#ABF4EB\");\n wattrs.set_background ( blue);\n wattrs.set_icon_name ( \"process-stop\"); \n wattrs.query_tooltip_text.connect(( mark) => {\n //print(\"tooltip query? %s\\n\", mark.name);\n return mark.name;\n });\n \n this.el.set_mark_attributes (\"WARN\", wattrs, 1);\n \n \n \n var dattrs = new Gtk.SourceMarkAttributes();\n var purple = Gdk.RGBA();\n purple.parse ( \"#EEA9FF\");\n dattrs.set_background ( purple);\n dattrs.set_icon_name ( \"process-stop\"); \n dattrs.query_tooltip_text.connect(( mark) => {\n //print(\"tooltip query? %s\\n\", mark.name);\n return mark.name;\n });\n \n this.el.set_mark_attributes (\"DEPR\", dattrs, 1);\n \n ", "uint tab_width" : 4, - "$ Gtk.SourceDrawSpacesFlags draw_spaces" : "Gtk.SourceDrawSpacesFlags.LEADING + Gtk.SourceDrawSpacesFlags.TAB + Gtk.SourceDrawSpacesFlags.SPACE", + "$ Gtk.SourceDrawSpacesFlags draw_spaces" : "Gtk.SourceDrawSpacesFlags.LEADING + Gtk.SourceDrawSpacesFlags.TRAILING + Gtk.SourceDrawSpacesFlags.TAB + Gtk.SourceDrawSpacesFlags.SPACE", "* pack" : "add", "xtype" : "SourceView", "gboolean highlight_current_line" : true, diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index 7d0d6351e..2a1235cf1 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -263,7 +263,7 @@ public class Editor : Object this.el.show_line_marks = true; this.el.insert_spaces_instead_of_tabs = true; this.el.show_line_numbers = true; - this.el.draw_spaces = Gtk.SourceDrawSpacesFlags.LEADING + Gtk.SourceDrawSpacesFlags.TAB + Gtk.SourceDrawSpacesFlags.SPACE; + this.el.draw_spaces = Gtk.SourceDrawSpacesFlags.LEADING + Gtk.SourceDrawSpacesFlags.TRAILING + Gtk.SourceDrawSpacesFlags.TAB + Gtk.SourceDrawSpacesFlags.SPACE; this.el.tab_width = 4; this.el.highlight_current_line = true; var child_0 = new Xcls_buffer( _this ); diff --git a/src/Palete/ValaSource.vala b/src/Palete/ValaSource.vala index 343afede8..33d6be36f 100644 --- a/src/Palete/ValaSource.vala +++ b/src/Palete/ValaSource.vala @@ -200,7 +200,7 @@ namespace Palete { { // race condition.. if (this.compiler != null) { - return; + return false; } var pr = (Project.Gtk)(file.project); @@ -213,7 +213,7 @@ namespace Palete { if (path == file.path) { foundit = true; break; - } + } } if (!foundit) {