From: Alan Knowles Date: Thu, 21 Mar 2019 04:43:37 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=17cd487b215836f19f9486b0d71c08b40d1a3f59 NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index 7b7b3036..3ceec65f 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -538,46 +538,6 @@ "xtype" : "Button", "* pack" : "attach_defaults,4,5,4,5", "$ xns" : "Gtk" - }, - { - "* pack" : "attach_defaults,0,5,2,3", - "xtype" : "Box", - "$ xns" : "Gtk", - "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL", - "items" : [ - { - "listeners" : { - "toggled" : "() => {\n\tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n}" - }, - "id" : "btn_not_me", - "string label" : "Show tickets not assigned to me", - "* pack" : "add", - "xtype" : "CheckButton", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "toggled" : "() => {\n \tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n\t \n}" - }, - "id" : "btn_closed", - "xtype" : "CheckButton", - "string label" : "Show closed Tickets", - "* pack" : "add", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "activate_link" : "(uri) => {\n\tif (uri == \"refresh\") {\n\t\tRooProject.reload();\n\t\tvar curproj = RooProject.getProjectByRepo(_this.repo);\n\t\t _this.prmodel.loadProjects(curproj == null ? \"\": curproj.id);\n\n\t\t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id);\t\t\n\t}\n\treturn true;\n}" - }, - "bool use_markup" : true, - "Gtk.Align halign" : "Gtk.Align.END", - "bool hexpand" : true, - "* pack" : "add", - "xtype" : "Label", - "string label" : "Refresh Ticket list", - "$ xns" : "Gtk" - } - ] } ] } diff --git a/NewBranch.vala b/NewBranch.vala index 9a56d3ae..74ab26d8 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -45,8 +45,6 @@ public class NewBranch : Object public Xcls_devmodel devmodel; public Xcls_commit_message commit_message; public Xcls_createbtn createbtn; - public Xcls_btn_not_me btn_not_me; - public Xcls_btn_closed btn_closed; // my vars (def) public GitRepo? repo; @@ -2211,9 +2209,6 @@ public class NewBranch : Object var child_2 = new Xcls_createbtn( _this ); child_2.ref(); 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 , 0,5,2,3 ); } // user defined functions @@ -2324,135 +2319,6 @@ public class NewBranch : Object } } - public class Xcls_Box56 : Object - { - public Gtk.Box el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Box56(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); - - // my vars (dec) - - // set gobject values - var child_0 = new Xcls_btn_not_me( _this ); - child_0.ref(); - this.el.add ( child_0.el ); - var child_1 = new Xcls_btn_closed( _this ); - child_1.ref(); - this.el.add ( child_1.el ); - var child_2 = new Xcls_Label59( _this ); - child_2.ref(); - this.el.add ( child_2.el ); - } - - // user defined functions - } - public class Xcls_btn_not_me : Object - { - public Gtk.CheckButton el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_btn_not_me(NewBranch _owner ) - { - _this = _owner; - _this.btn_not_me = this; - this.el = new Gtk.CheckButton(); - - // my vars (dec) - - // set gobject values - this.el.label = "Show tickets not assigned to me"; - - //listeners - this.el.toggled.connect( () => { - var project_id = _this.projectsel.selectedProjectId(); - _this.dbmodel.loadTickets(project_id); - }); - } - - // user defined functions - } - - public class Xcls_btn_closed : Object - { - public Gtk.CheckButton el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_btn_closed(NewBranch _owner ) - { - _this = _owner; - _this.btn_closed = this; - this.el = new Gtk.CheckButton(); - - // my vars (dec) - - // set gobject values - this.el.label = "Show closed Tickets"; - - //listeners - this.el.toggled.connect( () => { - var project_id = _this.projectsel.selectedProjectId(); - _this.dbmodel.loadTickets(project_id); - - }); - } - - // user defined functions - } - - public class Xcls_Label59 : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Label59(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Label( "Refresh Ticket list" ); - - // my vars (dec) - - // set gobject values - this.el.halign = Gtk.Align.END; - this.el.hexpand = true; - this.el.use_markup = true; - - //listeners - this.el.activate_link.connect( (uri) => { - if (uri == "refresh") { - RooProject.reload(); - var curproj = RooProject.getProjectByRepo(_this.repo); - _this.prmodel.loadProjects(curproj == null ? "": curproj.id); - - _this.dbmodel.loadTickets(curproj == null ? "": curproj.id); - } - return true; - }); - } - - // user defined functions - } - -