X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=afe3c54a3250349dedf6591c81f8377993fa2398;hb=9c2e64777747848a1bcaad1d151d5a1c2a0d2719;hp=d41ec8b95f3588fd5492c963401150a4c1b0aa2b;hpb=ee1f416799a77142746e43d6982e2551d30c45ea;p=gitlive

diff --git a/NewBranch.vala b/NewBranch.vala
index d41ec8b9..afe3c54a 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -30,8 +30,8 @@ public class NewBranch : Object
     public Xcls_view view;
     public Xcls_table table;
     public Xcls_project_id project_id;
-    public Xcls_prcellrenderer prcellrenderer;
-    public Xcls_prmodel prmodel;
+    public Xcls_tprcellrenderer tprcellrenderer;
+    public Xcls_tprmodel tprmodel;
     public Xcls_summary summary;
     public Xcls_milestone_id milestone_id;
     public Xcls_msmodel msmodel;
@@ -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);
-        
-        
         
         
         
@@ -312,6 +301,28 @@ 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
     {
@@ -1232,10 +1243,10 @@ public class NewBranch : Object
             this.loading = false;
 
             // set gobject values
-            var child_0 = new Xcls_prcellrenderer( _this );
+            var child_0 = new Xcls_tprcellrenderer( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , true );
-            var child_1 = new Xcls_prmodel( _this );
+            var child_1 = new Xcls_tprmodel( _this );
             child_1.ref();
             this.el.set_model (  child_1.el  );
 
@@ -1293,7 +1304,7 @@ public class NewBranch : Object
          
          
         	this.el.get_active_iter (out iter);
-        	_this.prmodel.el.get_value (iter, 0, out val1);
+        	_this.tprmodel.el.get_value (iter, 0, out val1);
          
         
         	return  (string) val1;
@@ -1303,7 +1314,7 @@ public class NewBranch : Object
         	
         }
     }
-    public class Xcls_prcellrenderer : Object
+    public class Xcls_tprcellrenderer : Object
     {
         public Gtk.CellRendererText el;
         private NewBranch  _this;
@@ -1312,10 +1323,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_prcellrenderer(NewBranch _owner )
+        public Xcls_tprcellrenderer(NewBranch _owner )
         {
             _this = _owner;
-            _this.prcellrenderer = this;
+            _this.tprcellrenderer = this;
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
@@ -1326,7 +1337,7 @@ public class NewBranch : Object
         // user defined functions
     }
 
-    public class Xcls_prmodel : Object
+    public class Xcls_tprmodel : Object
     {
         public Gtk.ListStore el;
         private NewBranch  _this;
@@ -1335,10 +1346,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_prmodel(NewBranch _owner )
+        public Xcls_tprmodel(NewBranch _owner )
         {
             _this = _owner;
-            _this.prmodel = this;
+            _this.tprmodel = this;
             this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
 
             // my vars (dec)