From: Alan Knowles Date: Thu, 21 Mar 2019 04:39:24 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=f9609c53df0d64f8bdd9f86197f4b17d68b9b014 NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index b78ded86..aeb46a24 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -25,13 +25,7 @@ "bool modal" : true, "items" : [ { - "xtype" : "Box", - "$ pack" : "get_content_area().add", - "$ xns" : "Gtk", - "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL" - }, - { - "* pack" : "add", + "* pack" : "get_content_area().add", "xtype" : "Notebook", "$ xns" : "Gtk", "bool vexpand" : true, diff --git a/NewBranch.vala b/NewBranch.vala index 8a3bfe72..80ef0bd2 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -50,12 +50,9 @@ public class NewBranch : Object this.el.default_width = 500; this.el.deletable = true; this.el.modal = true; - var child_0 = new Xcls_Box2( _this ); + var child_0 = new Xcls_Notebook2( _this ); child_0.ref(); this.el.get_content_area().add ( child_0.el ); - var child_1 = new Xcls_Notebook3( _this ); - child_1.ref(); - this.el.add ( child_1.el ); //listeners this.el.delete_event.connect( (self, event) => { @@ -154,29 +151,7 @@ public class NewBranch : Object this.el.run(); } - public class Xcls_Box2 : Object - { - public Gtk.Box el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Box2(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_Notebook3 : Object + public class Xcls_Notebook2 : Object { public Gtk.Notebook el; private NewBranch _this; @@ -185,7 +160,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Notebook3(NewBranch _owner ) + public Xcls_Notebook2(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Notebook(); @@ -200,13 +175,13 @@ public class NewBranch : Object child_1.ref(); var child_2 = new Xcls_label_quick_commit( _this ); child_2.ref(); - var child_3 = new Xcls_Box7( _this ); + 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_Box27( _this ); + var child_4 = new Xcls_Box26( _this ); child_4.ref(); this.el.append_page ( child_4.el , _this.label_create_ticket.el ); - var child_5 = new Xcls_Box28( _this ); + var child_5 = new Xcls_Box27( _this ); child_5.ref(); this.el.append_page ( child_5.el , _this.label_quick_commit.el ); } @@ -282,7 +257,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Box7 : Object + public class Xcls_Box6 : Object { public Gtk.Box el; private NewBranch _this; @@ -291,7 +266,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box7(NewBranch _owner ) + public Xcls_Box6(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -300,7 +275,7 @@ public class NewBranch : Object // set gobject values this.el.homogeneous = false; - var child_0 = new Xcls_Table8( _this ); + var child_0 = new Xcls_Table7( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); var child_1 = new Xcls_scrolled_window( _this ); @@ -310,7 +285,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Table8 : Object + public class Xcls_Table7 : Object { public Gtk.Table el; private NewBranch _this; @@ -319,7 +294,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Table8(NewBranch _owner ) + public Xcls_Table7(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Table( 5, 5, true ); @@ -331,10 +306,10 @@ public class NewBranch : Object this.el.margin = 2; this.el.column_spacing = 4; this.el.vexpand = false; - var child_0 = new Xcls_Label9( _this ); + var child_0 = new Xcls_Label8( _this ); child_0.ref(); this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_Label10( _this ); + var child_1 = new Xcls_Label9( _this ); child_1.ref(); this.el.attach_defaults ( child_1.el , 1,2,0,1 ); var child_2 = new Xcls_projectsel( _this ); @@ -343,10 +318,10 @@ 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_Button17( _this ); + var child_4 = new Xcls_Button16( _this ); child_4.ref(); this.el.attach_defaults ( child_4.el , 4,5,1,2 ); - var child_5 = new Xcls_Label18( _this ); + var child_5 = new Xcls_Label17( _this ); child_5.ref(); this.el.attach_defaults ( child_5.el , 0,1,3,4 ); var child_6 = new Xcls_name( _this ); @@ -355,14 +330,14 @@ public class NewBranch : Object var child_7 = new Xcls_createbtn( _this ); child_7.ref(); this.el.attach_defaults ( child_7.el , 4,5,4,5 ); - var child_8 = new Xcls_Box21( _this ); + var child_8 = new Xcls_Box20( _this ); child_8.ref(); this.el.attach_defaults ( child_8.el , 0,5,2,3 ); } // user defined functions } - public class Xcls_Label9 : Object + public class Xcls_Label8 : Object { public Gtk.Label el; private NewBranch _this; @@ -371,7 +346,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label9(NewBranch _owner ) + public Xcls_Label8(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Project" ); @@ -387,7 +362,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label10 : Object + public class Xcls_Label9 : Object { public Gtk.Label el; private NewBranch _this; @@ -396,7 +371,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label10(NewBranch _owner ) + public Xcls_Label9(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Ticket" ); @@ -748,7 +723,7 @@ public class NewBranch : Object } - public class Xcls_Button17 : Object + public class Xcls_Button16 : Object { public Gtk.Button el; private NewBranch _this; @@ -757,7 +732,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Button17(NewBranch _owner ) + public Xcls_Button16(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -779,7 +754,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label18 : Object + public class Xcls_Label17 : Object { public Gtk.Label el; private NewBranch _this; @@ -788,7 +763,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label18(NewBranch _owner ) + public Xcls_Label17(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Use this as branch name" ); @@ -885,7 +860,7 @@ public class NewBranch : Object } } - public class Xcls_Box21 : Object + public class Xcls_Box20 : Object { public Gtk.Box el; private NewBranch _this; @@ -894,7 +869,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box21(NewBranch _owner ) + public Xcls_Box20(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -908,7 +883,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_Label24( _this ); + var child_2 = new Xcls_Label23( _this ); child_2.ref(); this.el.add ( child_2.el ); } @@ -976,7 +951,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label24 : Object + public class Xcls_Label23 : Object { public Gtk.Label el; private NewBranch _this; @@ -985,7 +960,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label24(NewBranch _owner ) + public Xcls_Label23(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Refresh Ticket list" ); @@ -1093,7 +1068,7 @@ public class NewBranch : Object - public class Xcls_Box27 : Object + public class Xcls_Box26 : Object { public Gtk.Box el; private NewBranch _this; @@ -1102,7 +1077,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box27(NewBranch _owner ) + public Xcls_Box26(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -1116,7 +1091,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Box28 : Object + public class Xcls_Box27 : Object { public Gtk.Box el; private NewBranch _this; @@ -1125,7 +1100,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box28(NewBranch _owner ) + public Xcls_Box27(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );