From: Alan Knowles <alan@roojs.com>
Date: Fri, 28 Dec 2018 06:54:12 +0000 (+0800)
Subject: MergeBranch.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=9db8406fcf5fb05d64ec49d77d60a6d98c0f8ee8

MergeBranch.bjs
MergeBranch.vala
---

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 440d9db7..f8e69f25 100644
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -149,6 +149,12 @@
          "xtype" : "Label",
          "string label" : "Projected Commit Diff",
          "$ xns" : "Gtk"
+        },
+        {
+         "string label" : "Projected Commit Diff",
+         "* pack" : false,
+         "xtype" : "Label",
+         "$ xns" : "Gtk"
         }
        ]
       },
diff --git a/MergeBranch.vala b/MergeBranch.vala
index 3f308d2f..e37b1ed9 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -48,10 +48,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_Button19( _this );
+        var child_1 = new Xcls_Button20( _this );
         child_1.ref();
         this.el.add_action_widget (  child_1.el , 0 );
-        var child_2 = new Xcls_Button20( _this );
+        var child_2 = new Xcls_Button21( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -670,6 +670,8 @@ public class MergeBranch : Object
             this.el.vexpand = true;
             var child_0 = new Xcls_Label15( _this );
             child_0.ref();
+            var child_1 = new Xcls_Label16( _this );
+            child_1.ref();
         }
 
         // user defined functions
@@ -696,6 +698,28 @@ public class MergeBranch : Object
         // user defined functions
     }
 
+    public class Xcls_Label16 : Object
+    {
+        public Gtk.Label el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Label16(MergeBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Label( "Projected Commit Diff" );
+
+            // my vars (dec)
+
+            // set gobject values
+        }
+
+        // user defined functions
+    }
+
 
     public class Xcls_scrolled_window : Object
     {
@@ -800,7 +824,7 @@ public class MergeBranch : Object
     }
 
 
-    public class Xcls_Button19 : Object
+    public class Xcls_Button20 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -809,7 +833,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button19(MergeBranch _owner )
+        public Xcls_Button20(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -824,7 +848,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Button20 : Object
+    public class Xcls_Button21 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -833,7 +857,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button20(MergeBranch _owner )
+        public Xcls_Button21(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();