From: Alan Knowles <alan@roojs.com>
Date: Mon, 24 Dec 2018 08:01:16 +0000 (+0800)
Subject: MergeBranch.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=e7793b01e94debb6af0432c2639816ddcfcca247

MergeBranch.bjs
MergeBranch.vala
---

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index ab999696..9a9f900c 100644
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -17,7 +17,7 @@
    "$ deletable" : true,
    "title" : "Merge Branch",
    "xtype" : "Dialog",
-   "|   void show" : "(  RooTicket ticket, GitRepo? repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) {\n    \treturn;\n\t}\n\tGitMonitor.gitmonitor.stop();\n\t\n\t_this.el.show_all();\n\t\n\t_this.table.el.hide();\n\t_this.scrolled_window.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\tthis.el.set_keep_above(true);    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n       \tGLib.debug(\"Loading tickets\"); \n\n\n\t\n\t\n    this.ticket = ticket;\n    this.repo = repo;\n    \n\t\n\n \t_this.dbmodel.loadTickets();\n \t_this.actionmodel.loadActions();\n\t_this.view.loadTicket(ticket.id);\n\n}",
+   "|   void show" : "(  RooTicket ticket, GitRepo? repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) {\n    \treturn;\n\t}\n\tGitMonitor.gitmonitor.stop();\n\t\n\t_this.el.show_all();\n\t\n\t_this.table.el.hide();\n\t_this.scrolled_window.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\tthis.el.set_keep_above(true);    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n       \tGLib.debug(\"Loading tickets\"); \n\n\n\t\n\t\n    this.ticket = ticket;\n    this.repo = repo;\n    \n\t\n\tTimeout.add_seconds(1, () => {\n\t\n\t \t_this.dbmodel.loadTickets();\n\t \t_this.actionmodel.loadActions();\n\t\t_this.view.loadTicket(ticket.id);\n\t\t_this.spinner.el.stop();\n\t\t_this.spinner.el.hide();\t\n\n\t\tthis.table.el.show();\n\t\treturn true;\n\t}\n\tthis.el.run();\n\t \n}",
    "default_height" : 200,
    "# RooTicket? ticket" : "null",
    "$ xns" : "Gtk",
diff --git a/MergeBranch.vala b/MergeBranch.vala
index 8934219c..48dc0179 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -140,11 +140,19 @@ public class MergeBranch : Object
         this.repo = repo;
         
     	
+    	Timeout.add_seconds(1, () => {
+    	
+    	 	_this.dbmodel.loadTickets();
+    	 	_this.actionmodel.loadActions();
+    		_this.view.loadTicket(ticket.id);
+    		_this.spinner.el.stop();
+    		_this.spinner.el.hide();	
     
-     	_this.dbmodel.loadTickets();
-     	_this.actionmodel.loadActions();
-    	_this.view.loadTicket(ticket.id);
-    
+    		this.table.el.show();
+    		return true;
+    	}
+    	this.el.run();
+    	 
     }
     public class Xcls_Box2 : Object
     {