NewBranch.bjs
[gitlive] / NewBranch.vala
index d41ec8b..7985727 100644 (file)
@@ -12,6 +12,7 @@ public class NewBranch : Object
         }
         return _NewBranch;
     }
+    public Xcls_notebook notebook;
     public Xcls_label_select_ticket label_select_ticket;
     public Xcls_label_create_ticket label_create_ticket;
     public Xcls_label_quick_commit label_quick_commit;
@@ -23,15 +24,16 @@ public class NewBranch : Object
     public Xcls_dbcellrenderer dbcellrenderer;
     public Xcls_dbmodel dbmodel;
     public Xcls_name name;
-    public Xcls_createbtn createbtn;
+    public Xcls_branchbtn branchbtn;
     public Xcls_btn_not_me btn_not_me;
     public Xcls_btn_closed btn_closed;
     public Xcls_scrolled_window scrolled_window;
     public Xcls_view view;
+    public Xcls_create_ticket_tab create_ticket_tab;
     public Xcls_table table;
     public Xcls_project_id project_id;
-    public Xcls_prcellrenderer prcellrenderer;
-    public Xcls_prmodel prmodel;
+    public Xcls_tprcellrenderer tprcellrenderer;
+    public Xcls_tprmodel tprmodel;
     public Xcls_summary summary;
     public Xcls_milestone_id milestone_id;
     public Xcls_msmodel msmodel;
@@ -44,6 +46,8 @@ public class NewBranch : Object
     public Xcls_clmodel clmodel;
     public Xcls_developer_id developer_id;
     public Xcls_devmodel devmodel;
+    public Xcls_spinner spinner;
+    public Xcls_quick_commit_tab quick_commit_tab;
     public Xcls_commit_message commit_message;
     public Xcls_createbtn createbtn;
     public Xcls_diff_view diff_view;
@@ -70,7 +74,7 @@ public class NewBranch : Object
         this.el.default_width = 500;
         this.el.deletable = true;
         this.el.modal = true;
-        var child_0 = new Xcls_Notebook2( _this );
+        var child_0 = new Xcls_notebook( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
 
@@ -102,22 +106,34 @@ public class NewBranch : Object
                        return;
                }
                
-               var ticket_id = _this.ticketsel.selectedTicketId();
+               switch(response_id) {
+                       case 1: 
                
-            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();
-                                
-                        }
-            }
-             
+                               
+                               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();
+                                                
+                                        }
+                               }
+                       break;
+                       case 2: // create ticket + branch
+                               break;
+                       
+                       case 3: // just commit...
+                       
+                               break;
+                       default:
+                               break;
+               }
             this.running = false; 
         
                this.el.hide();
@@ -135,42 +151,33 @@ public class NewBranch : Object
         if (this.running) { // should not happen!!
                GLib.error("new branch show called, when already being displayed?");
        }
-       this.queue = queue;
        
+       
+       this.queue = queue;
        this.running  = true;
        GitMonitor.gitmonitor.stop();
        
+       
         this.repo = repo;
-        
-         
-        
        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);
+       
+       _this.notebook.el.set_current_page(0);
+       
+       _this.select_ticket_tab.load_data(tid);
+       //_this.create_ticket_tab.load_data();
+       //_this.quick_commit_tab.load_data();
+         _this.commit_message.el.set_text("");
        
         
-        var curproj = RooProject.getProjectByRepo(this.repo);
-         _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
-        
-       _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
-       _this.createbtn.updateState();
-       
-       _this.ticketsel.el.get_child().get_style_context().remove_class("warning");
-       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()));
-       } else {
-               _this.ticketsel.el.get_child().get_style_context().add_class("warning");
-       }
-        _this.view.loadTicket(tid);
-        
-        
-        
         
         
         
@@ -178,7 +185,7 @@ public class NewBranch : Object
        this.el.run();
     
     }
