From 30ee247c433160deefebbf3e200a9b880a34afbc Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 24 Dec 2018 15:46:42 +0800 Subject: [PATCH] Ticket.bjs Ticket.vala --- Ticket.bjs | 2 +- Ticket.vala | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Ticket.bjs b/Ticket.bjs index e678f29a..df07b281 100644 --- a/Ticket.bjs +++ b/Ticket.bjs @@ -17,7 +17,7 @@ "title" : "Create a Ticket", "xtype" : "Dialog", "# GitRepo? repo" : "null", - "| void show" : "( GitRepo? repo ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) { // should not happen!!\n \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n \n\t\n\tthis.running = true;\n\t//GitMonitor.gitmonitor.stop();\n\t\n this.repo = repo;\n \n \n \n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n GLib.debug(\"Loading tickets\"); \n \n\n this.el.show_all();\n this.el.set_keep_above(true);\n \n\n\tRooProject? curproj = null;\n if (this.repo != null) {\n\t curproj = RooProject.getProjectByRepo(this.repo);\n }\n\t_this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n if (curproj != null) {\n \n\t\t\n\t\tvar rt = RooTicket.singleton();\n\t\trt.loadProjectOptions(curproj.id);\n\t\t\n\t\t_this.msmodel.loadMilestones();\n\t\t_this.primodel.loadPriorities();\n\t\t_this.sevmodel.loadSeverities();\n\t\t_this.clmodel.loadClassifications();\t\n\t\t_this.devmodel.loadDevelopers();\t\n\t\t\n }\n \t_this.summary.el.set_text(\"\");\n\t\t_this.description.el.buffer.text = \"\"; \n \n \n \tthis.el.run();\n\n}", + "| void show" : "( GitRepo? repo ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) { // should not happen!!\n \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n \n \n \t_this.el.show_all();\n this.el.set_keep_above(true);\t\n\t_this.table.el.hide();\n\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\t\n \n\t\n\tthis.running = true;\n\t//GitMonitor.gitmonitor.stop();\n\t\n this.repo = repo;\n \n \n \n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n GLib.debug(\"Loading tickets\"); \n \n\n\n\tRooProject? curproj = null;\n if (this.repo != null) {\n\t curproj = RooProject.getProjectByRepo(this.repo);\n }\n\t_this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n if (curproj != null) {\n \n\t\t\n\t\tvar rt = RooTicket.singleton();\n\t\trt.loadProjectOptions(curproj.id);\n\t\t\n\t\t_this.msmodel.loadMilestones();\n\t\t_this.primodel.loadPriorities();\n\t\t_this.sevmodel.loadSeverities();\n\t\t_this.clmodel.loadClassifications();\t\n\t\t_this.devmodel.loadDevelopers();\t\n\t\t\n }\n\t_this.summary.el.set_text(\"\");\n\t_this.description.el.buffer.text = \"\"; \n \n\n this.el.table.el.show();\n this.el.table.el.hide();\n\n \n\n \n \tthis.el.run();\n\n}", "default_height" : 200, "$ xns" : "Gtk", "# bool running" : false, diff --git a/Ticket.vala b/Ticket.vala index 76d25d1c..d137fe98 100644 --- a/Ticket.vala +++ b/Ticket.vala @@ -100,6 +100,15 @@ public class Ticket : Object GLib.error("new branch show called, when already being displayed?"); } + + _this.el.show_all(); + this.el.set_keep_above(true); + _this.table.el.hide(); + + _this.spinner.el.show(); + _this.spinner.el.start(); + + this.running = true; //GitMonitor.gitmonitor.stop(); @@ -114,9 +123,6 @@ public class Ticket : Object GLib.debug("Loading tickets"); - this.el.show_all(); - this.el.set_keep_above(true); - RooProject? curproj = null; if (this.repo != null) { @@ -136,9 +142,15 @@ public class Ticket : Object _this.devmodel.loadDevelopers(); } - _this.summary.el.set_text(""); - _this.description.el.buffer.text = ""; + _this.summary.el.set_text(""); + _this.description.el.buffer.text = ""; + + this.el.table.el.show(); + this.el.table.el.hide(); + + + this.el.run(); -- 2.39.2