Uncommited changes synced
[gitlive] / NewBranch.vala
index e75d2d5..c9bff82 100644 (file)
@@ -1,39 +1,45 @@
-static Xcls_DialogNewComponent  _DialogNewComponent;
+static NewBranch  _NewBranch;
 
-public class Xcls_DialogNewComponent : Object
+public class NewBranch : Object
 {
     public Gtk.Dialog el;
-    private Xcls_DialogNewComponent  _this;
+    private NewBranch  _this;
 
-    public static Xcls_DialogNewComponent singleton()
+    public static NewBranch singleton()
     {
-        if (_DialogNewComponent == null) {
-            _DialogNewComponent= new Xcls_DialogNewComponent();
+        if (_NewBranch == null) {
+            _NewBranch= new NewBranch();
         }
-        return _DialogNewComponent;
+        return _NewBranch;
     }
-    public Xcls_name name;
-    public Xcls_title title;
-    public Xcls_region region;
-    public Xcls_parent parent;
-    public Xcls_permname permname;
-    public Xcls_modOrder modOrder;
-    public Xcls_build_module build_module;
+    public Xcls_projectsel projectsel;
+    public Xcls_prcellrenderer prcellrenderer;
+    public Xcls_prmodel prmodel;
+    public Xcls_ticketsel ticketsel;
     public Xcls_dbcellrenderer dbcellrenderer;
     public Xcls_dbmodel dbmodel;
+    public Xcls_name name;
+    public Xcls_btn_not_me btn_not_me;
+    public Xcls_btn_closed btn_closed;
 
         // my vars (def)
+    public GitRepo? repo;
+    public bool running;
+    public Gee.ArrayList<GitMonitorQueue> queue;
 
     // ctor
-    public Xcls_DialogNewComponent()
+    public NewBranch()
     {
         _this = this;
         this.el = new Gtk.Dialog();
 
         // my vars (dec)
+        this.repo = null;
+        this.running = false;
+        this.queue = null;
 
         // set gobject values
-        this.el.title = "New Component";
+        this.el.title = "Create a working branch ";
         this.el.default_height = 200;
         this.el.default_width = 500;
         this.el.deletable = true;
@@ -41,12 +47,6 @@ public class Xcls_DialogNewComponent : Object
         var child_0 = new Xcls_VBox2( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
-        var child_1 = new Xcls_Button20( _this );
-        child_1.ref();
-        this.el.add_action_widget (  child_1.el , 0 );
-        var child_2 = new Xcls_Button21( _this );
-        child_2.ref();
-        this.el.add_action_widget (  child_2.el , 1 );
 
         //listeners
         this.el.delete_event.connect( (self, event) => {
@@ -56,60 +56,94 @@ public class Xcls_DialogNewComponent : Object
         });
         this.el.response.connect( (self, response_id) =>  { 
           
+               GLib.debug("got %d", (int) response_id);
+               if (response_id < 1) {
+                   _this.el.hide();    
+                   this.running = false; 
+                       return;
+               }
                 
-        });
-        this.el.show.connect( (self)  => {
-          this.el.show_all();
-          //test
-        });
-    }
-
-    // user defined functions
-    public   void updateFileFromEntry () {
-    
-            _this.file.title = _this.title.el.get_text();
-            _this.file.region = _this.region.el.get_text();            
-            _this.file.parent = _this.parent.el.get_text();                        
-            _this.file.permname = _this.permname.el.get_text();                                    
-            _this.file.modOrder = _this.modOrder.el.get_text();
-            
-            if (_this.file.name.length  > 0 && _this.file.name != _this.name.el.get_text()) {
-                _this.file.renameTo(_this.name.el.get_text());
-            }
-            // store the module...
-            _this.file.build_module = "";        
-             Gtk.TreeIter iter; 
-            if (_this.build_module.el.get_active_iter (out iter)) {
-                 Value vfname;
-                 this.dbmodel.el.get_value (iter, 0, out vfname);
-                 if (((string)vfname).length > 0) {
-                     _this.file.build_module = (string)vfname;
-                 }
+               // have they selected a ticket..
+               // make that the current active ticket?
+               // we really need to store locally what ticket is being worked on..
+               // in theory we could be working on multiple project and not merging..
+               // -- 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();
         
+                       var res = this.repo.setActiveTicket(                    
+                                RooTicket.singleton().getById(ticket_id != "" ? ticket_id : "-1"), bn
+                        );
+                        if (res) {
+                               // start the monitoring..
+                                GitMonitor.gitmonitor.start();
+                                
+                        }
             }
             
-            
-    
-                                                        
+        
+            this.running = false; 
+        
+               this.el.hide();
+                
+                
+        
+                
+        });
     }
-    public   void show ( ) 
+
+    // user defined functions
+    public   void show ( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = "" ) 
     {
+         // this.el.set_gravity(Gdk.Gravity.NORTH);
+        if (this.running) { // should not happen!!
+               GLib.error("new branch show called, when already being displayed?");
+       }
+       this.queue = queue;
+       
+       this.running  = true;
+       GitMonitor.gitmonitor.stop();
+       
+        this.repo = repo;
         
+         
         
-        //this.success = c.success;
+       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);
+       
         
+        var curproj = RooTicket.singleton().getProjectByRepo(this.repo);
+         _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
         
+       _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
+       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()));
+       }
+    
+       this.el.run();
+    
     }
     public class Xcls_VBox2 : Object
     {
         public Gtk.VBox el;
-        private Xcls_DialogNewComponent  _this;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_VBox2(Xcls_DialogNewComponent _owner )
+        public Xcls_VBox2(NewBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.VBox( true, 0 );
@@ -127,62 +161,51 @@ public class Xcls_DialogNewComponent : Object
     public class Xcls_Table3 : Object
     {
         public Gtk.Table el;
-        private Xcls_DialogNewComponent  _this;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Table3(Xcls_DialogNewComponent _owner )
+        public Xcls_Table3(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Table( 3, 2, true );
+            this.el = new Gtk.Table( 5, 5, true );
 
             // my vars (dec)
 
             // set gobject values
+            this.el.expand = false;
+            this.el.margin = 2;
+            this.el.column_spacing = 4;
+            this.el.vexpand = false;
             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_name( _this );
+            var child_1 = new Xcls_Label5( _this );
             child_1.ref();
             this.el.attach_defaults (  child_1.el , 1,2,0,1 );
-            var child_2 = new Xcls_Label6( _this );
+            var child_2 = new Xcls_projectsel( _this );
             child_2.ref();
             this.el.attach_defaults (  child_2.el , 0,1,1,2 );
-            var child_3 = new Xcls_title( _this );
+            var child_3 = new Xcls_ticketsel( _this );
             child_3.ref();
-            this.el.attach_defaults (  child_3.el , 1,2,1,2 );
-            var child_4 = new Xcls_Label8( _this );
+            this.el.attach_defaults (  child_3.el , 1,4,1,2 );
+            var child_4 = new Xcls_Button12( _this );
             child_4.ref();
-            this.el.attach_defaults (  child_4.el , 0,1,2,3 );
-            var child_5 = new Xcls_region( _this );
+            this.el.attach_defaults (  child_4.el , 4,5,1,2 );
+            var child_5 = new Xcls_Label13( _this );
             child_5.ref();
-            this.el.attach_defaults (  child_5.el , 1,2,2,3 );
-            var child_6 = new Xcls_Label10( _this );
+            this.el.attach_defaults (  child_5.el , 0,1,3,4 );
+            var child_6 = new Xcls_name( _this );
             child_6.ref();
-            this.el.attach_defaults (  child_6.el , 0,1,3,4 );
-            var child_7 = new Xcls_parent( _this );
+            this.el.attach_defaults (  child_6.el , 0,4,4,5 );
+            var child_7 = new Xcls_Button15( _this );
             child_7.ref();
-            this.el.attach_defaults (  child_7.el , 1,2,3,4 );
-            var child_8 = new Xcls_Label12( _this );
+            this.el.attach_defaults (  child_7.el , 4,5,4,5 );
+            var child_8 = new Xcls_Box16( _this );
             child_8.ref();
-            this.el.attach_defaults (  child_8.el , 0,1,4,5 );
-            var child_9 = new Xcls_permname( _this );
-            child_9.ref();
-            this.el.attach_defaults (  child_9.el , 1,2,4,5 );
-            var child_10 = new Xcls_Label14( _this );
-            child_10.ref();
-            this.el.attach_defaults (  child_10.el , 0,1,5,6 );
-            var child_11 = new Xcls_modOrder( _this );
-            child_11.ref();
-            this.el.attach_defaults (  child_11.el , 1,2,5,6 );
-            var child_12 = new Xcls_Label16( _this );
-            child_12.ref();
-            this.el.attach_defaults (  child_12.el , 0,1,6,7 );
-            var child_13 = new Xcls_build_module( _this );
-            child_13.ref();
-            this.el.attach_defaults (  child_13.el , 1,2,6,7 );
+            this.el.attach_defaults (  child_8.el , 0,5,2,3 );
         }
 
         // user defined functions
@@ -190,286 +213,449 @@ public class Xcls_DialogNewComponent : Object
     public class Xcls_Label4 : Object
     {
         public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Label4(Xcls_DialogNewComponent _owner )
+        public Xcls_Label4(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Component Name" );
+            this.el = new Gtk.Label( "Project" );
 
             // my vars (dec)
 
             // set gobject values
+            this.el.halign = Gtk.Align.START;
             this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
-        }
-
-        // user defined functions
-    }
-
-    public class Xcls_name : Object
-    {
-        public Gtk.Entry el;
-        private Xcls_DialogNewComponent  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_name(Xcls_DialogNewComponent _owner )
-        {
-            _this = _owner;
-            _this.name = this;
-            this.el = new Gtk.Entry();
-
-            // my vars (dec)
-
-            // set gobject values
             this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_Label6 : Object
+    public class Xcls_Label5 : Object
     {
         public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Label6(Xcls_DialogNewComponent _owner )
+        public Xcls_Label5(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Title" );
+            this.el = new Gtk.Label( "Ticket" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
+            this.el.halign = Gtk.Align.START;
             this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_title : Object
+    public class Xcls_projectsel : Object
     {
-        public Gtk.Entry el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.ComboBox el;
+        private NewBranch  _this;
 
 
             // my vars (def)
+        public bool loading;
 
         // ctor
-        public Xcls_title(Xcls_DialogNewComponent _owner )
+        public Xcls_projectsel(NewBranch _owner )
         {
             _this = _owner;
-            _this.title = this;
-            this.el = new Gtk.Entry();
+            _this.projectsel = this;
+            this.el = new Gtk.ComboBox.with_entry();
 
             // my vars (dec)
+            this.loading = false;
 
             // set gobject values
-            this.el.visible = true;
+            var child_0 = new Xcls_prcellrenderer( _this );
+            child_0.ref();
+            this.el.pack_start (  child_0.el , true );
+            var child_1 = new Xcls_prmodel( _this );
+            child_1.ref();
+            this.el.set_model (  child_1.el  );
+
+            // init method
+
+            this.el.set_entry_text_column(1);
+
+            //listeners
+            this.el.changed.connect( () => {
+               if (this.loading) {
+                       return;
+               }
+               var project_id = this.selectedProjectId();
+               _this.dbmodel.loadTickets(project_id);
+               
+               
+               /*if (this.loading) {
+                       return;
+               }
+               var ticket_id = this.selectedTicketId();
+               
+               var name = RooTicket.singleton().usernameLocal();
+               
+               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()));
+               
+               //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
+               */
+            });
         }
 
         // user defined functions
+        public string selectedProjectId () {
+               Gtk.TreeIter iter;
+               Value val1;
+         
+         
+               this.el.get_active_iter (out iter);
+               _this.prmodel.el.get_value (iter, 0, out val1);
+         
+        
+               return  (string) val1;
+               
+               
+               
+               
+        }
     }
-
-    public class Xcls_Label8 : Object
+    public class Xcls_prcellrenderer : Object
     {
-        public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.CellRendererText el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Label8(Xcls_DialogNewComponent _owner )
+        public Xcls_prcellrenderer(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Region" );
+            _this.prcellrenderer = this;
+            this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
-            this.el.tooltip_text = "center, north, south, east, west";
-            this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_region : Object
+    public class Xcls_prmodel : Object
     {
-        public Gtk.Entry el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.ListStore el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_region(Xcls_DialogNewComponent _owner )
+        public Xcls_prmodel(NewBranch _owner )
         {
             _this = _owner;
-            _this.region = this;
-            this.el = new Gtk.Entry();
+            _this.prmodel = this;
+            this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.visible = true;
         }
 
         // user defined functions
+        public void loadProjects (string id) {
+        
+            var rt = RooTicket.singleton();
+            rt.loadProjects();
+            
+            _this.projectsel.loading = true;
+        
+            this.el.clear();                                    
+            Gtk.TreeIter iter;
+            var el = this.el;
+            
+            el.append(out iter);
+        
+            
+            el.set_value(iter, 0, "");
+            el.set_value(iter, 1, "-- select a project --");
+            if (id == "") {
+                   _this.projectsel.el.set_active_iter(iter);
+            }
+            var projects = rt.projects;
+            foreach(var project in projects) {
+            
+                el.append(out iter);
+                
+                el.set_value(iter, 0, project.id);
+                el.set_value(iter, 1,  project.name );
+                if (id == project.id) {
+                          _this.projectsel.el.set_active_iter(iter);
+                   }   
+                
+            }
+            
+            _this.projectsel.loading = false;
+             //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
+                                             
+        }
     }
 
-    public class Xcls_Label10 : Object
+
+    public class Xcls_ticketsel : Object
     {
-        public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.ComboBox el;
+        private NewBranch  _this;
 
 
             // my vars (def)
+        public bool loading;
 
         // ctor
-        public Xcls_Label10(Xcls_DialogNewComponent _owner )
+        public Xcls_ticketsel(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Parent Name" );
+            _this.ticketsel = this;
+            this.el = new Gtk.ComboBox.with_entry();
 
             // my vars (dec)
+            this.loading = false;
 
             // set gobject values
-            this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
-            this.el.visible = true;
+            var child_0 = new Xcls_dbcellrenderer( _this );
+            child_0.ref();
+            this.el.pack_start (  child_0.el , true );
+            var child_1 = new Xcls_dbmodel( _this );
+            child_1.ref();
+            this.el.set_model (  child_1.el  );
+
+            // init method
+
+            //this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+            this.el.set_entry_text_column(1);
+
+            //listeners
+            this.el.changed.connect( () => {
+               if (this.loading) {
+                       return;
+               }
+               var ticket_id = this.selectedTicketId();
+               
+               var name = RooTicket.singleton().usernameLocal();
+               
+               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()));
+               
+               //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
+            });
         }
 
         // 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_parent : Object
+    public class Xcls_dbcellrenderer : Object
     {
-        public Gtk.Entry el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.CellRendererText el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_parent(Xcls_DialogNewComponent _owner )
+        public Xcls_dbcellrenderer(NewBranch _owner )
         {
             _this = _owner;
-            _this.parent = this;
-            this.el = new Gtk.Entry();
+            _this.dbcellrenderer = this;
+            this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_Label12 : Object
+    public class Xcls_dbmodel : Object
     {
-        public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.ListStore el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Label12(Xcls_DialogNewComponent _owner )
+        public Xcls_dbmodel(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Permission Name" );
+            _this.dbmodel = this;
+            this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
-            this.el.visible = true;
         }
 
         // user defined functions
+        public void loadTickets (string project_id , string tid = "") {
+        
+        
+            
+            // 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();                                    
+            Gtk.TreeIter iter;
+            var el = this.el;
+            
+            el.append(out iter);
+        
+            
+            el.set_value(iter, 0, "");
+            el.set_value(iter, 1, "-- select a ticket --");
+            
+            _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);
+                el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
+                
+                if (ticket.id == tid) {
+                           _this.ticketsel.el.set_active_iter(iter);
+                }
+                
+            }
+            
+            _this.ticketsel.loading = false;
+             //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
+                                             
+        }
     }
 
-    public class Xcls_permname : Object
+
+    public class Xcls_Button12 : Object
     {
-        public Gtk.Entry el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.Button el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_permname(Xcls_DialogNewComponent _owner )
+        public Xcls_Button12(NewBranch _owner )
         {
             _this = _owner;
-            _this.permname = this;
-            this.el = new Gtk.Entry();
+            this.el = new Gtk.Button();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.visible = true;
+            this.el.expand = false;
+            this.el.label = "New Ticket";
+
+            //listeners
+            this.el.clicked.connect( () => {
+                _this.el.response(-1);
+               Ticket.singleton().show(_this.repo);
+            
+            });
         }
 
         // user defined functions
     }
 
-    public class Xcls_Label14 : Object
+    public class Xcls_Label13 : Object
     {
         public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Label14(Xcls_DialogNewComponent _owner )
+        public Xcls_Label13(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Order (for tabs)" );
+            this.el = new Gtk.Label( "Use this as branch name" );
 
             // my vars (dec)
 
             // set gobject values
+            this.el.halign = Gtk.Align.START;
             this.el.justify = Gtk.Justification.RIGHT;
             this.el.xalign = 0.900000f;
-            this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_modOrder : Object
+    public class Xcls_name : Object
     {
         public Gtk.Entry el;
-        private Xcls_DialogNewComponent  _this;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_modOrder(Xcls_DialogNewComponent _owner )
+        public Xcls_name(NewBranch _owner )
         {
             _this = _owner;
-            _this.modOrder = this;
+            _this.name = this;
             this.el = new Gtk.Entry();
 
             // my vars (dec)
@@ -481,190 +667,169 @@ public class Xcls_DialogNewComponent : Object
         // user defined functions
     }
 
-    public class Xcls_Label16 : Object
+    public class Xcls_Button15 : Object
     {
-        public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.Button el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Label16(Xcls_DialogNewComponent _owner )
+        public Xcls_Button15(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Label( "Module to build (Vala only)" );
+            this.el = new Gtk.Button();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
-            this.el.visible = true;
+            this.el.label = "Create Branch";
+
+            // init method
+
+            {
+               this.el.get_style_context().add_class("suggested-action");
+            }
+
+            //listeners
+            this.el.clicked.connect( () => {
+               GLib.debug("fire response = 1");
+               _this.el.response(1);
+            });
         }
 
         // user defined functions
     }
 
-    public class Xcls_build_module : Object
+    public class Xcls_Box16 : Object
     {
-        public Gtk.ComboBox el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.Box el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_build_module(Xcls_DialogNewComponent _owner )
+        public Xcls_Box16(NewBranch _owner )
         {
             _this = _owner;
-            _this.build_module = this;
-            this.el = new Gtk.ComboBox();
+            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
 
             // my vars (dec)
 
             // set gobject values
-            var child_0 = new Xcls_dbcellrenderer( _this );
+            var child_0 = new Xcls_btn_not_me( _this );
             child_0.ref();
-            this.el.pack_start (  child_0.el , true );
-            var child_1 = new Xcls_dbmodel( _this );
+            this.el.add (  child_0.el  );
+            var child_1 = new Xcls_btn_closed( _this );
             child_1.ref();
-            this.el.set_model (  child_1.el  );
-
-            // init method
-
-            this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+            this.el.add (  child_1.el  );
+            var child_2 = new Xcls_Label19( _this );
+            child_2.ref();
+            this.el.add (  child_2.el  );
         }
 
         // user defined functions
     }
-    public class Xcls_dbcellrenderer : Object
+    public class Xcls_btn_not_me : Object
     {
-        public Gtk.CellRendererText el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.CheckButton el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_dbcellrenderer(Xcls_DialogNewComponent _owner )
+        public Xcls_btn_not_me(NewBranch _owner )
         {
             _this = _owner;
-            _this.dbcellrenderer = this;
-            this.el = new Gtk.CellRendererText();
+            _this.btn_not_me = this;
+            this.el = new Gtk.CheckButton();
 
             // my vars (dec)
 
             // set gobject values
+            this.el.label = "Show tickets not assigned to me";
+
+            //listeners
+            this.el.toggled.connect( () => {
+               var project_id = _this.projectsel.selectedProjectId();
+               _this.dbmodel.loadTickets(project_id);  
+            });
         }
 
         // user defined functions
     }
 
-    public class Xcls_dbmodel : Object
+    public class Xcls_btn_closed : Object
     {
-        public Gtk.ListStore el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.CheckButton el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_dbmodel(Xcls_DialogNewComponent _owner )
+        public Xcls_btn_closed(NewBranch _owner )
         {
             _this = _owner;
-            _this.dbmodel = this;
-            this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
+            _this.btn_closed = this;
+            this.el = new Gtk.CheckButton();
 
             // my vars (dec)
 
             // set gobject values
+            this.el.label = "Show closed Tickets";
+
+            //listeners
+            this.el.toggled.connect( () => {
+               var project_id = _this.projectsel.selectedProjectId();
+               _this.dbmodel.loadTickets(project_id);  
+                
+            });
         }
 
         // user defined functions
-        public void loadData (Gee.ArrayList<string> data, string cur) {
-            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);
-            
-            for (var i = 0; i < data.size;i++) {
-            
-        
-                el.append(out iter);
-                
-                el.set_value(iter, 0, data.get(i));
-                el.set_value(iter, 1, data.get(i));
-                
-                if (data.get(i) == cur) {
-                    _this.build_module.el.set_active_iter(iter);
-                }
-                
-            }
-             this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
-                                             
-        }
     }
 
-
-
-
-    public class Xcls_Button20 : Object
+    public class Xcls_Label19 : Object
     {
-        public Gtk.Button el;
-        private Xcls_DialogNewComponent  _this;
+        public Gtk.Label el;
+        private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button20(Xcls_DialogNewComponent _owner )
+        public Xcls_Label19(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.Label( "<a href=\"refresh\">Refresh Ticket list</a>" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Cancel";
+            this.el.halign = Gtk.Align.END;
+            this.el.hexpand = true;
+            this.el.use_markup = true;
+
+            //listeners
+            this.el.activate_link.connect( (uri) => {
+               if (uri == "refresh") {
+                       var curproj = RooTicket.singleton().getProjectByRepo(_this.repo);
+                        _this.prmodel.loadProjects(curproj == null ? "": curproj.id);
+            
+                       _this.dbmodel.loadTickets(curproj == null ? "": curproj.id);            
+               }
+               return true;
+            });
         }
 
         // user defined functions
     }
 
-    public class Xcls_Button21 : Object
-    {
-        public Gtk.Button el;
-        private Xcls_DialogNewComponent  _this;
 
 
-            // my vars (def)
-
-        // ctor
-        public Xcls_Button21(Xcls_DialogNewComponent _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Button();
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.label = "OK";
-        }
-
-        // user defined functions
-    }
 
 }