public class Editor : Object
{
- public Gtk.VBox el;
+ public Gtk.Box el;
private Editor _this;
public static Editor singleton()
public Editor()
{
_this = this;
- this.el = new Gtk.VBox( false, 0 );
+ this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
// my vars (dec)
this.window = null;
this.node = null;
// set gobject values
- var child_0 = new Xcls_HBox2( _this );
+ this.el.homogeneous = false;
+ 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.add ( child_1.el );
+ this.el.pack_end ( child_1.el , true,true );
}
// 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 show (JsRender.JsRender file, JsRender.Node node, string ptype, string key)
+ 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;
+ this.file = file;
+ this.ptype = "";
+ this.key = "";
+ this.node = null;
+
- 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_HBox2 : Object
+ public class Xcls_Box2 : Object
{
- public Gtk.HBox el;
+ public Gtk.Box el;
private Editor _this;
// my vars (def)
// ctor
- public Xcls_HBox2(Editor _owner )
+ public Xcls_Box2(Editor _owner )
{
_this = _owner;
- this.el = new Gtk.HBox( false, 0 );
+ this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
// my vars (dec)
// set gobject values
+ this.el.homogeneous = false;
var child_0 = new Xcls_save_button( _this );
child_0.ref();
this.el.pack_start ( child_0.el , false,false );
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.highlight_current_line = true;
var child_0 = new Xcls_buffer( _this );
child_0.ref();
var attrs = new Gtk.SourceMarkAttributes();
- var pink = new Gdk.RGBA();
+ var pink = Gdk.RGBA();
pink.parse ( "pink");
attrs.set_background ( pink);
attrs.set_icon_name ( "process-stop");
this.el.set_mark_attributes ("ERR", attrs, 1);
var wattrs = new Gtk.SourceMarkAttributes();
- var blue = new Gdk.RGBA();
- blue.parse ( "blue");
+ var blue = Gdk.RGBA();
+ blue.parse ( "#ABF4EB");
wattrs.set_background ( blue);
wattrs.set_icon_name ( "process-stop");
wattrs.query_tooltip_text.connect(( mark) => {
var dattrs = new Gtk.SourceMarkAttributes();
- var purple = new Gdk.RGBA();
- purple.parse ( "purple");
+ var purple = Gdk.RGBA();
+ purple.parse ( "#EEA9FF");
dattrs.set_background ( purple);
dattrs.set_icon_name ( "process-stop");
dattrs.query_tooltip_text.connect(( mark) => {
// this.get('/BottomPane').el.set_current_page(0);
- this.el.get_buffer().set_text(str, str.length);
- var lm = Gtk.SourceLanguageManager.get_default();
+ var buf = (Gtk.SourceBuffer)this.el.get_buffer();
+ buf.set_text(str, str.length);
+ buf.set_undo_manager(null);
- var lang = _this.file.language;
- //?? is javascript going to work as js?
+ var lm = Gtk.SourceLanguageManager.get_default();
+ var lang = "vala";
+ if (_this.file != null) {
+ lang = _this.file.language;
+ }
+ 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));
- var buf = this.el.get_buffer();
+
+
+ ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg);
+
+ this.el.insert_spaces_instead_of_tabs = true;
+ 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) {
+
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();
- string res = "";
-
+ // 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;
+
+ if (!_this.window.windowstate.valasource.checkPlainFileSpawn(
+ _this.file,
+ str
+ )) {
+ this.check_running = false;
+ }
+
+ return true;
+
+ }
+ if (_this.file == null) {
+ return true;
+ }
+ var p = Palete.factory(_this.file.xtype);
+
+
+
this.check_running = true;
print("calling validate vala\n");
// clear the buttons.
- _this.window.statusbar_errors.el.hide();
- _this.window.statusbar_warnings.el.hide();
- _this.window.statusbar_depricated.el.hide();
-
-
+
- p.validateVala(
- str,
- _this.key,
- _this.ptype,
+ if (! _this.window.windowstate.valasource.checkFileWithNodePropChange(
_this.file,
_this.node,
- (obj) => {
- this.check_running = false;
- this.highlightErrorsJson(obj);
-
- //var validate_res = p.validateVala.end(res);
- //this.highlightErrors(validate_res);
-
- }
-
- );
+ _this.key,
+ _this.ptype,
+ str
+ )) {
+ this.check_running = false;
+ }
print("Return has no errors\n");
return true;
}
- var err = obj.get_object_member(type);
+
+ if (_this.window.windowstate.state != WindowState.State.CODEONLY &&
+ _this.window.windowstate.state != WindowState.State.CODE
+ ) {
+ return true;
+ }
+ var err = obj.get_object_member(type);
- if (!err.has_member(_this.file.path)) {
- print("File path has no errors\n");
+
+ 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) {
+ return true;
+ }
+
+
+
+ }
+ if (!err.has_member(valafn)) {
+ print("File path has no errors\n");
+ return true;
+ }
- var lines = err.get_object_member(_this.file.path);
+ 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