X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=MergeBranch.vala;h=5eda369151c668c41d3e9f5d26e6ae0d40664267;hb=c900e6d804acaa93d5bcc5543de2630948665b6f;hp=4acd1afa90f6eeeeb39da84e909875e71c3e679d;hpb=038790bd4663abdcd61ce609c9c791e7d405ba58;p=gitlive

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 4acd1afa..5eda3691 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -21,6 +21,7 @@ public class MergeBranch : Object
     public Xcls_dbmodel dbmodel;
     public Xcls_name name;
     public Xcls_label_diff label_diff;
+    public Xcls_label_ticket label_ticket;
     public Xcls_scrolled_window scrolled_window;
     public Xcls_view view;
     public Xcls_spinner spinner;
@@ -49,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_Button20( _this );
+        var child_1 = new Xcls_Button21( _this );
         child_1.ref();
         this.el.add_action_widget (  child_1.el , 0 );
-        var child_2 = new Xcls_Button21( _this );
+        var child_2 = new Xcls_Button22( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -671,8 +672,11 @@ public class MergeBranch : Object
             this.el.vexpand = true;
             var child_0 = new Xcls_label_diff( _this );
             child_0.ref();
-            var child_1 = new Xcls_Label16( _this );
+            var child_1 = new Xcls_label_ticket( _this );
             child_1.ref();
+            var child_2 = new Xcls_Box17( _this );
+            child_2.ref();
+            this.el.append_page (  child_2.el , _this.label_status.el );
         }
 
         // user defined functions
@@ -700,7 +704,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Label16 : Object
+    public class Xcls_label_ticket : Object
     {
         public Gtk.Label el;
         private MergeBranch  _this;
@@ -709,9 +713,10 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Label16(MergeBranch _owner )
+        public Xcls_label_ticket(MergeBranch _owner )
         {
             _this = _owner;
+            _this.label_ticket = this;
             this.el = new Gtk.Label( "Ticket Details" );
 
             // my vars (dec)
@@ -722,6 +727,29 @@ public class MergeBranch : Object
         // user defined functions
     }
 
+    public class Xcls_Box17 : Object
+    {
+        public Gtk.Box el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Box17(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
     {
@@ -826,7 +854,7 @@ public class MergeBranch : Object
     }
 
 
-    public class Xcls_Button20 : Object
+    public class Xcls_Button21 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -835,7 +863,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();
@@ -850,7 +878,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Button21 : Object
+    public class Xcls_Button22 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -859,7 +887,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();