X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=af3cdd589314ec0c554c6812e85fd6175ef1e81d;hb=ee8e2cc9e8ebe8bc0b0455e27862ebdcb68794f4;hp=afe3c54a3250349dedf6591c81f8377993fa2398;hpb=9c2e64777747848a1bcaad1d151d5a1c2a0d2719;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index afe3c54a..af3cdd58 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -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,11 +24,12 @@ 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_tprcellrenderer tprcellrenderer; @@ -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 ); @@ -154,9 +158,11 @@ public class NewBranch : Object this.el.show_all(); this.el.set_keep_above(true); - _this.select_ticket_tab.load_data(); - _this.create_ticket_tab.load_data(); - _this.quick_commit_tab.load_data(); + _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(); @@ -167,7 +173,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; @@ -176,9 +182,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) @@ -194,12 +201,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 @@ -301,15 +325,15 @@ public class NewBranch : Object } // user defined functions - public void load_data () { + public void load_data (string tid = "") { GLib.debug("Loading tickets"); - var curproj = RooProject.getProjectByRepo(this.repo); + 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.branchbtn.updateState(); _this.ticketsel.el.get_child().get_style_context().remove_class("warning"); if (tid != "") { @@ -363,7 +387,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 ); @@ -646,7 +670,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); }); @@ -808,7 +832,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; @@ -817,10 +841,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) @@ -1073,7 +1097,7 @@ public class NewBranch : Object - public class Xcls_Box25 : Object + public class Xcls_create_ticket_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -1082,9 +1106,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) @@ -1094,9 +1119,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 { @@ -2174,8 +2239,33 @@ public class NewBranch : Object } + public class Xcls_spinner : Object + { + public Gtk.Spinner el; + private NewBranch _this; + + + // 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_Box51 : Object + public class Xcls_quick_commit_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -2184,26 +2274,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.commit_message.el.set_text(""); + + } } - public class Xcls_Table52 : Object + public class Xcls_Table53 : Object { public Gtk.Table el; private NewBranch _this; @@ -2212,10 +2307,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) @@ -2224,7 +2319,7 @@ 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 ); @@ -2232,12 +2327,12 @@ public class NewBranch : Object this.el.attach_defaults ( child_1.el , 0,4,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 , 1,5,2,3 ); } // user defined functions } - public class Xcls_Label53 : Object + public class Xcls_Label54 : Object { public Gtk.Label el; private NewBranch _this; @@ -2246,7 +2341,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" ); @@ -2317,34 +2412,17 @@ 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(); - - if (ticket_id == "") { - this.el.set_sensitive(false); - return; - } - - this.el.set_sensitive(true); - - } } - public class Xcls_ScrolledWindow56 : Object + public class Xcls_ScrolledWindow57 : Object { public Gtk.ScrolledWindow el; private NewBranch _this; @@ -2353,7 +2431,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 );