From bdd8da5b4ecc19282b0fd2fc530b874e14f8a801 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 24 Dec 2018 16:00:15 +0800 Subject: [PATCH] MergeBranch.bjs MergeBranch.vala --- MergeBranch.bjs | 2 +- MergeBranch.vala | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/MergeBranch.bjs b/MergeBranch.bjs index 4d6f17bb..ab999696 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 this.ticket = ticket;\n this.repo = repo;\n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n\n\n this.el.show_all();\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\n \t_this.dbmodel.loadTickets();\n \t_this.actionmodel.loadActions();\n\t_this.view.loadTicket(ticket.id);\n\n}", "default_height" : 200, "# RooTicket? ticket" : "null", "$ xns" : "Gtk", diff --git a/MergeBranch.vala b/MergeBranch.vala index e717afc3..8934219c 100644 --- a/MergeBranch.vala +++ b/MergeBranch.vala @@ -123,14 +123,24 @@ 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.ticket = ticket; + this.repo = repo; + + + _this.dbmodel.loadTickets(); _this.actionmodel.loadActions(); _this.view.loadTicket(ticket.id); -- 2.39.2