-    public class Xcls_Notebook2 : Object
+    public class Xcls_notebook : Object
     {
         public Gtk.Notebook el;
         private NewBranch  _this;
@@ -187,9 +194,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Notebook2(NewBranch _owner )
+        public Xcls_notebook(NewBranch _owner )
         {
             _this = _owner;
+            _this.notebook = this;
             this.el = new Gtk.Notebook();
 
             // my vars (dec)
@@ -205,12 +213,29 @@ public class NewBranch : Object
             var child_3 = new Xcls_select_ticket_tab( _this );
             child_3.ref();
             this.el.append_page (  child_3.el , _this.label_select_ticket.el );
-            var child_4 = new Xcls_Box25( _this );
+            var child_4 = new Xcls_create_ticket_tab( _this );
             child_4.ref();
             this.el.append_page (  child_4.el , _this.label_create_ticket.el );
-            var child_5 = new Xcls_Box51( _this );
+            var child_5 = new Xcls_quick_commit_tab( _this );
             child_5.ref();
             this.el.append_page (  child_5.el , _this.label_quick_commit.el );
+
+            //listeners
+            this.el.switch_page.connect( (page, page_num) => {
+               GLib.debug("Switch to page: %d", (int)page_num);
+               switch(page_num) {
+                       case 0: 
+                               break; // do nothing.. it's already loaded at start.
+                       case 1: 
+                               _this.create_ticket_tab.load_data();
+                               break;
+                       case 2:
+                               _this.quick_commit_tab.load_data();
+                               break;
+                       default:
+                               break;
+               }
+            });
         }
 
         // user defined functions
@@ -312,6 +337,28 @@ public class NewBranch : Object
         }
 
         // user defined functions
+        public void load_data (string tid = "") {
+        
+            GLib.debug("Loading tickets"); 
+            
+            var curproj = RooProject.getProjectByRepo(_this.repo);
+             _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
+            
+               _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
+               _this.branchbtn.updateState();
+               
+               _this.ticketsel.el.get_child().get_style_context().remove_class("warning");
+               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()));
+               } else {
+                       _this.ticketsel.el.get_child().get_style_context().add_class("warning");
+               }
+            _this.view.loadTicket(tid);
+            
+            
+        }
     }
     public class Xcls_Table7 : Object
     {
@@ -352,7 +399,7 @@ public class NewBranch : Object
             var child_5 = new Xcls_name( _this );
             child_5.ref();
             this.el.attach_defaults (  child_5.el , 0,4,4,5 );
-            var child_6 = new Xcls_createbtn( _this );
+            var child_6 = new Xcls_branchbtn( _this );
             child_6.ref();
             this.el.attach_defaults (  child_6.el , 4,5,4,5 );
             var child_7 = new Xcls_Box19( _this );
@@ -635,7 +682,7 @@ public class NewBranch : Object
                _this.scrolled_window.el.show();
                 
                _this.view.loadTicket(ticket.id);
-               _this.createbtn.updateState();
+               _this.branchbtn.updateState();
                
                //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
             });
@@ -797,7 +844,7 @@ public class NewBranch : Object
         // user defined functions
     }
 
