X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=MergeBranch.vala;fp=MergeBranch.vala;h=e827bfa33963670d5c19d0736177d8b5455b202d;hp=61e267aa433ed0925f351d2ebc220c973759bb79;hb=f00d2a709d93776e6aa3003def747143ab049b78;hpb=9df01e59458293cdac3f984d7bc8f63055640e19

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 61e267aa..e827bfa3 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -477,6 +477,7 @@ public class MergeBranch : Object
             // init method
 
             this.el.set_entry_text_column(1);
+            this.el.get_child().set_sensitive(false);
 
             //listeners
             this.el.changed.connect( () => {
@@ -651,13 +652,12 @@ public class MergeBranch : Object
         {
             _this = _owner;
             _this.ticketsel = this;
-            this.el = new Gtk.ComboBox();
+            this.el = new Gtk.ComboBox.with_entry();
 
             // my vars (dec)
-            this.loading = true;
+            this.loading = false;
 
             // set gobject values
-            this.el.hexpand = true;
             var child_0 = new Xcls_dbcellrenderer( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , true );
@@ -667,18 +667,18 @@ public class MergeBranch : Object
 
             // init method
 
-            this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+            //this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+            this.el.set_entry_text_column(1);
+            this.el.get_child().set_sensitive(false);
 
             //listeners
             this.el.changed.connect( () => {
             	if (this.loading) {
             		return;
             	}
+            	  
             	_this.view.loadTicket(this.selectedTicketId());
-            	 
-              	_this.name.updateText();
-            	//_this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
-            	
+            	 _this.name.updateText();
             	//GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
             });
         }
@@ -689,7 +689,10 @@ public class MergeBranch : Object
         	Value val1;
          
          
-        	this.el.get_active_iter (out iter);
+        	if (!this.el.get_active_iter (out iter)) {
+        		return "";
+        	}
+        	 
         	_this.dbmodel.el.get_value (iter, 0, out val1);
          
         
@@ -744,10 +747,18 @@ public class MergeBranch : Object
         }
 
         // user defined functions
-        public void loadTickets (string project_id) {
+        public void loadTickets (string project_id  ) {
+        
         
-            RooTicket.singleton().loadTickets(project_id,RooTicket.Who.ME, RooTicket.Status.ACTIVE);
             
+            // fixme .. get project id from selection..
+            
+             RooTicket.singleton().loadTickets(
+         			project_id,
+         			_this.btn_not_me.el.active ? RooTicket.Who.ANYBODY :  RooTicket.Who.ME,
+         			 _this.btn_closed.el.active ? RooTicket.Status.ALL :  RooTicket.Status.ACTIVE
+        		 );
+                
             _this.ticketsel.loading = true;
         
             this.el.clear();                                    
@@ -755,6 +766,8 @@ public class MergeBranch : Object
             var el = this.el;
             
             el.append(out iter);
+        
+            
             el.set_value(iter, 0, "");
             el.set_value(iter, 1, "-- select a ticket --");
             
@@ -765,8 +778,7 @@ public class MergeBranch : Object
         		el.set_value(iter, 0, "-1");
         		el.set_value(iter, 1, "Temporary Branch - No ticket specified/relivant");
                 _this.ticketsel.el.set_active_iter(iter);	
-            }
-            
+             }
             
             
             
@@ -774,12 +786,13 @@ public class MergeBranch : Object
             foreach(var ticket in tickets) {
             
                 el.append(out iter);
-        
+                
                 el.set_value(iter, 0, ticket.id);
                 el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
-        		if (_this.ticket != null && _this.ticket.id == ticket.id) {
+                
+                if (_this.ticket != null && _this.ticket.id == ticket.id) {
         		    _this.ticketsel.el.set_active_iter(iter);
-        	    }
+                }
                 
             }
             
@@ -967,7 +980,7 @@ public class MergeBranch : Object
         // user defined functions
         public void updateText () {
         	var ticket_id = _this.ticketsel.selectedTicketId();
-        	
+        	 
         	RooTicket ticket = null;
         	if (ticket_id.length > 0){
         		ticket = RooTicket.singleton().getById(ticket_id);