X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=2772f922884e375d2751c5d2c77f7d0c4b7505c6;hb=715cda85f263d1076c5807e10dea7a620c841033;hp=2ba873f5cce66ccd4e8c59765d2c383f7735cb8f;hpb=5926a921b9b64b9abf3ca66aeb341caa5c676f9a;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index 2ba873f5..2772f922 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -23,15 +23,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_tprcellrenderer tprcellrenderer; - public Xcls_prmodel prmodel; + public Xcls_tprmodel tprmodel; public Xcls_summary summary; public Xcls_milestone_id milestone_id; public Xcls_msmodel msmodel; @@ -44,6 +45,7 @@ public class NewBranch : Object public Xcls_clmodel clmodel; public Xcls_developer_id developer_id; public Xcls_devmodel devmodel; + public Xcls_quick_commit_tab quick_commit_tab; public Xcls_commit_message commit_message; public Xcls_createbtn createbtn; public Xcls_diff_view diff_view; @@ -154,7 +156,7 @@ public class NewBranch : Object this.el.show_all(); this.el.set_keep_above(true); - _this.select_ticket_tab.load_data(); + _this.select_ticket_tab.load_data(tid); _this.create_ticket_tab.load_data(); _this.quick_commit_tab.load_data(); @@ -194,10 +196,10 @@ 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 ); } @@ -301,15 +303,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 +365,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 +648,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 +810,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 +819,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 +1075,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 +1084,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) @@ -1097,6 +1100,45 @@ public class NewBranch : Object } // user defined functions + public void load_data () { + if (_this.running) { // should not happen!! + GLib.error("new branch show called, when already being displayed?"); + } + _this.running = true; + + + + Timeout.add_seconds(1, () => { + + RooProject? curproj = null; + if (_this.repo != null) { + curproj = RooProject.getProjectByRepo(_this.repo); + } + _this.prmodel.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 { @@ -1246,7 +1288,7 @@ public class NewBranch : Object 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 ); @@ -1304,7 +1346,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; @@ -1337,7 +1379,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; @@ -1346,10 +1388,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) @@ -2175,7 +2217,7 @@ public class NewBranch : Object - public class Xcls_Box51 : Object + public class Xcls_quick_commit_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -2184,9 +2226,10 @@ 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)