X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=83284d2afce09c8149977a3a480ba42746c28754;hb=48b3d2b4281bfa78ae11b4dfb5f91d5475aefd90;hp=e456d65d3dd6c2fc3db790b41be025fb46f0f9ac;hpb=f631a04afe02c059dc7e5ae01ef69c2103e2e184;p=gitlive

diff --git a/NewBranch.vala b/NewBranch.vala
index e456d65d..83284d2a 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -54,7 +54,8 @@ public class NewBranch : Object
         	 GLib.debug("got %d", (int) response_id);
         });
         this.el.show.connect( (self)  => {
-          this.el.run();
+         
+        
           //test
         });
     }
@@ -62,8 +63,17 @@ public class NewBranch : Object
     // user defined functions
     public   void show ( ) 
     {
-        
+         // this.el.set_gravity(Gdk.Gravity.NORTH);
+         
+    	this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
+           	GLib.debug("Loading tickets"); 
+     	_this.dbmodel.loadTickets();
+    
         this.el.show_all();
+    
+    
+     
+        
           
     }
     public class Xcls_VBox2 : Object
@@ -102,11 +112,13 @@ public class NewBranch : Object
         public Xcls_Table3(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Table( 2, 2, true );
+            this.el = new Gtk.Table( 2, 2, false );
 
             // my vars (dec)
 
             // set gobject values
+            this.el.margin = 2;
+            this.el.column_spacing = 2;
             var child_0 = new Xcls_Label4( _this );
             child_0.ref();
             this.el.attach_defaults (  child_0.el , 0,1,0,1 );
@@ -176,6 +188,30 @@ public class NewBranch : Object
             // init method
 
             this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+
+            //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 (ticket_id == "") {
+            		_this.name.el.set_text("wip_NAME_DATE");
+            		return;
+            	}
+            	
+            	var ticket = RooTicket.singleton().getById(ticket_id);
+               
+            	_this.name.el.set_text("wip_NAME_T%s_%s".printf(ticket.id, ticket.summaryToBranchName()));
+            	
+            	//GLib.debug ("Selection: %s, %s\n", (string) val1, (string) val2);
+            });
         }
 
         // user defined functions
@@ -224,38 +260,38 @@ public class NewBranch : Object
         }
 
         // user defined functions
-        public void loadData (Gee.ArrayList<string> data, string cur) {
+        public void loadTickets () {
+        
+            RooTicket.singleton().loadTickets();
+            
+            
+        
             this.el.clear();                                    
             Gtk.TreeIter iter;
             var el = this.el;
             
-           /// el.append(out iter);
-            
-             
-           // el.set_value(iter, 0, "");
-           // el.set_value(iter, 1, "aaa  - Just add Element - aaa");
-        
             el.append(out iter);
         
             
             el.set_value(iter, 0, "");
-            el.set_value(iter, 1, "-- select a module --");
-            _this.build_module.el.set_active_iter(iter);
+            el.set_value(iter, 1, "-- select a ticket --");
             
-            for (var i = 0; i < data.size;i++) {
+            _this.build_module.el.set_active_iter(iter);
+            var tickets = RooTicket.singleton().tickets;
+            foreach(var ticket in tickets) {
             
         
                 el.append(out iter);
                 
-                el.set_value(iter, 0, data.get(i));
-                el.set_value(iter, 1, data.get(i));
+                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 (data.get(i) == cur) {
-                    _this.build_module.el.set_active_iter(iter);
-                }
+                //if (data.get(i) == cur) {
+                 //   _this.build_module.el.set_active_iter(iter);
+               // }
                 
             }
-             this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
+             //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
                                              
         }
     }
@@ -328,6 +364,7 @@ public class NewBranch : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.relief = Gtk.ReliefStyle.NONE;
             this.el.label = "Do not create Branch";
         }