From 19166f83acbb615c64d09e94e9993ef54e69703e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 21 Mar 2019 12:42:47 +0800 Subject: [PATCH] NewBranch.bjs NewBranch.vala --- NewBranch.bjs | 79 --------- NewBranch.vala | 428 ++----------------------------------------------- 2 files changed, 12 insertions(+), 495 deletions(-) diff --git a/NewBranch.bjs b/NewBranch.bjs index e2ec3198..3c76d7a5 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -510,85 +510,6 @@ "bool vexpand" : false, "int margin" : 2, "items" : [ - { - "label" : "Project", - "$ visible" : true, - "Gtk.Align halign" : "Gtk.Align.START", - "* pack" : "attach_defaults,0,1,0,1", - "xtype" : "Label", - "$ justify" : "Gtk.Justification.RIGHT", - "x_options" : 4, - "$ xns" : "Gtk" - }, - { - "label" : "Ticket", - "$ visible" : true, - "Gtk.Align halign" : "Gtk.Align.START", - "* pack" : "attach_defaults,1,2,0,1", - "xtype" : "Label", - "x_options" : 4, - "$ xns" : "Gtk" - }, - { - "listeners" : { - "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar project_id = this.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\n\t\n\t\n\t/*if (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n\t*/\n}" - }, - "* ctor" : "new Gtk.ComboBox.with_entry()", - "id" : "projectsel", - "| string selectedProjectId" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.prmodel.el.get_value (iter, 0, out val1);\n \n\n\treturn (string) val1;\n\t\n\t\n\t\n\t\n}\n", - "* init" : "this.el.set_entry_text_column(1);", - "* pack" : "attach_defaults,0,1,1,2", - "xtype" : "ComboBox", - "# bool loading" : false, - "$ xns" : "Gtk", - "items" : [ - { - "id" : "prcellrenderer", - "xtype" : "CellRendererText", - "* pack" : "pack_start,true", - "$ xns" : "Gtk" - }, - { - "| void loadProjects" : " (string id) {\n\n\n \n _this.projectsel.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.projectsel.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.projectsel.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.projectsel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", - "id" : "prmodel", - "* pack" : "set_model", - "xtype" : "ListStore", - "$ columns" : "typeof(string),typeof(string)", - "n_columns" : 2, - "$ xns" : "Gtk" - } - ] - }, - { - "listeners" : { - "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tthis.el.get_child().get_style_context().remove_class(\"warning\");\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\t_this.view.loadTicket(\"\");\t\t\n\t\t\n\t\tthis.el.get_child().get_style_context().add_class(\"warning\");\n\t\t_this.createbtn.updateState();\n\t\treturn;\n\t}\n\t\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t_this.scrolled_window.el.show();\n\t \n\t_this.view.loadTicket(ticket.id);\n\t_this.createbtn.updateState();\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" - }, - "* ctor" : "new Gtk.ComboBox.with_entry()", - "id" : "ticketsel", - "* init" : "//this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );\nthis.el.set_entry_text_column(1);\nthis.el.get_child().set_sensitive(false); ", - "* pack" : "attach_defaults,1,5,1,2", - "xtype" : "ComboBox", - "# bool loading" : false, - "$ xns" : "Gtk", - "| string selectedTicketId" : "() {\nGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.dbmodel.el.get_value (iter, 0, out val1);\n \n\n\treturn (string) val1;\n\t\n\t\n\t\n\t\n}\n", - "items" : [ - { - "id" : "dbcellrenderer", - "* pack" : "pack_start,true", - "xtype" : "CellRendererText", - "$ xns" : "Gtk" - }, - { - "id" : "dbmodel", - "* pack" : "set_model", - "xtype" : "ListStore", - "| void loadTickets" : "(string project_id , string tid = \"\") {\n\n\n \n // fixme .. get project id from selection..\n \n RooTicket.singleton().loadTickets(\n \t\t\tproject_id,\n \t\t\t_this.btn_not_me.el.active ? RooTicket.Who.ANYBODY : RooTicket.Who.ME,\n \t\t\t _this.btn_closed.el.active ? RooTicket.Status.ALL : RooTicket.Status.ACTIVE\n\t\t );\n \n _this.ticketsel.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 ticket --\");\n \n _this.ticketsel.el.set_active_iter(iter);\n var tickets = RooTicket.singleton().tickets;\n foreach(var ticket in tickets) {\n \n el.append(out iter);\n \n el.set_value(iter, 0, ticket.id);\n el.set_value(iter, 1, \"#%s %s\".printf( ticket.id, ticket.summary));\n \n if (ticket.id == tid) {\n\t\t _this.ticketsel.el.set_active_iter(iter);\n }\n \n }\n \n _this.ticketsel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", - "$ columns" : "typeof(string),typeof(string)", - "n_columns" : 2, - "$ xns" : "Gtk" - } - ] - }, { "label" : "Use this as branch name", "Gtk.Align halign" : "Gtk.Align.START", diff --git a/NewBranch.vala b/NewBranch.vala index d725d327..4b9e26b8 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -43,12 +43,6 @@ public class NewBranch : Object public Xcls_clmodel clmodel; public Xcls_developer_id developer_id; public Xcls_devmodel devmodel; - public Xcls_projectsel projectsel; - public Xcls_prcellrenderer prcellrenderer; - public Xcls_prmodel prmodel; - public Xcls_ticketsel ticketsel; - public Xcls_dbcellrenderer dbcellrenderer; - public Xcls_dbmodel dbmodel; public Xcls_name name; public Xcls_createbtn createbtn; public Xcls_btn_not_me btn_not_me; @@ -2210,28 +2204,16 @@ public class NewBranch : Object this.el.vexpand = false; var child_0 = new Xcls_Label53( _this ); child_0.ref(); - this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_Label54( _this ); + this.el.attach_defaults ( child_0.el , 0,1,3,4 ); + var child_1 = new Xcls_name( _this ); child_1.ref(); - this.el.attach_defaults ( child_1.el , 1,2,0,1 ); - var child_2 = new Xcls_projectsel( _this ); + this.el.attach_defaults ( child_1.el , 0,4,4,5 ); + var child_2 = new Xcls_createbtn( _this ); child_2.ref(); - this.el.attach_defaults ( child_2.el , 0,1,1,2 ); - var child_3 = new Xcls_ticketsel( _this ); + this.el.attach_defaults ( child_2.el , 4,5,4,5 ); + var child_3 = new Xcls_Box56( _this ); child_3.ref(); - this.el.attach_defaults ( child_3.el , 1,5,1,2 ); - var child_4 = new Xcls_Label61( _this ); - child_4.ref(); - this.el.attach_defaults ( child_4.el , 0,1,3,4 ); - var child_5 = new Xcls_name( _this ); - child_5.ref(); - this.el.attach_defaults ( child_5.el , 0,4,4,5 ); - var child_6 = new Xcls_createbtn( _this ); - child_6.ref(); - this.el.attach_defaults ( child_6.el , 4,5,4,5 ); - var child_7 = new Xcls_Box64( _this ); - child_7.ref(); - this.el.attach_defaults ( child_7.el , 0,5,2,3 ); + this.el.attach_defaults ( child_3.el , 0,5,2,3 ); } // user defined functions @@ -2246,392 +2228,6 @@ public class NewBranch : Object // ctor public Xcls_Label53(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Label( "Project" ); - - // my vars (dec) - - // set gobject values - this.el.halign = Gtk.Align.START; - this.el.justify = Gtk.Justification.RIGHT; - this.el.visible = true; - } - - // user defined functions - } - - public class Xcls_Label54 : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Label54(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Label( "Ticket" ); - - // my vars (dec) - - // set gobject values - this.el.halign = Gtk.Align.START; - this.el.visible = true; - } - - // user defined functions - } - - public class Xcls_projectsel : Object - { - public Gtk.ComboBox el; - private NewBranch _this; - - - // my vars (def) - public bool loading; - - // ctor - public Xcls_projectsel(NewBranch _owner ) - { - _this = _owner; - _this.projectsel = this; - this.el = new Gtk.ComboBox.with_entry(); - - // my vars (dec) - this.loading = false; - - // set gobject values - var child_0 = new Xcls_prcellrenderer( _this ); - child_0.ref(); - this.el.pack_start ( child_0.el , true ); - var child_1 = new Xcls_prmodel( _this ); - child_1.ref(); - this.el.set_model ( child_1.el ); - - // init method - - this.el.set_entry_text_column(1); - - //listeners - this.el.changed.connect( () => { - if (this.loading) { - return; - } - var project_id = this.selectedProjectId(); - _this.dbmodel.loadTickets(project_id); - - - /*if (this.loading) { - return; - } - var ticket_id = this.selectedTicketId(); - - var name = RooTicket.singleton().usernameLocal(); - - if (ticket_id == "" || ticket_id == null) { - - var dt = new DateTime.now_local(); - _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d"))); - return; - } - - - var ticket = RooTicket.singleton().getById(ticket_id); - - _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); - - //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); - */ - }); - } - - // user defined functions - public string selectedProjectId () { - Gtk.TreeIter iter; - Value val1; - - - this.el.get_active_iter (out iter); - _this.prmodel.el.get_value (iter, 0, out val1); - - - return (string) val1; - - - - - } - } - public class Xcls_prcellrenderer : Object - { - public Gtk.CellRendererText el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_prcellrenderer(NewBranch _owner ) - { - _this = _owner; - _this.prcellrenderer = this; - this.el = new Gtk.CellRendererText(); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_prmodel : Object - { - public Gtk.ListStore el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_prmodel(NewBranch _owner ) - { - _this = _owner; - _this.prmodel = this; - this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - public void loadProjects (string id) { - - - - _this.projectsel.loading = true; - - this.el.clear(); - Gtk.TreeIter iter; - var el = this.el; - - el.append(out iter); - - - el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select a project --"); - if (id == "") { - _this.projectsel.el.set_active_iter(iter); - } - - foreach(var project in RooProject.projects()) { - - el.append(out iter); - - el.set_value(iter, 0, project.id); - el.set_value(iter, 1, project.name ); - if (id == project.id) { - _this.projectsel.el.set_active_iter(iter); - } - - } - - _this.projectsel.loading = false; - //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); - - } - } - - - public class Xcls_ticketsel : Object - { - public Gtk.ComboBox el; - private NewBranch _this; - - - // my vars (def) - public bool loading; - - // ctor - public Xcls_ticketsel(NewBranch _owner ) - { - _this = _owner; - _this.ticketsel = this; - this.el = new Gtk.ComboBox.with_entry(); - - // my vars (dec) - this.loading = false; - - // set gobject values - var child_0 = new Xcls_dbcellrenderer( _this ); - child_0.ref(); - this.el.pack_start ( child_0.el , true ); - var child_1 = new Xcls_dbmodel( _this ); - child_1.ref(); - this.el.set_model ( child_1.el ); - - // init method - - //this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 ); - this.el.set_entry_text_column(1); - this.el.get_child().set_sensitive(false); - - //listeners - this.el.changed.connect( () => { - if (this.loading) { - return; - } - var ticket_id = this.selectedTicketId(); - - var name = RooTicket.singleton().usernameLocal(); - - this.el.get_child().get_style_context().remove_class("warning"); - if (ticket_id == "" || ticket_id == null) { - - var dt = new DateTime.now_local(); - _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d"))); - _this.view.loadTicket(""); - - this.el.get_child().get_style_context().add_class("warning"); - _this.createbtn.updateState(); - return; - } - - - var ticket = RooTicket.singleton().getById(ticket_id); - - _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); - _this.scrolled_window.el.show(); - - _this.view.loadTicket(ticket.id); - _this.createbtn.updateState(); - - //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); - }); - } - - // user defined functions - public string selectedTicketId () { - Gtk.TreeIter iter; - Value val1; - - - this.el.get_active_iter (out iter); - _this.dbmodel.el.get_value (iter, 0, out val1); - - - return (string) val1; - - - - - } - } - public class Xcls_dbcellrenderer : Object - { - public Gtk.CellRendererText el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_dbcellrenderer(NewBranch _owner ) - { - _this = _owner; - _this.dbcellrenderer = this; - this.el = new Gtk.CellRendererText(); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_dbmodel : Object - { - public Gtk.ListStore el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_dbmodel(NewBranch _owner ) - { - _this = _owner; - _this.dbmodel = this; - this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - public void loadTickets (string project_id , string tid = "") { - - - - // fixme .. get project id from selection.. - - RooTicket.singleton().loadTickets( - project_id, - _this.btn_not_me.el.active ? RooTicket.Who.ANYBODY : RooTicket.Who.ME, - _this.btn_closed.el.active ? RooTicket.Status.ALL : RooTicket.Status.ACTIVE - ); - - _this.ticketsel.loading = true; - - this.el.clear(); - Gtk.TreeIter iter; - var el = this.el; - - el.append(out iter); - - - el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select a ticket --"); - - _this.ticketsel.el.set_active_iter(iter); - var tickets = RooTicket.singleton().tickets; - foreach(var ticket in tickets) { - - el.append(out iter); - - el.set_value(iter, 0, ticket.id); - el.set_value(iter, 1, "#%s %s".printf( ticket.id, ticket.summary)); - - if (ticket.id == tid) { - _this.ticketsel.el.set_active_iter(iter); - } - - } - - _this.ticketsel.loading = false; - //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); - - } - } - - - public class Xcls_Label61 : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Label61(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Use this as branch name" ); @@ -2728,7 +2324,7 @@ public class NewBranch : Object } } - public class Xcls_Box64 : Object + public class Xcls_Box56 : Object { public Gtk.Box el; private NewBranch _this; @@ -2737,7 +2333,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box64(NewBranch _owner ) + public Xcls_Box56(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -2751,7 +2347,7 @@ public class NewBranch : Object var child_1 = new Xcls_btn_closed( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_Label67( _this ); + var child_2 = new Xcls_Label59( _this ); child_2.ref(); this.el.add ( child_2.el ); } @@ -2819,7 +2415,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label67 : Object + public class Xcls_Label59 : Object { public Gtk.Label el; private NewBranch _this; @@ -2828,7 +2424,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label67(NewBranch _owner ) + public Xcls_Label59(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Refresh Ticket list" ); -- 2.39.2