MergeBranch.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 5eec338..4acd1af 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -20,6 +20,7 @@ public class MergeBranch : Object
     public Xcls_dbcellrenderer dbcellrenderer;
     public Xcls_dbmodel dbmodel;
     public Xcls_name name;
+    public Xcls_label_diff label_diff;
     public Xcls_scrolled_window scrolled_window;
     public Xcls_view view;
     public Xcls_spinner spinner;
@@ -48,10 +49,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_Button17( _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_Button18( _this );
+        var child_2 = new Xcls_Button21( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -176,12 +177,15 @@ public class MergeBranch : Object
             var child_0 = new Xcls_table( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false,false,0 );
-            var child_1 = new Xcls_scrolled_window( _this );
+            var child_1 = new Xcls_Notebook14( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
-            var child_2 = new Xcls_spinner( _this );
+            var child_2 = new Xcls_scrolled_window( _this );
             child_2.ref();
             this.el.add (  child_2.el  );
+            var child_3 = new Xcls_spinner( _this );
+            child_3.ref();
+            this.el.add (  child_3.el  );
         }
 
         // user defined functions
@@ -506,7 +510,7 @@ public class MergeBranch : Object
 
     public class Xcls_dbmodel : Object
     {
-        public Gtk.ListStore el;
+        public Gtk. el;
         private MergeBranch  _this;
 
 
@@ -517,11 +521,9 @@ public class MergeBranch : Object
         {
             _this = _owner;
             _this.dbmodel = this;
-            this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
+            this.el = new Gtk.();
 
             // my vars (dec)
-
-            // set gobject values
         }
 
         // user defined functions
@@ -649,6 +651,78 @@ public class MergeBranch : Object
     }
 
 
+    public class Xcls_Notebook14 : Object
+    {
+        public Gtk.Notebook el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Notebook14(MergeBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Notebook();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.vexpand = true;
+            var child_0 = new Xcls_label_diff( _this );
+            child_0.ref();
+            var child_1 = new Xcls_Label16( _this );
+            child_1.ref();
+        }
+
+        // user defined functions
+    }
+    public class Xcls_label_diff : Object
+    {
+        public Gtk.Label el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_label_diff(MergeBranch _owner )
+        {
+            _this = _owner;
+            _this.label_diff = this;
+            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)
+
+            // set gobject values
+        }
+
+        // user defined functions
+    }
+
+
     public class Xcls_scrolled_window : Object
     {
         public Gtk.ScrolledWindow el;
@@ -752,7 +826,7 @@ public class MergeBranch : Object
     }
 
 
-    public class Xcls_Button17 : Object
+    public class Xcls_Button20 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -761,7 +835,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button17(MergeBranch _owner )
+        public Xcls_Button20(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -776,7 +850,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Button18 : Object
+    public class Xcls_Button21 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -785,7 +859,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button18(MergeBranch _owner )
+        public Xcls_Button21(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();