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

diff --git a/MergeBranch.vala b/MergeBranch.vala
index f75df677..cda84538 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -20,6 +20,8 @@ public class MergeBranch : Object
     public Xcls_dbcellrenderer dbcellrenderer;
     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;
@@ -48,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_Button22( _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_Button23( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -668,15 +670,21 @@ public class MergeBranch : Object
 
             // set gobject values
             this.el.vexpand = true;
-            var child_0 = new Xcls_Label15( _this );
+            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_diff.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
     }
-    public class Xcls_Label15 : Object
+    public class Xcls_label_diff : Object
     {
         public Gtk.Label el;
         private MergeBranch  _this;
@@ -685,9 +693,10 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Label15(MergeBranch _owner )
+        public Xcls_label_diff(MergeBranch _owner )
         {
             _this = _owner;
+            _this.label_diff = this;
             this.el = new Gtk.Label( "Projected Commit Diff" );
 
             // my vars (dec)
@@ -698,7 +707,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;
@@ -707,9 +716,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)
@@ -720,6 +730,52 @@ 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_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
     {
@@ -824,7 +880,7 @@ public class MergeBranch : Object
     }
 
 
-    public class Xcls_Button20 : Object
+    public class Xcls_Button22 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -833,7 +889,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button20(MergeBranch _owner )
+        public Xcls_Button22(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -848,7 +904,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Button21 : Object
+    public class Xcls_Button23 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -857,7 +913,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button21(MergeBranch _owner )
+        public Xcls_Button23(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();