X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=2772f922884e375d2751c5d2c77f7d0c4b7505c6;hb=715cda85f263d1076c5807e10dea7a620c841033;hp=4ab845311a1db329c5ee1b612a27c0028057ae76;hpb=3f435fd4ea8609035b550e351db5fd451b22de65;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index 4ab84531..2772f922 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -28,6 +28,7 @@ public class NewBranch : Object 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 +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; @@ -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 ); } @@ -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 { @@ -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)