X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=MergeBranch.vala;h=5eec33874b0a3a10d9d1cbddafc9342d0c905595;hp=464c85a74d779613fc1cb29c0375a3a992433a29;hb=refs%2Fheads%2Fwip_alan_T5632_cache_project_listing;hpb=cd57ba6977103a28128e6662926a0c343594793c

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 464c85a7..5eec3387 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -12,6 +12,7 @@ public class MergeBranch : Object
         }
         return _MergeBranch;
     }
+    public Xcls_table table;
     public Xcls_actionsel actionsel;
     public Xcls_actioncellrenderer actioncellrenderer;
     public Xcls_actionmodel actionmodel;
@@ -111,11 +112,6 @@ public class MergeBranch : Object
         
         	 
         });
-        this.el.show.connect( (self)  => {
-         
-        
-          //test
-        });
     }
 
     // user defined functions
@@ -127,18 +123,38 @@ public class MergeBranch : Object
     	}
     	GitMonitor.gitmonitor.stop();
     	
-        this.ticket = ticket;
-        this.repo = repo;
-        
+    	_this.el.show_all();
+    	
+    	_this.table.el.hide();
+    	_this.scrolled_window.el.hide();
+    	_this.spinner.el.show();
+    	_this.spinner.el.start();	
+    	this.el.set_keep_above(true);    
     	this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
            	GLib.debug("Loading tickets"); 
     
     
-        this.el.show_all();
-     	_this.dbmodel.loadTickets();
-     	_this.actionmodel.loadActions();
-    	_this.view.loadTicket(ticket.id);
+    	
+    	
+        this.ticket = ticket;
+        this.repo = repo;
+        
+    	
+    	Timeout.add_seconds(1, () => {
+    		
+    		// if we are not working on a ticket, then we should be able to pick one?
+    	 	_this.dbmodel.loadTickets();
+    	 	_this.actionmodel.loadActions();
+    		_this.view.loadTicket(ticket.id);
+    		_this.spinner.el.stop();
+    		_this.spinner.el.hide();	
     
+    		this.table.el.show();
+    		return false;
+    	});
+    	
+    	this.el.run();
+    	 
     }
     public class Xcls_Box2 : Object
     {
@@ -157,7 +173,7 @@ public class MergeBranch : Object
             // my vars (dec)
 
             // set gobject values
-            var child_0 = new Xcls_Table3( _this );
+            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 );
@@ -170,7 +186,7 @@ public class MergeBranch : Object
 
         // user defined functions
     }
-    public class Xcls_Table3 : Object
+    public class Xcls_table : Object
     {
         public Gtk.Table el;
         private MergeBranch  _this;
@@ -179,9 +195,10 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Table3(MergeBranch _owner )
+        public Xcls_table(MergeBranch _owner )
         {
             _this = _owner;
+            _this.table = this;
             this.el = new Gtk.Table( 2, 2, false );
 
             // my vars (dec)
@@ -777,6 +794,12 @@ public class MergeBranch : Object
 
             // set gobject values
             this.el.label = "Do Merge";
+
+            // init method
+
+            {
+               this.el.get_style_context().add_class("suggested-action");
+            }
         }
 
         // user defined functions