NewBranch.bjs
[gitlive] / NewBranch.vala
index 48b2ef4..643489b 100644 (file)
@@ -19,6 +19,8 @@ public class NewBranch : Object
     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;
@@ -45,12 +47,6 @@ public class NewBranch : 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_Button16( _this );
-        child_1.ref();
-        this.el.add_action_widget (  child_1.el , 0 );
-        var child_2 = new Xcls_Button17( _this );
-        child_2.ref();
-        this.el.add_action_widget (  child_2.el , 1 );
 
         //listeners
         this.el.delete_event.connect( (self, event) => {
@@ -61,7 +57,7 @@ public class NewBranch : Object
         this.el.response.connect( (self, response_id) =>  { 
           
                GLib.debug("got %d", (int) response_id);
-               if (response_id == 0) {
+               if (response_id < 1) {
                    _this.el.hide();    
                    this.running = false; 
                        return;
@@ -97,16 +93,11 @@ public class NewBranch : Object
                 
         
                 
-        });
-        this.el.show.connect( (self)  => {
-         
-        
-          //test
         });
     }
 
     // user defined functions
-    public   void show ( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue ) 
+    public   void show ( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = "" ) 
     {
          // this.el.set_gravity(Gdk.Gravity.NORTH);
         if (this.running) { // should not happen!!
@@ -119,13 +110,22 @@ public class NewBranch : Object
        
         this.repo = repo;
         
+        
+        
+        
        this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
-               GLib.debug("Loading tickets"); 
-    
+       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.dbmodel.loadTickets();
+        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);
        this.el.run();
     
     }
@@ -165,12 +165,12 @@ public class NewBranch : Object
         public Xcls_Table3(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Table( 5, 6, true );
+            this.el = new Gtk.Table( 5, 5, true );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.expand = true;
+            this.el.expand = false;
             this.el.margin = 2;
             this.el.column_spacing = 4;
             this.el.vexpand = false;
@@ -191,13 +191,16 @@ public class NewBranch : Object
             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 , 0,1,2,3 );
+            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,4,3,4 );
+            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 , 4,5,3,4 );
+            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,5,2,3 );
         }
 
         // user defined functions
@@ -265,7 +268,7 @@ public class NewBranch : Object
         {
             _this = _owner;
             _this.projectsel = this;
-            this.el = new Gtk.ComboBox();
+            this.el = new Gtk.ComboBox.with_entry();
 
             // my vars (dec)
             this.loading = false;
@@ -280,10 +283,17 @@ public class NewBranch : Object
 
             // init method
 
-            this.el.add_attribute(_this.prcellrenderer.el , "markup", 1 );
+            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;
                }
@@ -309,13 +319,13 @@ public class NewBranch : Object
         }
 
         // user defined functions
-        public string selectedTicketId () {
-        Gtk.TreeIter iter;
+        public string selectedProjectId () {
+               Gtk.TreeIter iter;
                Value val1;
          
          
                this.el.get_active_iter (out iter);
-               _this.dbmodel.el.get_value (iter, 0, out val1);
+               _this.prmodel.el.get_value (iter, 0, out val1);
          
         
                return  (string) val1;
@@ -369,11 +379,12 @@ public class NewBranch : Object
         }
 
         // user defined functions
-        public void loadTickets () {
+        public void loadProjects (string id) {
         
-            RooTicket.singleton().loadTickets();
+            var rt = RooTicket.singleton();
+            rt.loadProjects();
             
-            _this.ticketsel.loading = true;
+            _this.projectsel.loading = true;
         
             this.el.clear();                                    
             Gtk.TreeIter iter;
@@ -383,24 +394,24 @@ public class NewBranch : Object
         
             
             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.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, 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);
-               // }
+                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.ticketsel.loading = false;
+            _this.projectsel.loading = false;
              //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
                                              
         }
@@ -421,7 +432,7 @@ public class NewBranch : Object
         {
             _this = _owner;
             _this.ticketsel = this;
-            this.el = new Gtk.ComboBox();
+            this.el = new Gtk.ComboBox.with_entry();
 
             // my vars (dec)
             this.loading = false;
@@ -436,7 +447,8 @@ public class NewBranch : 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);
 
             //listeners
             this.el.changed.connect( () => {
@@ -524,10 +536,18 @@ public class NewBranch : Object
         }
 
         // user defined functions
-        public void loadTickets () {
+        public void loadTickets (string project_id , string tid = "") {
         
-            RooTicket.singleton().loadTickets();
+        
+            
+            // fixme .. get project id from selection..
             
+             RooTicket.singleton().loadTickets(
+                               project_id,
+                               _this.btn_not_me.el.active ? RooTicket.NotMe.TRUE :  RooTicket.NotMe.FALSE,
+                                _this.btn_closed.el.active ? RooTicket.Closed.TRUE :  RooTicket.Closed.FALSE
+                        );
+                
             _this.ticketsel.loading = true;
         
             this.el.clear();                                    
@@ -549,9 +569,9 @@ public class NewBranch : Object
                 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 (ticket.id == tid) {
+                           _this.ticketsel.el.set_active_iter(iter);
+                }
                 
             }
             
@@ -659,58 +679,145 @@ public class NewBranch : Object
             {
                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_Box16 : Object
+    {
+        public Gtk.Box el;
+        private NewBranch  _this;
+
+
+            // my vars (def)
 
+        // ctor
+        public Xcls_Box16(NewBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
+
+            // my vars (dec)
 
-    public class Xcls_Button16 : Object
+            // set gobject values
+            var child_0 = new Xcls_btn_not_me( _this );
+            child_0.ref();
+            this.el.add (  child_0.el  );
+            var child_1 = new Xcls_btn_closed( _this );
+            child_1.ref();
+            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_btn_not_me : Object
     {
-        public Gtk.Button el;
+        public Gtk.CheckButton el;
         private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button16(NewBranch _owner )
+        public Xcls_btn_not_me(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            _this.btn_not_me = this;
+            this.el = new Gtk.CheckButton();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.relief = Gtk.ReliefStyle.NONE;
-            this.el.label = "Do not create Branch";
+            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_Button17 : Object
+    public class Xcls_btn_closed : Object
     {
-        public Gtk.Button el;
+        public Gtk.CheckButton el;
         private NewBranch  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button17(NewBranch _owner )
+        public Xcls_btn_closed(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            _this.btn_closed = this;
+            this.el = new Gtk.CheckButton();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Create Branch";
+            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 class Xcls_Label19 : Object
+    {
+        public Gtk.Label el;
+        private NewBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Label19(NewBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Label( "<a href=\"refresh\">Refresh Ticket list</a>" );
+
+            // my vars (dec)
+
+            // set gobject values
+            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
     }
 
+
+
+
 }