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;
public bool dirty;
- public string fname;
public signal void save ();
public JsRender.Node node;
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.expand = true;
var child_0 = new Xcls_Box2( _this );
child_0.ref();
this.el.pack_start ( child_0.el , false,true );
var child_1 = new Xcls_RightEditor( _this );
child_1.ref();
this.el.pack_end ( child_1.el , true,true );
-
- // init method
-
- {
- this.fname = "";
- }
}
// user defined functions
public bool saveContents () {
-
+ if (_this.file == null) {
+ return 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;
- 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);
+
} else {
- val = node.props.get(key);
- }
- this.view.load(val);
- this.key_edit.el.text = key;
+ this.view.load( file.toSource() );
+ }
+ this.key_edit.el.text = key;
+
}
public class Xcls_Box2 : Object
{
buf.set_undo_manager(null);
var lm = Gtk.SourceLanguageManager.get_default();
-
- var lang = _this.file.language;
+ var lang = "vala";
+ if (_this.file != null) {
+ lang = _this.file.language;
+ }
//?? is javascript going to work as js?
((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lm.get_language(lang));
// user defined functions
public bool highlightErrors ( Gee.HashMap<int,string> validate_res) {
+
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;
}
-
-
- var p = Palete.factory(_this.file.xtype);
-
var str = this.toString();
-
+ // needed???
if (this.error_line > 0) {
Gtk.TextIter start;
Gtk.TextIter end;
this.el.remove_source_marks (start, end, null);
}
-
if (str.length < 1) {
print("checkSyntax - empty string?\n");
return true;
}
+
+ if (_this.file.xtype == "PlainFile") {
+
+ // assume it's gtk...
+ this.check_running = true;
+
+ _this.window.windowstate.valasource.checkPlainFileSpawn(
+ _this.file,
+ str
+ );
+ return true;
+
+ }
+ if (_this.file == null) {
+ return true;
+ }
+ var p = Palete.factory(_this.file.xtype);
+
+
+
this.check_running = true;
return true;
}
- if (_this.file == null) {
- return true;
- }
var err = obj.get_object_member(type);
-
-
- var valafn = "";
- try {
- var regex = new Regex("\\.bjs$");
+ var valafn = _this.fname;
+ if (_this.file.xtype == "PlainFile") {
+
+
-
- valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
- } catch (GLib.RegexError e) {
- return true;
- }
+
+ valafn = "";
+ try {
+ var regex = new Regex("\\.bjs$");
+
+
+ valafn = regex.replace(_this.file.path,_this.file.path.length , 0 , ".vala");
+ } catch (GLib.RegexError e) {
+ return true;
+ }
- if (!err.has_member(valafn)) {
- print("File path has no errors\n");
- return true;
- }
- var lines = err.get_object_member(valafn);
+
+ }
+ if (!err.has_member(valafn)) {
+ print("File path has no errors\n");
+ return true;
+ }
+
+ var lines = err.get_object_member(valafn);
+
+ var offset = 1;
+ if (obj.has_member("line_offset")) {
+ offset = (int)obj.get_int_member("line_offset") + 1;
+ }
- var offset = 1;
- if (obj.has_member("line_offset")) {
- offset = (int)obj.get_int_member("line_offset") + 1;
- }
+
var tlines = this.el.get_line_count () +1;
projects / app.Builder.js / blobdiff