X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.vala;h=74d09e052442d47926b424ffdd209667c387e4aa;hp=e65ba333437f03a15e921e9d2482ad731eb78543;hb=0c10a808ad544684bdda587cb45daeed6cc039b9;hpb=a0ec8a45c3f658481ca0862e52c737efbc6bd79f

diff --git a/NewBranch.vala b/NewBranch.vala
index e65ba333..74d09e05 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -12,12 +12,14 @@ public class NewBranch : Object
         }
         return _NewBranch;
     }
-    public Xcls_build_module build_module;
+    public Xcls_ticketsel ticketsel;
     public Xcls_dbcellrenderer dbcellrenderer;
     public Xcls_dbmodel dbmodel;
     public Xcls_name name;
 
         // my vars (def)
+    public GitRepo? repo;
+    public bool running;
 
     // ctor
     public NewBranch()
@@ -26,6 +28,8 @@ public class NewBranch : Object
         this.el = new Gtk.Dialog();
 
         // my vars (dec)
+        this.repo = null;
+        this.running = false;
 
         // set gobject values
         this.el.title = "Create a working branch ";
@@ -46,6 +50,7 @@ public class NewBranch : Object
         //listeners
         this.el.delete_event.connect( (self, event) => {
             this.el.hide();
+            this.running = false;
             return true; 
             //test  
         });
@@ -53,9 +58,12 @@ public class NewBranch : Object
           
         	GLib.debug("got %d", (int) response_id);
         	if (response_id == 0) {
-        	    _this.el.hide();	 
+        	    _this.el.hide();	
+        	    this.running = false; 
+        		GitMonitor.gitmonitor.start();	    
         	 	return;
         	}
+        	 
         	// have they selected a ticket..
         	// make that the current active ticket?
         	// we really need to store locally what ticket is being worked on..
@@ -63,8 +71,18 @@ public class NewBranch : Object
         	// -- each repo would have their active ticket (only one per repo)
         	// -- so we could just store that in there
         	// -- initial load can check the contents of the ticket files on first scan.
-        
+        	var ticket_id = _this.ticketsel.selectedTicketId();
         	
+            if (this.repo != null) {
+            	var bn = _this.name.el.get_text();
+            	if (ticket_id != "" ) {
+        			this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
+        		} else {
+        			this.repo.createBranchNamed(bn);
+        		}
+            }
+        	GitMonitor.gitmonitor.start();
+        		    this.running = false; 
         
         	 
         	 
@@ -80,20 +98,24 @@ public class NewBranch : Object
     }
 
     // user defined functions
-    public   void show ( ) 
+    public   void show ( GitRepo repo ) 
     {
          // this.el.set_gravity(Gdk.Gravity.NORTH);
-         
+        if (this.running) {
+        	return;
+    	}
+    	this.running  = true;
+    	GitMonitor.gitmonitor.stop();
+    	
+        this.repo = repo;
+        
     	this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
            	GLib.debug("Loading tickets"); 
-     	_this.dbmodel.loadTickets();
     
-        this.el.show_all();
     
+        this.el.show_all();
+     	_this.dbmodel.loadTickets();
     
-     
-        
-          
     }
     public class Xcls_VBox2 : Object
     {
@@ -141,7 +163,7 @@ public class NewBranch : Object
             var child_0 = new Xcls_Label4( _this );
             child_0.ref();
             this.el.attach_defaults (  child_0.el , 0,1,0,1 );
-            var child_1 = new Xcls_build_module( _this );
+            var child_1 = new Xcls_ticketsel( _this );
             child_1.ref();
             this.el.attach_defaults (  child_1.el , 1,2,0,1 );
             var child_2 = new Xcls_Label8( _this );
@@ -179,22 +201,24 @@ public class NewBranch : Object
         // user defined functions
     }
 
-    public class Xcls_build_module : Object
+    public class Xcls_ticketsel : Object
     {
         public Gtk.ComboBox el;
         private NewBranch  _this;
 
 
             // my vars (def)
+        public bool loading;
 
         // ctor
-        public Xcls_build_module(NewBranch _owner )
+        public Xcls_ticketsel(NewBranch _owner )
         {
             _this = _owner;
-            _this.build_module = this;
+            _this.ticketsel = this;
             this.el = new Gtk.ComboBox();
 
             // my vars (dec)
+            this.loading = false;
 
             // set gobject values
             var child_0 = new Xcls_dbcellrenderer( _this );
@@ -210,25 +234,21 @@ public class NewBranch : Object
 
             //listeners
             this.el.changed.connect( () => {
-            	Gtk.TreeIter iter;
-            	Value val1;
-            	Value val2;
-             
-            	this.el.get_active_iter (out iter);
-            	_this.dbmodel.el.get_value (iter, 0, out val1);
-            	_this.dbmodel.el.get_value (iter, 1, out val2);
-            
-            	var ticket_id = (string) val1;
+            	if (this.loading) {
+            		return;
+            	}
+            	var ticket_id = this.selectedTicketId();
             	
             	var name = RooTicket.singleton().usernameLocal();
             	
-            	if (ticket_id == "") {
+            	if (ticket_id == "" || ticket_id == null) {
             	
             		var dt = new  DateTime.now_local();
             		_this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
             		return;
             	}
             	
+            	
             	var ticket = RooTicket.singleton().getById(ticket_id);
                
             	_this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
@@ -238,6 +258,21 @@ public class NewBranch : Object
         }
 
         // user defined functions
+        public string selectedTicketId () {
+        Gtk.TreeIter iter;
+        	Value val1;
+         
+         
+        	this.el.get_active_iter (out iter);
+        	_this.dbmodel.el.get_value (iter, 0, out val1);
+         
+        
+        	return  (string) val1;
+        	
+        	
+        	
+        	
+        }
     }
     public class Xcls_dbcellrenderer : Object
     {
@@ -287,7 +322,7 @@ public class NewBranch : Object
         
             RooTicket.singleton().loadTickets();
             
-            
+            _this.ticketsel.loading = true;
         
             this.el.clear();                                    
             Gtk.TreeIter iter;
@@ -299,11 +334,10 @@ public class NewBranch : Object
             el.set_value(iter, 0, "");
             el.set_value(iter, 1, "-- select a ticket --");
             
-            _this.build_module.el.set_active_iter(iter);
+            _this.ticketsel.el.set_active_iter(iter);
             var tickets = RooTicket.singleton().tickets;
             foreach(var ticket in tickets) {
             
-        
                 el.append(out iter);
                 
                 el.set_value(iter, 0, ticket.id);
@@ -314,6 +348,8 @@ public class NewBranch : Object
                // }
                 
             }
+            
+            _this.ticketsel.loading = false;
              //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
                                              
         }