From a24b731810fce5cd4e06d8a1e5dc0d45d1ac267e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 30 Oct 2018 18:14:38 +0800 Subject: [PATCH] NewBranch.bjs NewBranch.vala --- NewBranch.bjs | 16 ++++++++-------- NewBranch.vala | 43 +++++++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/NewBranch.bjs b/NewBranch.bjs index dd8877a9..2fb79136 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -11,13 +11,13 @@ "listeners" : { "delete_event" : "(self, event) => {\n this.el.hide();\n return true; \n //test \n}\n ", "response" : " (self, response_id) => { \n \n\t GLib.debug(\"got %d\", (int) response_id);\n}", - "show" : "(self) => {\n this.el.run();\n //test\n}" + "show" : "(self) => {\n \n \n\n this.el.run();\n //test\n}" }, "default_width" : 500, "$ deletable" : true, "title" : "Create a working branch ", "xtype" : "Dialog", - "| void show" : "( ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n this.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n this.el.show_all();\n \n}", + "| void show" : "( ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n this.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \n \n \n this.el.show_all();\n\t_this.dbmodel.loadTickets();\n\t\n\t \n\n \n \n}", "default_height" : 200, "$ modal" : true, "$ xns" : "Gtk", @@ -54,18 +54,18 @@ "items" : [ { "id" : "dbcellrenderer", - "* pack" : "pack_start,true", "xtype" : "CellRendererText", + "* pack" : "pack_start,true", "$ xns" : "Gtk" }, { "id" : "dbmodel", - "* pack" : "set_model", "xtype" : "ListStore", + "* pack" : "set_model", + "| void loadTickets" : " () {\n\n RooTicket.singleton().loadTickets();\n \n \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 ticket --\");\n \n _this.build_module.el.set_active_iter(iter);\n var tickets = RooTicket.singleton().tickets;\n foreach(var ticket in tickets) {\n \n\n el.append(out iter);\n \n el.set_value(iter, 0, ticket.id);\n el.set_value(iter, 1, \"#%s %s %s\".printf( ticket.id, ticket.project_id_name , ticket.summary));\n \n //if (data.get(i) == cur) {\n // _this.build_module.el.set_active_iter(iter);\n // }\n \n }\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", "$ columns" : "typeof(string),typeof(string)", "n_columns" : 2, - "$ xns" : "Gtk", - "| void loadData" : " (Gee.ArrayList data, string cur) {\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, \"aaa - Just add Element - aaa\");\n\n el.append(out iter);\n\n \n el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a module --\");\n _this.build_module.el.set_active_iter(iter);\n \n for (var i = 0; i < data.size;i++) {\n \n\n el.append(out iter);\n \n el.set_value(iter, 0, data.get(i));\n el.set_value(iter, 1, data.get(i));\n \n if (data.get(i) == cur) {\n _this.build_module.el.set_active_iter(iter);\n }\n \n }\n this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n" + "$ xns" : "Gtk" } ] }, @@ -91,15 +91,15 @@ }, { "label" : "Do not create Branch", - "* pack" : "add_action_widget,0", "xtype" : "Button", + "* pack" : "add_action_widget,0", "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE", "$ xns" : "Gtk" }, { "label" : "Create Branch", - "* pack" : "add_action_widget,1", "xtype" : "Button", + "* pack" : "add_action_widget,1", "$ xns" : "Gtk" } ] diff --git a/NewBranch.vala b/NewBranch.vala index 187ea62b..15a40f84 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -54,6 +54,9 @@ public class NewBranch : Object GLib.debug("got %d", (int) response_id); }); this.el.show.connect( (self) => { + + + this.el.run(); //test }); @@ -64,7 +67,15 @@ public class NewBranch : Object { // this.el.set_gravity(Gdk.Gravity.NORTH); this.el.move((Gdk.Screen.width() / 2)- 250 ,0); + + + this.el.show_all(); + _this.dbmodel.loadTickets(); + + + + } public class Xcls_VBox2 : Object @@ -225,38 +236,38 @@ public class NewBranch : Object } // user defined functions - public void loadData (Gee.ArrayList data, string cur) { + public void loadTickets () { + + RooTicket.singleton().loadTickets(); + + + this.el.clear(); Gtk.TreeIter iter; var el = this.el; - /// el.append(out iter); - - - // el.set_value(iter, 0, ""); - // el.set_value(iter, 1, "aaa - Just add Element - aaa"); - el.append(out iter); el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select a module --"); - _this.build_module.el.set_active_iter(iter); + el.set_value(iter, 1, "-- select a ticket --"); - for (var i = 0; i < data.size;i++) { + _this.build_module.el.set_active_iter(iter); + var tickets = RooTicket.singleton().tickets; + foreach(var ticket in tickets) { el.append(out iter); - el.set_value(iter, 0, data.get(i)); - el.set_value(iter, 1, data.get(i)); + el.set_value(iter, 0, ticket.id); + el.set_value(iter, 1, "#%s %s %s".printf( ticket.id, ticket.project_id_name , ticket.summary)); - if (data.get(i) == cur) { - _this.build_module.el.set_active_iter(iter); - } + //if (data.get(i) == cur) { + // _this.build_module.el.set_active_iter(iter); + // } } - this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); + //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); } } -- 2.39.2