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/Builder4/ValaCompileResults.vala.c
src/Builder4/PopoverProperty.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/Palete/CompletionProvider.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/WindowRooView.bjs b/src/Builder4/WindowRooView.bjs
index ad8ccda..754e95d 100644 (file)
--- a/src/Builder4/WindowRooView.bjs
+++ b/src/Builder4/WindowRooView.bjs
@@ -162,7 +162,7 @@
          "| void nodeSelected" : "(JsRender.Node? sel) {\n  \n    \n  \n    // this is connected in widnowstate\n    print(\"node selected\\n\");\n    var buf = this.el.get_buffer();\n \n    var sbuf = (Gtk.SourceBuffer) buf;\n\n   \n    while(Gtk.events_pending()) {\n        Gtk.main_iteration();\n    }\n    \n   \n    // clear all the marks..\n     Gtk.TextIter start;\n    Gtk.TextIter end;     \n        \n    sbuf.get_bounds (out start, out end);\n    sbuf.remove_source_marks (start, end, \"grey\");\n    \n    \n     if (sel == null) {\n\t     print(\"no selected node\\n\");\n        // no highlighting..\n        return;\n    }\n    \n    print(\"highlight region %d to %d\\n\", sel.line_start,sel.line_end);\n    Gtk.TextIter iter;   \n    sbuf.get_iter_at_line(out iter,  sel.line_start);\n    \n    \n    Gtk.TextIter cur_iter;\n    sbuf.get_iter_at_offset(out cur_iter, sbuf.cursor_position);\n    \n    //var cur_line = cur_iter.get_line();\n    //if (cur_line > sel.line_start && cur_line < sel.line_end) {\n    \n    //} else {\n    if (this.allow_node_scroll) {\n\t\t \n    \tthis.el.scroll_to_iter(iter,  0.1f, true, 0.0f, 0.5f);\n\t}\n    \n    \n    \n    for (var i = 0; i < buf.get_line_count();i++) {\n        if (i < (sel.line_start -1) || i > (sel.line_end -1)) {\n           \n            sbuf.get_iter_at_line(out iter, i);\n            sbuf.create_source_mark(null, \"grey\", iter);\n            \n        }\n    \n    }\n    \n\n}\n",
          "bool loading" : true,
          "| string toString" : "() {\n   Gtk.TextIter s;\n    Gtk.TextIter e;\n    this.el.get_buffer().get_start_iter(out s);\n    this.el.get_buffer().get_end_iter(out e);\n    var ret = this.el.get_buffer().get_text(s,e,true);\n    //print(\"TO STRING? \" + ret);\n    return ret;\n}\n",
-         "| void loadFile" : "( ) {\n    this.loading = true;\n    var buf = this.el.get_buffer();\n    buf.set_text(\"\",0);\n    var sbuf = (Gtk.SourceBuffer) buf;\n\n    \n\n    if (_this.file == null || _this.file.xtype != \"Roo\") {\n        print(\"xtype != Roo\");\n        this.loading = false;\n        return;\n    }\n    \n    // get the string from the rendered tree...\n     \n     var src = _this.file.toSource();\n     \n//    print(\"setting str %d\\n\", str.length);\n    buf.set_text(str, str.length);\n    var lm = Gtk.SourceLanguageManager.get_default();\n     \n    //?? is javascript going to work as js?\n    \n    ((Gtk.SourceBuffer)(buf)) .set_language(lm.get_language(_this.file.language));\n  \n    \n    Gtk.TextIter start;\n    Gtk.TextIter end;     \n        \n    sbuf.get_bounds (out start, out end);\n    sbuf.remove_source_marks (start, end, null); // remove all marks..\n    \n    \n    \n    \n    this.loading = false; \n}\n",
+         "| void loadFile" : "( ) {\n    this.loading = true;\n    var buf = this.el.get_buffer();\n    buf.set_text(\"\",0);\n    var sbuf = (Gtk.SourceBuffer) buf;\n\n    \n\n    if (_this.file == null || _this.file.xtype != \"Roo\") {\n        print(\"xtype != Roo\");\n        this.loading = false;\n        return;\n    }\n    \n    // get the string from the rendered tree...\n     \n     var str = _this.file.toSource();\n     \n//    print(\"setting str %d\\n\", str.length);\n    buf.set_text(str, str.length);\n    var lm = Gtk.SourceLanguageManager.get_default();\n     \n    //?? is javascript going to work as js?\n    \n    ((Gtk.SourceBuffer)(buf)) .set_language(lm.get_language(_this.file.language));\n  \n    \n    Gtk.TextIter start;\n    Gtk.TextIter end;     \n        \n    sbuf.get_bounds (out start, out end);\n    sbuf.remove_source_marks (start, end, null); // remove all marks..\n    \n    \n    \n    \n    this.loading = false; \n}\n",
          "* pack" : "add",
          "xtype" : "SourceView",
          "bool allow_node_scroll" : true,

diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala
index f4fd6b3..0a4a4f5 100644 (file)
--- a/src/Builder4/WindowRooView.vala
+++ b/src/Builder4/WindowRooView.vala
@@ -1140,7 +1140,7 @@ public class Xcls_WindowRooView : Object
             
             // get the string from the rendered tree...
              
-             var src = _this.file.toSource();
+             var str = _this.file.toSource();
              
         //    print("setting str %d\n", str.length);
             buf.set_text(str, str.length);

diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala
index 6151b35..8f5dfcf 100644 (file)
--- a/src/JsRender/Roo.vala
+++ b/src/JsRender/Roo.vala
@@ -411,10 +411,14 @@ namespace JsRender {
             if (top == null) {
                 return "";
             }
-            // get the translatable strings..
             
             
             
+            // get the translatable strings.. = we reload them again so calling methods get the right data...
+            this.transStrings = new Gee.HashMap<string,string>();
+                       this.findTransStrings(this.tree);
+            
+            
             if (top.contains("Dialog")) {
                 return this.toSourceDialog(false);
             }