-    public class Xcls_createbtn : Object
+    public class Xcls_branchbtn : Object
     {
         public Gtk.Button el;
         private NewBranch  _this;
@@ -806,10 +853,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_createbtn(NewBranch _owner )
+        public Xcls_branchbtn(NewBranch _owner )
         {
             _this = _owner;
-            _this.createbtn = this;
+            _this.branchbtn = this;
             this.el = new Gtk.Button();
 
             // my vars (dec)
@@ -1062,7 +1109,7 @@ public class NewBranch : Object
 
 
 
-    public class Xcls_Box25 : Object
+    public class Xcls_create_ticket_tab : Object
     {
         public Gtk.Box el;
         private NewBranch  _this;
@@ -1071,9 +1118,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Box25(NewBranch _owner )
+        public Xcls_create_ticket_tab(NewBranch _owner )
         {
             _this = _owner;
+            _this.create_ticket_tab = this;
             this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
 
             // my vars (dec)
@@ -1083,9 +1131,49 @@ public class NewBranch : Object
             var child_0 = new Xcls_table( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false,false,0 );
+            var child_1 = new Xcls_spinner( _this );
+            child_1.ref();
+            this.el.add (  child_1.el  );
         }
 
         // user defined functions
+        public void load_data () {
+         
+                _this.table.el.hide();
+               _this.spinner.el.show();
+               _this.spinner.el.start();       
+               
+            Timeout.add_seconds(1, () => {
+                        
+                       RooProject? curproj = null;
+                       if (_this.repo != null) {
+                               curproj = RooProject.getProjectByRepo(_this.repo);
+                       }
+                       _this.tprmodel.loadProjects(curproj == null ? "" : curproj.id);
+                       if (curproj != null) {
+                
+                               
+                               var rt = RooTicket.singleton();
+                               rt.loadProjectOptions(curproj.id);
+                               
+                               _this.msmodel.loadMilestones();
+                               _this.primodel.loadPriorities();
+                               _this.sevmodel.loadSeverities();
+                               _this.clmodel.loadClassifications();    
+                               _this.devmodel.loadDevelopers();        
+                               
+                       }
+                       _this.summary.el.set_text("");
+                       _this.description.el.buffer.text = ""; 
+                       _this.spinner.el.stop();
+                       _this.spinner.el.hide();        
+        
+                       _this.table.el.show();
+                   //_this.summary.el.grab_focus();
+         
+                       return false;
+               });
+        }
     }
     public class Xcls_table : Object
     {
@@ -1232,10 +1320,10 @@ public class NewBranch : Object
             this.loading = false;
 
             // set gobject values
-            var child_0 = new Xcls_prcellrenderer( _this );
+            var child_0 = new Xcls_tprcellrenderer( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , true );
-            var child_1 = new Xcls_prmodel( _this );
+            var child_1 = new Xcls_tprmodel( _this );
             child_1.ref();
             this.el.set_model (  child_1.el  );
 
@@ -1293,7 +1381,7 @@ public class NewBranch : Object
          
          
                this.el.get_active_iter (out iter);
-               _this.prmodel.el.get_value (iter, 0, out val1);
+               _this.tprmodel.el.get_value (iter, 0, out val1);
          
         
                return  (string) val1;
@@ -1303,7 +1391,7 @@ public class NewBranch : Object
                
         }
     }
-    public class Xcls_prcellrenderer : Object
+    public class Xcls_tprcellrenderer : Object
     {
         public Gtk.CellRendererText el;
         private NewBranch  _this;
@@ -1312,10 +1400,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_prcellrenderer(NewBranch _owner )
+        public Xcls_tprcellrenderer(NewBranch _owner )
         {
             _this = _owner;
-            _this.prcellrenderer = this;
+            _this.tprcellrenderer = this;
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
@@ -1326,7 +1414,7 @@ public class NewBranch : Object
         // user defined functions
     }
 
-    public class Xcls_prmodel : Object
+    public class Xcls_tprmodel : Object
     {
         public Gtk.ListStore el;
         private NewBranch  _this;
@@ -1335,10 +1423,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_prmodel(NewBranch _owner )
+        public Xcls_tprmodel(NewBranch _owner )
         {
             _this = _owner;
-            _this.prmodel = this;
+            _this.tprmodel = this;
             this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
 
             // my vars (dec)
@@ -2163,8 +2251,33 @@ public class NewBranch : Object
     }
 
 
+    public class Xcls_spinner : Object
+    {
+        public Gtk.Spinner el;
+        private NewBranch  _this;
 
-    public class Xcls_Box51 : Object
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_spinner(NewBranch _owner )
+        {
+            _this = _owner;
+            _this.spinner = this;
+            this.el = new Gtk.Spinner();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.hexpand = true;
+            this.el.vexpand = true;
+        }
+
+        // user defined functions
+    }
+
+
+    public class Xcls_quick_commit_tab : Object
     {
         public Gtk.Box el;
         private NewBranch  _this;
@@ -2173,26 +2286,31 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Box51(NewBranch _owner )
+        public Xcls_quick_commit_tab(NewBranch _owner )
         {
             _this = _owner;
+            _this.quick_commit_tab = this;
             this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
 
             // my vars (dec)
 
             // set gobject values
             this.el.homogeneous = false;
-            var child_0 = new Xcls_Table52( _this );
+            var child_0 = new Xcls_Table53( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false,false,0 );
-            var child_1 = new Xcls_ScrolledWindow56( _this );
+            var child_1 = new Xcls_ScrolledWindow57( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
         }
 
         // user defined functions
+        public void load_data () {
+        
+          _this.createbtn.updateState();
+        }
     }
-    public class Xcls_Table52 : Object
+    public class Xcls_Table53 : Object
     {
         public Gtk.Table el;
         private NewBranch  _this;
@@ -2201,10 +2319,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Table52(NewBranch _owner )
+        public Xcls_Table53(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Table( 2, 5, true );
+            this.el = new Gtk.Table( 3, 5, true );
 
             // my vars (dec)
 
@@ -2213,20 +2331,20 @@ public class NewBranch : Object
             this.el.margin = 2;
             this.el.column_spacing = 4;
             this.el.vexpand = false;
-            var child_0 = new Xcls_Label53( _this );
+            var child_0 = new Xcls_Label54( _this );
             child_0.ref();
             this.el.attach_defaults (  child_0.el , 0,1,0,1 );
             var child_1 = new Xcls_commit_message( _this );
             child_1.ref();
-            this.el.attach_defaults (  child_1.el , 0,4,1,2 );
+            this.el.attach_defaults (  child_1.el , 0,5,1,2 );
             var child_2 = new Xcls_createbtn( _this );
             child_2.ref();
-            this.el.attach_defaults (  child_2.el , 4,5,1,2 );
+            this.el.attach_defaults (  child_2.el , 0,5,2,3 );
         }
 
         // user defined functions
     }
-    public class Xcls_Label53 : Object
+    public class Xcls_Label54 : Object
     {
         public Gtk.Label el;
         private NewBranch  _this;
@@ -2235,7 +2353,7 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Label53(NewBranch _owner )
+        public Xcls_Label54(NewBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Label( "Just commit with this comment" );
@@ -2270,6 +2388,13 @@ public class NewBranch : Object
 
             // set gobject values
             this.el.visible = true;
+
+            //listeners
+            this.el.key_release_event.connect( () => { 
+            
+               _this.createbtn.updateState();
+               return true;
+            });
         }
 
         // user defined functions
@@ -2306,23 +2431,18 @@ public class NewBranch : Object
             
                GLib.debug("fire response = 1");
                
-               var ticket_id = _this.ticketsel.selectedTicketId();
-               
-               if (ticket_id == "") {
-                       _this.ticketsel.el.get_child().get_style_context().add_class("warning");
-                       return;
-               }
                 
-               _this.el.response(1);
+                
+               _this.el.response(3);
             });
         }
 
         // user defined functions
         public void updateState () {
         
-               var ticket_id = _this.ticketsel.selectedTicketId();
+               var msg = _this.commit_message.el.get_text();
                
-               if (ticket_id == "") {
+               if (msg == "") {
                        this.el.set_sensitive(false);
                        return;
                }
@@ -2333,7 +2453,7 @@ public class NewBranch : Object
     }
 
 
-    public class Xcls_ScrolledWindow56 : Object
+    public class Xcls_ScrolledWindow57 : Object
     {
         public Gtk.ScrolledWindow el;
         private NewBranch  _this;
@@ -2342,7 +2462,7 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_ScrolledWindow56(NewBranch _owner )
+        public Xcls_ScrolledWindow57(NewBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.ScrolledWindow( null, null );