X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=5696f20dd783038b1a4e1ec99007f32cfa1ff130;hb=b794e8879619dec81772f3f62f37d40e9e9c0a5e;hp=9a56d3ae86a6fffbfc48bdcbeca2003548b3d23e;hpb=3584ba53150960ecdfbbc70d72e33fc2a9485577;p=gitlive

diff --git a/NewBranch.vala b/NewBranch.vala
index 9a56d3ae..5696f20d 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -45,8 +45,7 @@ public class NewBranch : Object
     public Xcls_devmodel devmodel;
     public Xcls_commit_message commit_message;
     public Xcls_createbtn createbtn;
-    public Xcls_btn_not_me btn_not_me;
-    public Xcls_btn_closed btn_closed;
+    public Xcls_diff_view diff_view;
 
         // my vars (def)
     public GitRepo? repo;
@@ -2177,6 +2176,9 @@ public class NewBranch : Object
             var child_0 = new Xcls_Table52( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false,false,0 );
+            var child_1 = new Xcls_ScrolledWindow56( _this );
+            child_1.ref();
+            this.el.add (  child_1.el  );
         }
 
         // user defined functions
@@ -2193,7 +2195,7 @@ public class NewBranch : Object
         public Xcls_Table52(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Table( 5, 5, true );
+            this.el = new Gtk.Table( 2, 5, true );
 
             // my vars (dec)
 
@@ -2204,16 +2206,13 @@ public class NewBranch : Object
             this.el.vexpand = false;
             var child_0 = new Xcls_Label53( _this );
             child_0.ref();
-            this.el.attach_defaults (  child_0.el , 0,1,3,4 );
+            this.el.attach_defaults (  child_0.el , 0,1,0,1 );
             var child_1 = new Xcls_commit_message( _this );
             child_1.ref();
-            this.el.attach_defaults (  child_1.el , 0,4,4,5 );
+            this.el.attach_defaults (  child_1.el , 0,4,1,2 );
             var child_2 = new Xcls_createbtn( _this );
             child_2.ref();
-            this.el.attach_defaults (  child_2.el , 4,5,4,5 );
-            var child_3 = new Xcls_Box56( _this );
-            child_3.ref();
-            this.el.attach_defaults (  child_3.el , 0,5,2,3 );
+            this.el.attach_defaults (  child_2.el , 4,5,1,2 );
         }
 
         // user defined functions
@@ -2230,7 +2229,7 @@ public class NewBranch : Object
         public Xcls_Label53(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Commit Message" );
+            this.el = new Gtk.Label( "Just commit with this comment" );
 
             // my vars (dec)
 
@@ -2324,129 +2323,60 @@ public class NewBranch : Object
         }
     }
 
-    public class Xcls_Box56 : Object
+
+    public class Xcls_ScrolledWindow56 : Object
     {
-        public Gtk.Box el;
+        public Gtk.ScrolledWindow el;
         private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Box56(NewBranch _owner )
+        public Xcls_ScrolledWindow56(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
+            this.el = new Gtk.ScrolledWindow( null, null );
 
             // my vars (dec)
 
             // set gobject values
-            var child_0 = new Xcls_btn_not_me( _this );
+            this.el.height_request = 400;
+            this.el.vexpand = true;
+            var child_0 = new Xcls_diff_view( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
-            var child_1 = new Xcls_btn_closed( _this );
-            child_1.ref();
-            this.el.add (  child_1.el  );
-            var child_2 = new Xcls_Label59( _this );
-            child_2.ref();
-            this.el.add (  child_2.el  );
         }
 
         // user defined functions
     }
-    public class Xcls_btn_not_me : Object
+    public class Xcls_diff_view : Object
     {
-        public Gtk.CheckButton el;
+        public Gtk.SourceView el;
         private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_btn_not_me(NewBranch _owner )
+        public Xcls_diff_view(NewBranch _owner )
         {
             _this = _owner;
-            _this.btn_not_me = this;
-            this.el = new Gtk.CheckButton();
+            _this.diff_view = this;
+            this.el = new Gtk.SourceView();
 
             // my vars (dec)
 
-            // set gobject values
-            this.el.label = "Show tickets not assigned to me";
-
-            //listeners
-            this.el.toggled.connect( () => {
-            	var project_id = _this.projectsel.selectedProjectId();
-            	_this.dbmodel.loadTickets(project_id);	
-            });
-        }
-
-        // user defined functions
-    }
-
-    public class Xcls_btn_closed : Object
-    {
-        public Gtk.CheckButton el;
-        private NewBranch  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_btn_closed(NewBranch _owner )
-        {
-            _this = _owner;
-            _this.btn_closed = this;
-            this.el = new Gtk.CheckButton();
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.label = "Show closed Tickets";
-
-            //listeners
-            this.el.toggled.connect( () => {
-             	var project_id = _this.projectsel.selectedProjectId();
-            	_this.dbmodel.loadTickets(project_id);	
-            	 
-            });
-        }
-
-        // user defined functions
-    }
-
-    public class Xcls_Label59 : Object
-    {
-        public Gtk.Label el;
-        private NewBranch  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_Label59(NewBranch _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Label( "<a href=\"refresh\">Refresh Ticket list</a>" );
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.halign = Gtk.Align.END;
-            this.el.hexpand = true;
-            this.el.use_markup = true;
+            // init method
 
-            //listeners
-            this.el.activate_link.connect( (uri) => {
-            	if (uri == "refresh") {
-            		RooProject.reload();
-            		var curproj = RooProject.getProjectByRepo(_this.repo);
-            		 _this.prmodel.loadProjects(curproj == null ? "": curproj.id);
-            
-            		_this.dbmodel.loadTickets(curproj == null ? "": curproj.id);		
-            	}
-            	return true;
-            });
+            var description =   Pango.FontDescription.from_string("monospace");
+                description.set_size(9000);
+                this.el.override_font(description);
+                 var lm = Gtk.SourceLanguageManager.get_default();
+                                
+                ((Gtk.SourceBuffer)(this.el.get_buffer())).set_language(
+                    lm.get_language("diff")
+                );
         }
 
         // user defined functions
@@ -2455,5 +2385,4 @@ public class NewBranch : Object
 
 
 
-
 }