NewBranch.bjs

NewBranch.vala

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 6d172ad..c93cc06 100644 (file)
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -17,7 +17,7 @@
    "title" : "Create a working branch ",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",
-   "|   void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \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\tthis.queue = queue;\n\t\n\tthis.running  = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n    this.repo = repo;\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    var curproj = RooProject.getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.createbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n    _this.view.loadTicket(tid);\n    \n    \n    \n    \n    \n    \n    \n \tthis.el.run();\n\n}",
+   "|   void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \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\t\n\t\n\tthis.queue = queue;\n\tthis.running  = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n\t\n    this.repo = repo;\n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n\t\n\t\n\t\n\t\n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n\t\n\t_this.select_ticket_tab.load_data();\n\t_this.create_ticket_tab.load_data();\n\t_this.quick_commit_tab.load_data();\n   \n   \n    \n    \n    \n    \n    \n \tthis.el.run();\n\n}",
    "default_height" : 500,
    "$ xns" : "Gtk",
    "# bool running" : false,
@@ -56,7 +56,7 @@
        "bool homogeneous" : false,
        "* pack" : "append_page,_this.label_select_ticket.el",
        "xtype" : "Box",
-       "| void load_data" : "() {\n\n}\n",
+       "| void load_data" : "() {\n\n    GLib.debug(\"Loading tickets\"); \n    \n    var curproj = RooProject.getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.createbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n    _this.view.loadTicket(tid);\n    \n    \n}\n",
        "$ xns" : "Gtk",
        "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
        "items" : [

diff --git a/NewBranch.vala b/NewBranch.vala
index dac5d5c..cb191c5 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -135,41 +135,30 @@ public class NewBranch : Object
         if (this.running) { // should not happen!!
                GLib.error("new branch show called, when already being displayed?");
        }
-       this.queue = queue;
        
+       
+       this.queue = queue;
        this.running  = true;
        GitMonitor.gitmonitor.stop();
        
+       
         this.repo = repo;
-        
-         
-        
        this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
        this.el.set_default_size( 500,200); // not sure why it grows..
-        GLib.debug("Loading tickets"); 
+       
+       
+       
+       
          
     
         this.el.show_all();
         this.el.set_keep_above(true);
+       
+       _this.select_ticket_tab.load_data();
+       _this.create_ticket_tab.load_data();
+       _this.quick_commit_tab.load_data();
+       
        
-        
-        var curproj = RooProject.getProjectByRepo(this.repo);
-         _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
-        
-       _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
-       _this.createbtn.updateState();
-       
-       _this.ticketsel.el.get_child().get_style_context().remove_class("warning");
-       if (tid != "") { 
-               var name = RooTicket.singleton().usernameLocal();
-               var ticket = RooTicket.singleton().getById(tid);
-               _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
-       } else {
-               _this.ticketsel.el.get_child().get_style_context().add_class("warning");
-       }
-        _this.view.loadTicket(tid);
-        
-        
         
         
         
@@ -314,6 +303,25 @@ public class NewBranch : Object
         // user defined functions
         public void load_data () {
         
+            GLib.debug("Loading tickets"); 
+            
+            var curproj = RooProject.getProjectByRepo(this.repo);
+             _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
+            
+               _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
+               _this.createbtn.updateState();
+               
+               _this.ticketsel.el.get_child().get_style_context().remove_class("warning");
+               if (tid != "") { 
+                       var name = RooTicket.singleton().usernameLocal();
+                       var ticket = RooTicket.singleton().getById(tid);
+                       _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+               } else {
+                       _this.ticketsel.el.get_child().get_style_context().add_class("warning");
+               }
+            _this.view.loadTicket(tid);
+            
+            
         }
     }
     public class Xcls_Table7 : Object