Uncommited changes synced

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index c1df719..9b2b594 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -22,6 +22,7 @@ public class MergeBranch : Object
     public Xcls_name name;
     public Xcls_label_diff label_diff;
     public Xcls_label_ticket label_ticket;
+    public Xcls_diff_view diff_view;
     public Xcls_scrolled_window scrolled_window;
     public Xcls_view view;
     public Xcls_spinner spinner;
@@ -50,10 +51,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_Button24( _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_Button25( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -134,16 +135,14 @@ public class MergeBranch : Object
        this.el.set_keep_above(true);    
        this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
                GLib.debug("Loading tickets"); 
-    
-    
-       
+     
        
         this.ticket = ticket;
         this.repo = repo;
         
        
        Timeout.add_seconds(1, () => {
-               
+           _this.diff_view.el.get_buffer().set_text(repo.previewMerge());              
                // if we are not working on a ticket, then we should be able to pick one?
                _this.dbmodel.loadTickets();
                _this.actionmodel.loadActions();
@@ -181,12 +180,9 @@ public class MergeBranch : Object
             var child_1 = new Xcls_Notebook14( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
-            var child_2 = new Xcls_scrolled_window( _this );
+            var child_2 = new Xcls_spinner( _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
@@ -511,7 +507,7 @@ public class MergeBranch : Object
 
     public class Xcls_dbmodel : Object
     {
-        public Gtk. el;
+        public Gtk.ListStore el;
         private MergeBranch  _this;
 
 
@@ -522,9 +518,11 @@ public class MergeBranch : Object
         {
             _this = _owner;
             _this.dbmodel = this;
-            this.el = new Gtk.();
+            this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
@@ -674,6 +672,12 @@ public class MergeBranch : Object
             child_0.ref();
             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_Box20( _this );
+            child_3.ref();
+            this.el.append_page (  child_3.el , _this.label_ticket.el );
         }
 
         // user defined functions
@@ -724,7 +728,110 @@ 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;
+            var child_0 = new Xcls_ScrolledWindow18( _this );
+            child_0.ref();
+            this.el.pack_start (  child_0.el , true,true,0 );
+        }
+
+        // user defined functions
+    }
+    public class Xcls_ScrolledWindow18 : Object
+    {
+        public Gtk.ScrolledWindow el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_ScrolledWindow18(MergeBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.ScrolledWindow( null, null );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.height_request = 400;
+            var child_0 = new Xcls_diff_view( _this );
+            child_0.ref();
+            this.el.add (  child_0.el  );
+        }
+
+        // user defined functions
+    }
+    public class Xcls_diff_view : Object
+    {
+        public Gtk.SourceView el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_diff_view(MergeBranch _owner )
+        {
+            _this = _owner;
+            _this.diff_view = this;
+            this.el = new Gtk.SourceView();
+
+            // my vars (dec)
+
+            // init method
+
+            var description =   Pango.FontDescription.from_string("monospace");
+                description.set_size(9000);
+                this.el.override_font(description);
+        }
+
+        // user defined functions
+    }
+
+
 
+    public class Xcls_Box20 : Object
+    {
+        public Gtk.Box el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Box20(MergeBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.homogeneous = false;
+            var child_0 = new Xcls_scrolled_window( _this );
+            child_0.ref();
+            this.el.add (  child_0.el  );
+        }
+
+        // user defined functions
+    }
     public class Xcls_scrolled_window : Object
     {
         public Gtk.ScrolledWindow el;
@@ -802,6 +909,8 @@ public class MergeBranch : Object
     }
 
 
+
+
     public class Xcls_spinner : Object
     {
         public Gtk.Spinner el;
@@ -828,7 +937,7 @@ public class MergeBranch : Object
     }
 
 
-    public class Xcls_Button20 : Object
+    public class Xcls_Button24 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -837,7 +946,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button20(MergeBranch _owner )
+        public Xcls_Button24(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -852,7 +961,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Button21 : Object
+    public class Xcls_Button25 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -861,7 +970,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button21(MergeBranch _owner )
+        public Xcls_Button25(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();