MergeBranch.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 1f5b245..5eec338 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -112,11 +112,6 @@ public class MergeBranch : Object
         
                 
         });
-        this.el.show.connect( (self)  => {
-         
-        
-          //test
-        });
     }
 
     // user defined functions
@@ -128,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
     {