X-Git-Url: http://git.roojs.org/?p=roobuilder;a=blobdiff_plain;f=src%2FPalete%2FRoo.vala;h=5492884534b20a3229275add7ead1ffcf71093ce;hp=853b8e0e0f1e462f30ebcc207e61b380e406d366;hb=da7e7dde8c571ffefd235665742d8df1596777b1;hpb=496e4a2bd0cb93365e28b2ddb1d21a90ac97e4c6 diff --git a/src/Palete/Roo.vala b/src/Palete/Roo.vala index 853b8e0e0..549288453 100644 --- a/src/Palete/Roo.vala +++ b/src/Palete/Roo.vala @@ -88,15 +88,24 @@ namespace Palete { } - // this.loadUsageFile(BuilderApplication.configDirectory() + "/resources/RooUsage.txt"); + this.classes = new Gee.HashMap(); var add_to = new Gee.HashMap>(); - + + var f = GLib. File.new_for_path(BuilderApplication.configDirectory() + "/resources/roodata.json"); + if (!f.query_exists(null)) { + f = GLib. File.new_for_uri("resources:///html/roodata.json"); + } + + + var pa = new Json.Parser(); try { - pa.load_from_file(BuilderApplication.configDirectory() + "/resources/roodata.json"); + uint8[] data; + f.load_contents( null, out data, null ); + pa.load_from_data((string) data); } catch(GLib.Error e) { - GLib.error("Could not load %s",BuilderApplication.configDirectory() + "/resources/roodata.json"); + GLib.error("Could not load %s",f.get_uri()); } var node = pa.get_root();