MergeBranch.bjs

MergeBranch.vala

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 4d6f17b..ab99969 100644 (file)
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -17,7 +17,7 @@
    "$ deletable" : true,
    "title" : "Merge Branch",
    "xtype" : "Dialog",
    "$ 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",
    "default_height" : 200,
    "# RooTicket? ticket" : "null",
    "$ xns" : "Gtk",

diff --git a/MergeBranch.vala b/MergeBranch.vala
index e717afc..8934219 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -123,14 +123,24 @@ public class MergeBranch : Object
        }
        GitMonitor.gitmonitor.stop();
        
        }
        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.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);
        _this.dbmodel.loadTickets();
        _this.actionmodel.loadActions();
        _this.view.loadTicket(ticket.id);