public Xml.Doc* mungeNode()
{
Xml.Doc* doc;
+ var is_top = false;
if (this.parent == null) {
+ is_top = true;
doc = new Xml.Doc("1.0");
var inf = this.create_element("interface");
doc->set_root_element(inf);
var req = this.create_element("requires");
req->set_prop("lib", "gtk+");
- req->set_prop("version", "3.12");
+ req->set_prop("version", "4.1");
inf->add_child(req);
this.parent = inf;
} else {
}
var cls = this.node.fqn().replace(".", "");
- var girdata = Palete.Gir.factoryFqn(this.project, this.node.fqn());
-
-
-
- /// check if it's a GtkWidget?
- // maybe not?
- // how are models handled?
-
-
- //var b = new global::Gtk.Builder();
-
- // this might be needed if we are using non-Gtk elements?
- //var gtype = b.get_type_from_name(cls);
- //GLib.debug ("Type: %s ?= %s\n", this.node.fqn(), gtype.name());
-
-
- /*
- var ns = this.node.fqn().split(".")[0];
- if (ns == "Clutter") {
- return "";
+ var gdata = Palete.Gir.factoryFqn(this.project, this.node.fqn());
+ if (gdata == null || !gdata.inherits.contains("Gtk.Buildable")) {
+ return doc;
}
- //if (ns == "GtkClutter") {
- // return "";
- //}
- if (ns == "WebKit") {
- return "";
+ if (gdata.inherits.contains("Gtk.Native")&& !is_top) {
+ return doc;
+ }
+ // what namespaces are supported
+ switch(this.node.NS) {
+ case "Gtk":
+ case "Webkit": //??
+ case "Adw": // works if you call adw.init() in main!
+ break;
+ default:
+ return doc;
}
- */
- /*
- switch(cls) {
- // things we can not do yet...
-
- //case "GtkView": // SourceView?
- case "GtkTreeStore": // top level.. - named and referenced
- case "GtkListStore": // top level.. - named and referenced
- case "GtkTreeViewColumn": // part of liststore?!?!
- case "GtkMenu": // top level..
- case "GtkCellRendererText":
- case "GtkSourceBuffer":
- case "GtkClutterActor"://fixme..
- ///case "GtkClutterEmbed"://fixme..
- return "";
+ // other problems!!!
+
+ if (gdata.fqn() == ("Gtk.ListStore")) {
+ return doc;
}
- */
// should really use GXml...
var obj = this.create_element("object");
- var id = this.node.uid();
- obj->set_prop("class", cls);
- obj->set_prop("id", id);
+ //var id = this.node.uid();
+ var skip_props = false;
+ if (gdata.inherits.contains("Gtk.Native")) {
+
+ obj->set_prop("class", "GtkFrame");
+ skip_props = true;
+ } else {
+
+ obj->set_prop("class", cls);
+ }
+ obj->set_prop("id", "w" + this.node.oid.to_string());
this.parent->add_child(obj);
// properties..
var props = Palete.Gir.factoryFqn(this.project, this.node.fqn()).props;
var pviter = props.map_iterator();
- while (pviter.next()) {
+ while (!skip_props && pviter.next()) {
- GLib.debug ("Check: " +cls + "::(" + pviter.get_value().propertyof + ")" + pviter.get_key() + " " );
+ //GLib.debug ("Check: " +cls + "::(" + pviter.get_value().propertyof + ")" + pviter.get_key() + " " );
// skip items we have already handled..
if (!this.node.has(pviter.get_key())) {
continue;
}
- var k = pviter.get_key();
- var val = this.node.get(pviter.get_key()).strip();
- var prop = this.create_element("property");
- prop->set_prop("name", k);
- switch (k) {
- case "orientation":
- var bits = val.split(".");
- val = bits.length > 2 ? bits[2].down() : "vertical"; // ??
- break;
+ var k = pviter.get_key();
+ var prop = props.get(k);
+ var val = this.node.get(pviter.get_key()).strip();
+ // for Enums - we change it to lowercase, and remove all the previous bits.. hopefully might work.
+ if (prop.type.contains(".") && val.contains(".")) {
+ var typ = Palete.Gir.factoryFqn(this.project, prop.type);
+ if (typ.nodetype == "Enum") {
+ var bits = val.split(".");
+ val = bits[bits.length-1].down();
+ }
+ }
+
+ // value for model seems to cause problems...(it's ok as a property?)
+ if (k == "model") {
+ continue;
}
+
+
+ var domprop = this.create_element("property");
+ domprop->set_prop("name", k);
+
- prop->add_child(new Xml.Node.text(val));
- obj->add_child(prop);
+ domprop->add_child(new Xml.Node.text(val));
+ obj->add_child(domprop);
}
// packing???
/*
} */
// children..
-
- for (var i = 0; i < this.node.items.size; i++ ) {
- var cn = this.node.items.get(i);
+ var items = this.node.readItems();
+ for (var i = 0; i < items.size; i++ ) {
+ var cn = items.get(i);
var child = this.create_element("child");
if (cls == "GtkWindow" && cn.fqn() == "Gtk.HeaderBar") {
child->set_prop("type", "titlebar");
}
- /*
- public string packString()
- {
-
-
-
-
- // pack is part of the parent element..
- var p = node.parent;
- string[] pk= { "add" };
- var pfqn = "Gtk.Box";
- if (p != null) {
- pfqn = p.fqn();
- if (this.node.props.get("* pack") == null) {
- return "";
- }
- pk = this.node.get("* pack").split(",");
- } else {
- if (this.node.props.get("* pack") != null) {
- pk = this.node.get("* pack").split(",");
- }
-
- }
-
- if (pfqn == null) {
- return "";
- }
- if (pfqn == "Gtk.ScrolledWindow") {
- return "";
- }
- var p_parts =pfqn.split(".");
-
-
- var ns = p_parts[0];
- var gir = Palete.Gir.factory(this.project, ns);
- var cls = gir.classes.get(p_parts[1]);
- var mdef = cls.methods.get(pk[0]);
- if (mdef == null) {
- GLib.debug ("could not find method : %s\n", pk[0]);
- return "";
- }
- /*
- var generator = new Json.Generator ();
- var n = new Json.Node(Json.NodeType.OBJECT);
- n.set_object(mdef.toJSON());
- generator.set_root(n);
- generator.indent = 4;
- generator.pretty = true;
-
- GLib.debug print(generator.to_data(null));
- */
- /*
- string[] pbody = {};
- switch(pk[0]) {
-
- case "pack_start":
- pbody += @"$pad <property name=\"pack_type\">start</property>\n";
- break;
-
- case "pack_end":
- pbody += @"$pad <property name=\"pack_type\">start</property>\n";
- break;
-
- case "add":
- //pbody += @"$pad <property name=\"pack_type\">start</property>\n";
- pbody += @"$pad <property name=\"expand\">True</property>\n";
- pbody += @"$pad <property name=\"fill\">True</property>\n";
- //pbody += @"$pad <property name=\"position\">1</property>\n";
- var pack = @"$pad<packing>\n" +
- string.joinv("", pbody) +
- @"$pad</packing>\n";
- return pack;
-
- case "set_model":
- GLib.debug ("set_model not handled yet..");
- return "";
-
- default:
- GLib.debug ("unknown pack type: %s", pk[0]);
- return "";
-
- }
-
-
-
- for (var i = 2; i < mdef.paramset.params.size; i++) {
- var poff = i - 1;
- if (poff > (pk.length-1)) {
- break;
- }
-
- var key = mdef.paramset.params.get(i).name;
- var val = pk[poff];
- pbody += @"$pad <property name=\"$key\">$val</property>\n";
-
- }
-
- if (pbody.length < 1) {
- /*var generator = new Json.Generator ();
- var n = new Json.Node(Json.NodeType.OBJECT);
- n.set_object(mdef.toJSON());
- generator.set_root(n);
- generator.indent = 4;
- generator.pretty = true;
-
- print(generator.to_data(null));
- */
- /*
- GLib.debug ("skip - packing - no arguments (" + pk[0] + ")\n");
- return "";
- }
-
- var pack = @"$pad<packing>\n" +
- string.joinv("", pbody) +
- @"$pad</packing>\n";
- return pack;
-
- }
- */
+
projects / roobuilder / blobdiff