From: Alan Knowles Date: Thu, 21 Mar 2019 04:41:37 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=d8fa8905b9a947cc1b331f6262e9c927604784c1 NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index e032ab2d..f1ab8bcd 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -149,16 +149,6 @@ } ] }, - { - "listeners" : { - "clicked" : "() => {\n _this.el.response(-1);\n\tTicket.singleton().show(_this.repo);\n\n}" - }, - "bool expand" : false, - "* pack" : "attach_defaults,4,5,1,2", - "xtype" : "Button", - "string label" : "New Ticket", - "$ xns" : "Gtk" - }, { "label" : "Use this as branch name", "Gtk.Align halign" : "Gtk.Align.START", diff --git a/NewBranch.vala b/NewBranch.vala index 242c880c..0c01b64b 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -194,10 +194,10 @@ public class NewBranch : Object var child_3 = new Xcls_Box6( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_select_ticket.el ); - var child_4 = new Xcls_Box26( _this ); + var child_4 = new Xcls_Box25( _this ); child_4.ref(); this.el.append_page ( child_4.el , _this.label_create_ticket.el ); - var child_5 = new Xcls_Box52( _this ); + var child_5 = new Xcls_Box51( _this ); child_5.ref(); this.el.append_page ( child_5.el , _this.label_quick_commit.el ); } @@ -334,21 +334,18 @@ public class NewBranch : Object var child_3 = new Xcls_ticketsel( _this ); child_3.ref(); this.el.attach_defaults ( child_3.el , 1,4,1,2 ); - var child_4 = new Xcls_Button16( _this ); + var child_4 = new Xcls_Label16( _this ); child_4.ref(); - this.el.attach_defaults ( child_4.el , 4,5,1,2 ); - var child_5 = new Xcls_Label17( _this ); + 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,1,3,4 ); - var child_6 = new Xcls_name( _this ); + 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 , 0,4,4,5 ); - var child_7 = new Xcls_createbtn( _this ); + this.el.attach_defaults ( child_6.el , 4,5,4,5 ); + var child_7 = new Xcls_Box19( _this ); child_7.ref(); - this.el.attach_defaults ( child_7.el , 4,5,4,5 ); - var child_8 = new Xcls_Box20( _this ); - child_8.ref(); - this.el.attach_defaults ( child_8.el , 0,5,2,3 ); + this.el.attach_defaults ( child_7.el , 0,5,2,3 ); } // user defined functions @@ -739,38 +736,7 @@ public class NewBranch : Object } - public class Xcls_Button16 : Object - { - public Gtk.Button el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Button16(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Button(); - - // my vars (dec) - - // set gobject values - this.el.expand = false; - this.el.label = "New Ticket"; - - //listeners - this.el.clicked.connect( () => { - _this.el.response(-1); - Ticket.singleton().show(_this.repo); - - }); - } - - // user defined functions - } - - public class Xcls_Label17 : Object + public class Xcls_Label16 : Object { public Gtk.Label el; private NewBranch _this; @@ -779,7 +745,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label17(NewBranch _owner ) + public Xcls_Label16(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Use this as branch name" ); @@ -876,7 +842,7 @@ public class NewBranch : Object } } - public class Xcls_Box20 : Object + public class Xcls_Box19 : Object { public Gtk.Box el; private NewBranch _this; @@ -885,7 +851,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box20(NewBranch _owner ) + public Xcls_Box19(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -899,7 +865,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_Label23( _this ); + var child_2 = new Xcls_Label22( _this ); child_2.ref(); this.el.add ( child_2.el ); } @@ -967,7 +933,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label23 : Object + public class Xcls_Label22 : Object { public Gtk.Label el; private NewBranch _this; @@ -976,7 +942,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label23(NewBranch _owner ) + public Xcls_Label22(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Refresh Ticket list" ); @@ -1084,7 +1050,7 @@ public class NewBranch : Object - public class Xcls_Box26 : Object + public class Xcls_Box25 : Object { public Gtk.Box el; private NewBranch _this; @@ -1093,7 +1059,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box26(NewBranch _owner ) + public Xcls_Box25(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -1131,10 +1097,10 @@ public class NewBranch : Object this.el.margin = 2; this.el.column_spacing = 4; this.el.vexpand = false; - var child_0 = new Xcls_Label28( _this ); + var child_0 = new Xcls_Label27( _this ); child_0.ref(); this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_Label29( _this ); + var child_1 = new Xcls_Label28( _this ); child_1.ref(); this.el.attach_defaults ( child_1.el , 1,2,0,1 ); var child_2 = new Xcls_project_id( _this ); @@ -1143,50 +1109,50 @@ public class NewBranch : Object var child_3 = new Xcls_summary( _this ); child_3.ref(); this.el.attach_defaults ( child_3.el , 1,4,1,2 ); - var child_4 = new Xcls_Label34( _this ); + var child_4 = new Xcls_Label33( _this ); child_4.ref(); this.el.attach_defaults ( child_4.el , 0,1,2,3 ); var child_5 = new Xcls_milestone_id( _this ); child_5.ref(); this.el.attach_defaults ( child_5.el , 0,1,3,4 ); - var child_6 = new Xcls_Label37( _this ); + var child_6 = new Xcls_Label36( _this ); child_6.ref(); this.el.attach_defaults ( child_6.el , 1,4,2,3 ); var child_7 = new Xcls_description( _this ); child_7.ref(); this.el.attach_defaults ( child_7.el , 1,4,3,12 ); - var child_8 = new Xcls_Label39( _this ); + var child_8 = new Xcls_Label38( _this ); child_8.ref(); this.el.attach_defaults ( child_8.el , 0,1,4,5 ); var child_9 = new Xcls_priority_id( _this ); child_9.ref(); this.el.attach_defaults ( child_9.el , 0,1,5,6 ); - var child_10 = new Xcls_Label42( _this ); + var child_10 = new Xcls_Label41( _this ); child_10.ref(); this.el.attach_defaults ( child_10.el , 0,1,6,7 ); var child_11 = new Xcls_severity_id( _this ); child_11.ref(); this.el.attach_defaults ( child_11.el , 0,1,7,8 ); - var child_12 = new Xcls_Label45( _this ); + var child_12 = new Xcls_Label44( _this ); child_12.ref(); this.el.attach_defaults ( child_12.el , 0,1,8,9 ); var child_13 = new Xcls_classification_id( _this ); child_13.ref(); this.el.attach_defaults ( child_13.el , 0,1,9,10 ); - var child_14 = new Xcls_Label48( _this ); + var child_14 = new Xcls_Label47( _this ); child_14.ref(); this.el.attach_defaults ( child_14.el , 0,1,10,11 ); var child_15 = new Xcls_developer_id( _this ); child_15.ref(); this.el.attach_defaults ( child_15.el , 0,1,11,12 ); - var child_16 = new Xcls_Button51( _this ); + var child_16 = new Xcls_Button50( _this ); child_16.ref(); this.el.attach_defaults ( child_16.el , 0,4,13,14 ); } // user defined functions } - public class Xcls_Label28 : Object + public class Xcls_Label27 : Object { public Gtk.Label el; private NewBranch _this; @@ -1195,7 +1161,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label28(NewBranch _owner ) + public Xcls_Label27(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Project" ); @@ -1210,7 +1176,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label29 : Object + public class Xcls_Label28 : Object { public Gtk.Label el; private NewBranch _this; @@ -1219,7 +1185,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label29(NewBranch _owner ) + public Xcls_Label28(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Summary" ); @@ -1430,7 +1396,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label34 : Object + public class Xcls_Label33 : Object { public Gtk.Label el; private NewBranch _this; @@ -1439,7 +1405,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label34(NewBranch _owner ) + public Xcls_Label33(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Milestone" ); @@ -1561,7 +1527,7 @@ public class NewBranch : Object } - public class Xcls_Label37 : Object + public class Xcls_Label36 : Object { public Gtk.Label el; private NewBranch _this; @@ -1570,7 +1536,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label37(NewBranch _owner ) + public Xcls_Label36(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Description" ); @@ -1608,7 +1574,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label39 : Object + public class Xcls_Label38 : Object { public Gtk.Label el; private NewBranch _this; @@ -1617,7 +1583,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label39(NewBranch _owner ) + public Xcls_Label38(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Priority" ); @@ -1731,7 +1697,7 @@ public class NewBranch : Object } - public class Xcls_Label42 : Object + public class Xcls_Label41 : Object { public Gtk.Label el; private NewBranch _this; @@ -1740,7 +1706,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label42(NewBranch _owner ) + public Xcls_Label41(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Severity" ); @@ -1852,7 +1818,7 @@ public class NewBranch : Object } - public class Xcls_Label45 : Object + public class Xcls_Label44 : Object { public Gtk.Label el; private NewBranch _this; @@ -1861,7 +1827,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label45(NewBranch _owner ) + public Xcls_Label44(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Classification" ); @@ -1976,7 +1942,7 @@ public class NewBranch : Object } - public class Xcls_Label48 : Object + public class Xcls_Label47 : Object { public Gtk.Label el; private NewBranch _this; @@ -1985,7 +1951,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label48(NewBranch _owner ) + public Xcls_Label47(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Assign to" ); @@ -2105,7 +2071,7 @@ public class NewBranch : Object } - public class Xcls_Button51 : Object + public class Xcls_Button50 : Object { public Gtk.Button el; private NewBranch _this; @@ -2114,7 +2080,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Button51(NewBranch _owner ) + public Xcls_Button50(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -2186,7 +2152,7 @@ public class NewBranch : Object - public class Xcls_Box52 : Object + public class Xcls_Box51 : Object { public Gtk.Box el; private NewBranch _this; @@ -2195,7 +2161,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box52(NewBranch _owner ) + public Xcls_Box51(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );