X-Git-Url: http://git.roojs.org/?p=roobuilder;a=blobdiff_plain;f=src%2FBuilder4%2FDialogFiles.bjs;h=ec42b33291cb596d1f160f3fedda28b74f7cd62e;hp=647b185414881f9d685bf64df8c8e1c6393e1c40;hb=51ba030a987ba20ae5e1fbafb29709de4311e17b;hpb=67b4cca903e02417c1802b41c2fd8bb0da45c3e0 diff --git a/src/Builder4/DialogFiles.bjs b/src/Builder4/DialogFiles.bjs index 647b18541..ec42b3329 100644 --- a/src/Builder4/DialogFiles.bjs +++ b/src/Builder4/DialogFiles.bjs @@ -64,7 +64,9 @@ " ", "\tthis.css = new Gtk.CssProvider();", " ", - "\tthis.css.load_from_string(\"#project-list { font-size: 12px;}\");", + "\tthis.css.load_from_string(\"", + "\t\t#project-list { font-size: 12px;}", + "\t\");", "", "\tGtk.StyleContext.add_provider_for_display(", "\t\tthis.el.get_display(),", @@ -526,7 +528,15 @@ " ", "\tthis.css = new Gtk.CssProvider();", " ", - "\tthis.css.load_from_string(\"#file-list { font-size: 12px;}\");", + "\tthis.css.load_from_string(\"", + "#file-list { font-size: 12px;}", + "#file-list indent {", + "-gtk-icon-size : 2px;", + "}", + "#file-list indent:nth-last-child(2) {", + "min-width: 24px;", + "}", + "\");", "", "\tGtk.StyleContext.add_provider_for_display(", "\t\tthis.el.get_display(),", @@ -748,43 +758,51 @@ "listeners" : { "bind" : [ "(listitem) => {", - "\t //GLib.debug(\"listitme is is %s\", ((Gtk.ListItem)listitem).get_type().name());", - "\t", - "\t", "\t", - "\t//var expand = (Gtk.TreeExpander) ((Gtk.ListItem)listitem).get_child();", - "\tvar expand = (Gtk.TreeExpander) ((Gtk.ListItem)listitem).get_child();", - "\t ", + "\t //GLib.debug(\"listitme is is %s\", ((Gtk.ListItem)listitem).get_type().name());", + " \t", + " \t", + " \t", + " \t//var expand = (Gtk.TreeExpander) ((Gtk.ListItem)listitem).get_child();", + " \tvar expand = (Gtk.TreeExpander) ((Gtk.ListItem)listitem).get_child();", + " \t ", + " \tvar hbox = (Gtk.Box) expand.child;", " ", - "\tvar lbl = (Gtk.Label) expand.child;", "\t", - "\t if (lbl.label != \"\") { // do not update", - "\t \treturn;", - " \t}", - "\tvar lr = (Gtk.TreeListRow)((Gtk.ListItem)listitem).get_item();", - "\t//GLib.debug(\"LR = %s\", lr.get_type().name());", + "\t\tvar img = (Gtk.Image) hbox.get_first_child();", + "\t\tvar lbl = (Gtk.Label) img.get_next_sibling();", "", - "\t", - "\tvar jr =(JsRender.JsRender) lr.get_item();", - "\t//GLib.debug(\"JR = %s\", jr.get_type().name());\t\t", - "\t", - "\t if (jr == null) {", - "\t\t GLib.debug(\"Problem getting item\"); ", - "\t\t return;", - "\t }", - "\t//GLib.debug(\"change %s to %s\", lbl.label, np.name);", - "\tlbl.label = jr.name; // for dir's we could hsow the sub path..", - "\tlbl.tooltip_markup = jr.path;", - "\t ", - " expand.set_hide_expander( jr.xtype != \"Dir\" );", - " \t expand.set_list_row(lr);", " ", - " \t ", - " \t// bind image...", - " \t", - "}", + " \t", + " \t if (lbl.label != \"\") { // do not update", + " \t \treturn;", + " \t}", + " \tvar lr = (Gtk.TreeListRow)((Gtk.ListItem)listitem).get_item();", + " \t//GLib.debug(\"LR = %s\", lr.get_type().name());", + " ", + " \t", + " \tvar jr =(JsRender.JsRender) lr.get_item();", + " \t//GLib.debug(\"JR = %s\", jr.get_type().name());\t\t", + " \t", + " \t if (jr == null) {", + " \t\t GLib.debug(\"Problem getting item\"); ", + " \t\t return;", + " \t }", "", + "\t\tjr.bind_property(\"icon\",", + " img, \"gicon\",", + " GLib.BindingFlags.SYNC_CREATE);", "", + " \t//GLib.debug(\"change %s to %s\", lbl.label, np.name);", + " \tlbl.label = jr.name; // for dir's we could hsow the sub path..", + " \tlbl.tooltip_markup = jr.path;", + " \t ", + " expand.set_hide_expander( jr.xtype != \"Dir\" );", + " \t expand.set_list_row(lr);", + " ", + " \t ", + " \t// bind image...", + "}", "" ], "setup" : [ @@ -794,7 +812,9 @@ "\t ", "\texpand.set_indent_for_depth(true);", "\texpand.set_indent_for_icon(true);", - "\t ", + "\tvar hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL,0);", + "\tvar icon = new Gtk.Image();", + "\ticon.margin_end = 4;", "\tvar lbl = new Gtk.Label(\"\");", "\tlbl.use_markup = true;", "\t", @@ -802,8 +822,9 @@ " \tlbl.justify = Gtk.Justification.LEFT;", " \tlbl.xalign = 0;", "", - " ", - "\texpand.set_child(lbl);", + " \thbox.append(icon);", + "\thbox.append(lbl);", + "\texpand.set_child(hbox);", "\t((Gtk.ListItem)listitem).set_child(expand);", "\t((Gtk.ListItem)listitem).activatable = false;", "}", @@ -1164,10 +1185,10 @@ "() {", " // clear list...", " ", - " ", + " ", " _this.is_loading = true;", " ", - " ", + "", " Project.Project.loadAll();", " _this.project_list.el.set_model(new Gtk.SingleSelection(null));", " Project.Project.loadIntoStore(this.projectmodel.el);",