From dc7fd9ed0672a6984e23be7821c5a54353cda5db Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 28 Dec 2018 14:55:17 +0800 Subject: [PATCH] MergeBranch.bjs MergeBranch.vala --- MergeBranch.bjs | 7 +++++++ MergeBranch.vala | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/MergeBranch.bjs b/MergeBranch.bjs index 30f9553c..bb938a7c 100644 --- a/MergeBranch.bjs +++ b/MergeBranch.bjs @@ -158,6 +158,13 @@ "xtype" : "Label", "$ xns" : "Gtk" }, + { + "* pack" : "append_page,_this.label_status.el", + "xtype" : "Box", + "gboolean homogeneous" : false, + "$ xns" : "Gtk", + "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL" + }, { "* pack" : "append_page,_this.label_status.el", "xtype" : "Box", diff --git a/MergeBranch.vala b/MergeBranch.vala index 5eda3691..8dfbbb9a 100644 --- a/MergeBranch.vala +++ b/MergeBranch.vala @@ -50,10 +50,10 @@ public class MergeBranch : Object var child_0 = new Xcls_Box2( _this ); child_0.ref(); this.el.get_content_area().add ( child_0.el ); - var child_1 = new Xcls_Button21( _this ); + var child_1 = new Xcls_Button22( _this ); child_1.ref(); this.el.add_action_widget ( child_1.el , 0 ); - var child_2 = new Xcls_Button22( _this ); + var child_2 = new Xcls_Button23( _this ); child_2.ref(); this.el.add_action_widget ( child_2.el , 1 ); @@ -677,6 +677,9 @@ public class MergeBranch : Object var child_2 = new Xcls_Box17( _this ); child_2.ref(); this.el.append_page ( child_2.el , _this.label_status.el ); + var child_3 = new Xcls_Box18( _this ); + child_3.ref(); + this.el.append_page ( child_3.el , _this.label_status.el ); } // user defined functions @@ -750,6 +753,29 @@ public class MergeBranch : Object // user defined functions } + public class Xcls_Box18 : Object + { + public Gtk.Box el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Box18(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); + + // my vars (dec) + + // set gobject values + this.el.homogeneous = false; + } + + // user defined functions + } + public class Xcls_scrolled_window : Object { @@ -854,7 +880,7 @@ public class MergeBranch : Object } - public class Xcls_Button21 : Object + public class Xcls_Button22 : Object { public Gtk.Button el; private MergeBranch _this; @@ -863,7 +889,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button21(MergeBranch _owner ) + public Xcls_Button22(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -878,7 +904,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Button22 : Object + public class Xcls_Button23 : Object { public Gtk.Button el; private MergeBranch _this; @@ -887,7 +913,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button22(MergeBranch _owner ) + public Xcls_Button23(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); -- 2.39.2