public int pos_root_x;
public int pos_root_y;
public string ptype;
- public string fname;
public string key;
public JsRender.JsRender file;
public bool pos;
this.window = null;
this.activeEditor = "";
this.ptype = "";
- this.fname = "";
this.key = "";
this.file = null;
this.pos = false;
// set gobject values
this.el.homogeneous = false;
+ this.el.hexpand = true;
var child_0 = new Xcls_Box2( _this );
child_0.ref();
this.el.pack_start ( child_0.el , false,true );
var str = _this.buffer.toString();
-
+ _this.buffer.checkSyntax();
- if (!_this.buffer.checkSyntax()) {
- print("check syntax failed");
- //this.get('/StandardErrorDialog').show("Fix errors in code and save..");
- //return false;
- }
// LeftPanel.model.changed( str , false);
_this.dirty = false;
_this.save_button.el.sensitive = false;
-
-
-
// find the text for the node..
- if (ptype == "listener") {
- this.node.listeners.set(key,str);
-
+ if (_this.file.xtype != "PlainFile") {
+ if (ptype == "listener") {
+ this.node.listeners.set(key,str);
+
+ } else {
+ this.node.props.set(key,str);
+ }
} else {
- this.node.props.set(key,str);
- }
-
-
+ _this.file.setSource( str );
+ }
// call the signal..
this.save();
return true;
}
- public void showPlainFile (string fname)
+ public void show (JsRender.JsRender file, JsRender.Node? node, string ptype, string key)
{
+ this.file = file;
this.ptype = "";
this.key = "";
this.node = null;
- this.file = null;
- this.fname = fname;
- string str;
- try {
- GLib.FileUtils.get_contents(fname, out str);
- } catch (Error e) {
- str = ""; // a tad dangerios... - perhaps we should block editing...
- }
-
- this.view.load(str);
- this.key_edit.el.text = "";
- }
- public void show (JsRender.JsRender file, JsRender.Node node, string ptype, string key)
- {
- this.ptype = ptype;
- this.key = key;
- this.node = node;
- this.file = file;
- string val = "";
- // find the text for the node..
- if (ptype == "listener") {
- val = node.listeners.get(key);
+ if (file.xtype != "PlainFile") {
+
+ this.ptype = ptype;
+ this.key = key;
+ this.node = node;
+ string val = "";
+ // find the text for the node..
+ if (ptype == "listener") {
+ val = node.listeners.get(key);
+
+ } else {
+ val = node.props.get(key);
+ }
+ this.view.load(val);
+ this.key_edit.el.show();
+ this.key_edit.el.text = key;
} else {
- val = node.props.get(key);
+ this.view.load( file.toSource() );
+ this.key_edit.el.hide();
}
- this.view.load(val);
- this.key_edit.el.text = key;
+
}
public class Xcls_Box2 : 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.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 );
child_0.ref();
var description = Pango.FontDescription.from_string("monospace");
description.set_size(8000);
this.el.override_font(description);
-
-
+ this.el.completion.add_provider(new Palete.CompletionProvider());
+
var attrs = new Gtk.SourceMarkAttributes();
var pink = Gdk.RGBA();
// this.get('/BottomPane').el.set_current_page(0);
- var buf = (Gtk.SourceBuffer)this.el.get_buffer();
+ var buf = (Gtk.SourceBuffer)this.el.get_buffer();
buf.set_text(str, str.length);
buf.set_undo_manager(null);
if (_this.file != null) {
lang = _this.file.language;
}
- //?? is javascript going to work as js?
+ print("lang=%s, content_type = %s\n", lang, _this.file.content_type);
+ var lg = _this.file.content_type.length > 0 ?
+ lm.guess_language(_this.file.path, _this.file.content_type) :
+ lm.get_language(lang);
- ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lm.get_language(lang));
-
+
+
+ ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg);
+
+ this.el.insert_spaces_instead_of_tabs = true;
+
+ print("sourcelanguage = %s\n", lg.name);
+ if (lg.name == "Vala") {
+ this.el.insert_spaces_instead_of_tabs = false;
+ }
_this.dirty = false;
this.el.grab_focus();
// user defined functions
public bool highlightErrors ( Gee.HashMap<int,string> validate_res) {
- while (Gtk.events_pending()) {
- Gtk.main_iteration();
- }
-
+
this.error_line = validate_res.size;
if (this.error_line < 1) {
}
this.el.get_iter_at_line( out iter, eline);
//print("mark line\n");
- this.el.create_source_mark(valiter.get_value(), "error", iter);
+ this.el.create_source_mark(valiter.get_value(), "ERR", iter);
}
return false;
}
return true;
}
- if (_this.file == null && _this.fname.length > 0) {
+ if (_this.file.xtype == "PlainFile") {
// assume it's gtk...
this.check_running = true;
- _this.window.windowstate.valasource.checkPlainFileSpawn(
- _this.window.project,
- _this.fname,
+ if (!_this.window.windowstate.valasource.checkPlainFileSpawn(
+ _this.file,
str
- );
+ )) {
+ this.check_running = false;
+ }
+
return true;
}
// clear the buttons.
- p.validateVala(
- _this.window.windowstate,
- str,
- _this.key,
- _this.ptype,
+ if (! _this.window.windowstate.valasource.checkFileWithNodePropChange(
_this.file,
- _this.node
-
-
- );
+ _this.node,
+ _this.key,
+ _this.ptype,
+ str
+ )) {
+ this.check_running = false;
+ }
var err = obj.get_object_member(type);
- var valafn = _this.fname;
- if (_this.file != null) {
+
+
+ if (_this.file == null) {
+ return true;
+
+ }
+ var valafn = _this.file.path;
+
+ if (_this.file.xtype != "PlainFile") {
valafn = "";
try {
var regex = new Regex("\\.bjs$");
-
+ // should not happen
+
valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
} catch (GLib.RegexError e) {
projects / app.Builder.js / blobdiff