From: Alan Knowles <alan@roojs.com>
Date: Thu, 28 May 2015 06:35:56 +0000 (+0800)
Subject: src/Builder4/Editor.bjs
X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=45d1ea2a523d13fff8769340c7c38e9bbc4e7cef

src/Builder4/Editor.bjs
src/Builder4/Editor.vala
---

diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs
index e9f3da6b5..188de258a 100644
--- a/src/Builder4/Editor.bjs
+++ b/src/Builder4/Editor.bjs
@@ -66,14 +66,15 @@
        },
        "gboolean show_line_marks" : true,
        "id" : "view",
-       "Gtk.SourceDrawSpacesFlags draw_spaces" : "Gtk.SourceDrawSpacesFlags.LEADING",
+       "Gtk.SourceDrawSpacesFlags draw_spaces" : "Gtk.SourceDrawSpacesFlags.ALL",
        "* 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,
        "* pack" : "add",
        "xtype" : "SourceView",
        "gboolean highlight_current_line" : true,
        "$ gboolean auto_indent" : true,
        "$ xns" : "Gtk",
-       "|   void load" : " (string str) {\n\n// show the help page for the active node..\n   //this.get('/Help').show();\n\n\n  // this.get('/BottomPane').el.set_current_page(0);\n    var buf = (Gtk.SourceBuffer)this.el.get_buffer();\n    buf.set_text(str, str.length);\n    buf.set_undo_manager(null);\n    \n    var lm = Gtk.SourceLanguageManager.get_default();\n    var lang = \"vala\";\n    if (_this.file != null) {\n         lang = _this.file.language;\n    }\n    print(\"lang=%s, content_type = %s\\n\", lang, _this.file.content_type);\n    var lg = _this.file.content_type.length > 0  ?\n            lm.guess_language(_this.file.path, _this.file.content_type) :\n            lm.get_language(lang);\n    \n   \n   \n    ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); \n\n    this.el.insert_spaces_instead_of_tabs = true;\n    if (lg.name == \"vala\") {\n        this.el.insert_spaces_instead_of_tabs = false;\n    }\n     \n    _this.dirty = false;\n    this.el.grab_focus();\n    _this.save_button.el.sensitive = false;\n}",
+       "|   void load" : " (string str) {\n\n// show the help page for the active node..\n   //this.get('/Help').show();\n\n\n  // this.get('/BottomPane').el.set_current_page(0);\n    var buf = (Gtk.SourceBuffer)this.el.get_buffer();\n    buf.set_text(str, str.length);\n    buf.set_undo_manager(null);\n    \n    var lm = Gtk.SourceLanguageManager.get_default();\n    var lang = \"vala\";\n    if (_this.file != null) {\n         lang = _this.file.language;\n    }\n    print(\"lang=%s, content_type = %s\\n\", lang, _this.file.content_type);\n    var lg = _this.file.content_type.length > 0  ?\n            lm.guess_language(_this.file.path, _this.file.content_type) :\n            lm.get_language(lang);\n    \n   \n   \n    ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); \n\n    this.el.insert_spaces_instead_of_tabs = true;\n    \n    print(\"sourcelanguage  = %s\\n\", lg.name);\n    if (lg.name == \"Vala\") {\n        this.el.insert_spaces_instead_of_tabs = false;\n    }\n     \n    _this.dirty = false;\n    this.el.grab_focus();\n    _this.save_button.el.sensitive = false;\n}",
        "bool insert_spaces_instead_of_tabs" : true,
        "indent_width" : 4,
        "$ show_line_numbers" : true,
diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala
index 9394266e3..df632c509 100644
--- a/src/Builder4/Editor.vala
+++ b/src/Builder4/Editor.vala
@@ -263,7 +263,8 @@ 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;
+            this.el.draw_spaces = Gtk.SourceDrawSpacesFlags.ALL;
+            this.el.tab_width = 4;
             this.el.highlight_current_line = true;
             var child_0 = new Xcls_buffer( _this );
             child_0.ref();
@@ -357,7 +358,9 @@ public class Editor : Object
             ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); 
         
             this.el.insert_spaces_instead_of_tabs = true;
-            if (lg.name == "vala") {
+            
+            print("sourcelanguage  = %s\n", lg.name);
+            if (lg.name == "Vala") {
                 this.el.insert_spaces_instead_of_tabs = false;
             }