X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=MergeBranch.vala;h=f75df67791836e92aaffc46e8db0fba84e64f1bd;hb=813f6774c24252f3357a24885137360e2024772d;hp=9c534bc63c2017fdc196bb5ef37caf91deddf794;hpb=2e321b3623202cee5af3b70e8b0ddd77d06ef89e;p=gitlive

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 9c534bc6..f75df677 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
@@ -686,7 +688,29 @@ public class MergeBranch : Object
         public Xcls_Label15(MergeBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( null );
+            this.el = new Gtk.Label( "Projected Commit Diff" );
+
+            // my vars (dec)
+
+            // set gobject values
+        }
+
+        // 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( "Ticket Details" );
 
             // my vars (dec)
 
@@ -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();