From: Alan Knowles Date: Thu, 21 Mar 2019 05:44:14 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=d5f2519b75479a9bd4be4dd441f333f79a6634dd NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index fa9127ae..1c2f2211 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -300,7 +300,7 @@ }, { "| void loadProjects" : " (string id) {\n\n \n _this.project_id.loading = true;\n\n this.el.clear(); \n Gtk.TreeIter iter;\n var el = this.el;\n \n el.append(out iter);\n\n \n el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a project --\");\n if (id == \"\") {\n\t _this.project_id.el.set_active_iter(iter);\n }\n\n foreach(var project in RooProject.projects()) {\n \n el.append(out iter);\n \n el.set_value(iter, 0, project.id);\n el.set_value(iter, 1, project.name );\n if (id == project.id) {\n\t \t _this.project_id.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.project_id.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", - "id" : "prmodel", + "id" : "tprmodel", "* pack" : "set_model", "xtype" : "ListStore", "$ columns" : "typeof(string),typeof(string)", diff --git a/NewBranch.vala b/NewBranch.vala index 2ba873f5..dac9bdcf 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -31,7 +31,7 @@ public class NewBranch : Object public Xcls_table table; public Xcls_project_id project_id; public Xcls_tprcellrenderer tprcellrenderer; - public Xcls_prmodel prmodel; + public Xcls_tprmodel tprmodel; public Xcls_summary summary; public Xcls_milestone_id milestone_id; public Xcls_msmodel msmodel; @@ -1246,7 +1246,7 @@ public class NewBranch : Object var child_0 = new Xcls_tprcellrenderer( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true ); - var child_1 = new Xcls_prmodel( _this ); + var child_1 = new Xcls_tprmodel( _this ); child_1.ref(); this.el.set_model ( child_1.el ); @@ -1337,7 +1337,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_prmodel : Object + public class Xcls_tprmodel : Object { public Gtk.ListStore el; private NewBranch _this; @@ -1346,10 +1346,10 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_prmodel(NewBranch _owner ) + public Xcls_tprmodel(NewBranch _owner ) { _this = _owner; - _this.prmodel = this; + _this.tprmodel = this; this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); // my vars (dec)