X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.vala;h=ea3833aab232365e0558feb0ec424134d302c2bc;hp=a2d2044e2b8304afbc20e58659a1140fed2c6919;hb=refs%2Fheads%2Fwip_alan_T5782_messing_around_with_libgit2glib;hpb=be6b74d1047653c23c666d11e6931878ec96bffc diff --git a/NewBranch.vala b/NewBranch.vala index a2d2044e..ea3833aa 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -12,9 +12,12 @@ 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; + public Xcls_select_ticket_tab select_ticket_tab; + public Xcls_branch_table branch_table; public Xcls_projectsel projectsel; public Xcls_prcellrenderer prcellrenderer; public Xcls_prmodel prmodel; @@ -22,15 +25,17 @@ 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_branch_spinner branch_spinner; + 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; @@ -43,8 +48,10 @@ 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_sv diff_sv; public Xcls_diff_view diff_view; // my vars (def) @@ -69,7 +76,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 ); @@ -96,27 +103,72 @@ public class NewBranch : Object if (response_id < 1) { - _this.el.hide(); - this.running = false; + _this.el.hide(); + this.running = false; + GitMonitor.gitmonitor.start(); + return; } - var ticket_id = _this.ticketsel.selectedTicketId(); + switch(response_id) { + case 1: - if (this.repo != null) { - var bn = _this.name.el.get_text(); + + 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 + + var tid = RooTicket.singleton().createTicket( + + _this.project_id.selectedProjectId(), + + _this.milestone_id.selectedMilestoneId(), + _this.priority_id.selectedPriorityId() , + _this.severity_id.selectedSeverityId() , + _this.classification_id.selectedClassificationId() , + _this.developer_id.selectedDeveloperId(), + _this.summary.el.get_text() , + _this.description.el.buffer.text + ); + var ticket = RooTicket.singleton().getById(tid); + var name = RooTicket.singleton().usernameLocal(); + var bn = "wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()); - var res = this.repo.setActiveTicket( - RooTicket.singleton().getById(ticket_id != "" ? ticket_id : "-1"), bn - ); - if (res) { - // start the monitoring.. - GitMonitor.gitmonitor.start(); - - } - } - + var res = this.repo.setActiveTicket( ticket, bn ); + if (res) { + // start the monitoring.. + GitMonitor.gitmonitor.start(); + } + + + + + break; + + case 3: // just commit... + _this.repo.git({ "commit" , "-a" ,"-m", _this.commit_message.el.get_text() }); + _this.repo.push(); + _this.repo.loadBranches(); + _this.repo.loadStatus(); + GitMonitor.gitmonitor.start(); + break; + default: + break; + } this.running = false; this.el.hide(); @@ -134,43 +186,45 @@ 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.table.el.hide(); // hide ticket layout + _this.diff_sv.el.hide(); + _this.el.resize( 500,100); + 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(""); + _this.diff_view.el.get_buffer().set_text( this.repo.diffWorking() ); + + this.el.move((Gdk.Screen.width() / 2)- 250 ,0); + this.el.resize( 500,100); // not sure why it grows.. + + - 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); this.el.run(); } - public class Xcls_Notebook2 : Object + public class Xcls_notebook : Object { public Gtk.Notebook el; private NewBranch _this; @@ -179,9 +233,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,15 +249,40 @@ public class NewBranch : Object child_1.ref(); var child_2 = new Xcls_label_quick_commit( _this ); child_2.ref(); - var child_3 = new Xcls_Box6( _this ); + 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: + _this.table.el.hide(); // hide ticket layout + _this.diff_sv.el.hide(); + _this.el.resize( 500,100); + break; // do nothing.. it's already loaded at start. + case 1: + _this.diff_sv.el.hide(); + _this.table.el.show(); + _this.el.resize( 500,100); + // _this.create_ticket_tab.load_data(); + break; + case 2: + _this.quick_commit_tab.load_data(); + _this.diff_sv.el.show(); + _this.el.resize( 500,100); + break; + default: + break; + } + }); } // user defined functions @@ -276,7 +356,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Box6 : Object + public class Xcls_select_ticket_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -285,26 +365,66 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box6(NewBranch _owner ) + public Xcls_select_ticket_tab(NewBranch _owner ) { _this = _owner; + _this.select_ticket_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_Table7( _this ); + var child_0 = new Xcls_branch_table( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); var child_1 = new Xcls_scrolled_window( _this ); child_1.ref(); this.el.add ( child_1.el ); + var child_2 = new Xcls_branch_spinner( _this ); + child_2.ref(); + this.el.add ( child_2.el ); } // user defined functions + public void load_data (string tid = "") { + + + _this.branch_table.el.hide(); + _this.scrolled_window.el.hide(); + _this.branch_spinner.el.show(); + _this.branch_spinner.el.start(); + _this.el.resize( 500,100); + Timeout.add(200, () => { + + + 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); + _this.branch_table.el.show(); + _this.branch_spinner.el.stop(); + _this.branch_spinner.el.hide(); + _this.el.resize( 500,100); + return false; + }); + + } } - public class Xcls_Table7 : Object + public class Xcls_branch_table : Object { public Gtk.Table el; private NewBranch _this; @@ -313,9 +433,10 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Table7(NewBranch _owner ) + public Xcls_branch_table(NewBranch _owner ) { _this = _owner; + _this.branch_table = this; this.el = new Gtk.Table( 5, 5, true ); // my vars (dec) @@ -343,7 +464,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 ); @@ -626,7 +747,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); }); @@ -788,7 +909,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; @@ -797,10 +918,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) @@ -995,6 +1116,7 @@ public class NewBranch : Object // set gobject values this.el.height_request = 500; this.el.vexpand = true; + this.el.visible = false; var child_0 = new Xcls_view( _this ); child_0.ref(); this.el.add ( child_0.el ); @@ -1052,8 +1174,33 @@ public class NewBranch : Object } + public class Xcls_branch_spinner : Object + { + public Gtk.Spinner el; + private NewBranch _this; - public class Xcls_Box25 : Object + + // my vars (def) + + // ctor + public Xcls_branch_spinner(NewBranch _owner ) + { + _this = _owner; + _this.branch_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_create_ticket_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -1062,9 +1209,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) @@ -1077,6 +1225,43 @@ public class NewBranch : Object } // 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 { @@ -1100,10 +1285,10 @@ public class NewBranch : Object this.el.margin = 2; this.el.column_spacing = 4; this.el.vexpand = false; - var child_0 = new Xcls_Label27( _this ); + var child_0 = new Xcls_Label28( _this ); child_0.ref(); this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_Label28( _this ); + var child_1 = new Xcls_Label29( _this ); child_1.ref(); this.el.attach_defaults ( child_1.el , 1,2,0,1 ); var child_2 = new Xcls_project_id( _this ); @@ -1112,50 +1297,50 @@ public class NewBranch : Object var child_3 = new Xcls_summary( _this ); child_3.ref(); this.el.attach_defaults ( child_3.el , 1,4,1,2 ); - var child_4 = new Xcls_Label33( _this ); + var child_4 = new Xcls_Label34( _this ); child_4.ref(); this.el.attach_defaults ( child_4.el , 0,1,2,3 ); var child_5 = new Xcls_milestone_id( _this ); child_5.ref(); this.el.attach_defaults ( child_5.el , 0,1,3,4 ); - var child_6 = new Xcls_Label36( _this ); + var child_6 = new Xcls_Label37( _this ); child_6.ref(); this.el.attach_defaults ( child_6.el , 1,4,2,3 ); var child_7 = new Xcls_description( _this ); child_7.ref(); this.el.attach_defaults ( child_7.el , 1,4,3,12 ); - var child_8 = new Xcls_Label38( _this ); + var child_8 = new Xcls_Label39( _this ); child_8.ref(); this.el.attach_defaults ( child_8.el , 0,1,4,5 ); var child_9 = new Xcls_priority_id( _this ); child_9.ref(); this.el.attach_defaults ( child_9.el , 0,1,5,6 ); - var child_10 = new Xcls_Label41( _this ); + var child_10 = new Xcls_Label42( _this ); child_10.ref(); this.el.attach_defaults ( child_10.el , 0,1,6,7 ); var child_11 = new Xcls_severity_id( _this ); child_11.ref(); this.el.attach_defaults ( child_11.el , 0,1,7,8 ); - var child_12 = new Xcls_Label44( _this ); + var child_12 = new Xcls_Label45( _this ); child_12.ref(); this.el.attach_defaults ( child_12.el , 0,1,8,9 ); var child_13 = new Xcls_classification_id( _this ); child_13.ref(); this.el.attach_defaults ( child_13.el , 0,1,9,10 ); - var child_14 = new Xcls_Label47( _this ); + var child_14 = new Xcls_Label48( _this ); child_14.ref(); this.el.attach_defaults ( child_14.el , 0,1,10,11 ); var child_15 = new Xcls_developer_id( _this ); child_15.ref(); this.el.attach_defaults ( child_15.el , 0,1,11,12 ); - var child_16 = new Xcls_Button50( _this ); + var child_16 = new Xcls_Button51( _this ); child_16.ref(); this.el.attach_defaults ( child_16.el , 0,4,13,14 ); } // user defined functions } - public class Xcls_Label27 : Object + public class Xcls_Label28 : Object { public Gtk.Label el; private NewBranch _this; @@ -1164,7 +1349,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label27(NewBranch _owner ) + public Xcls_Label28(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Project" ); @@ -1179,7 +1364,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label28 : Object + public class Xcls_Label29 : Object { public Gtk.Label el; private NewBranch _this; @@ -1188,7 +1373,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label28(NewBranch _owner ) + public Xcls_Label29(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Summary" ); @@ -1223,10 +1408,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 ); @@ -1284,7 +1469,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; @@ -1294,7 +1479,7 @@ public class NewBranch : Object } } - public class Xcls_prcellrenderer : Object + public class Xcls_tprcellrenderer : Object { public Gtk.CellRendererText el; private NewBranch _this; @@ -1303,10 +1488,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) @@ -1317,7 +1502,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; @@ -1326,10 +1511,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) @@ -1399,7 +1584,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label33 : Object + public class Xcls_Label34 : Object { public Gtk.Label el; private NewBranch _this; @@ -1408,7 +1593,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label33(NewBranch _owner ) + public Xcls_Label34(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Milestone" ); @@ -1530,7 +1715,7 @@ public class NewBranch : Object } - public class Xcls_Label36 : Object + public class Xcls_Label37 : Object { public Gtk.Label el; private NewBranch _this; @@ -1539,7 +1724,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label36(NewBranch _owner ) + public Xcls_Label37(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Description" ); @@ -1577,7 +1762,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label38 : Object + public class Xcls_Label39 : Object { public Gtk.Label el; private NewBranch _this; @@ -1586,7 +1771,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label38(NewBranch _owner ) + public Xcls_Label39(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Priority" ); @@ -1700,7 +1885,7 @@ public class NewBranch : Object } - public class Xcls_Label41 : Object + public class Xcls_Label42 : Object { public Gtk.Label el; private NewBranch _this; @@ -1709,7 +1894,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label41(NewBranch _owner ) + public Xcls_Label42(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Severity" ); @@ -1821,7 +2006,7 @@ public class NewBranch : Object } - public class Xcls_Label44 : Object + public class Xcls_Label45 : Object { public Gtk.Label el; private NewBranch _this; @@ -1830,7 +2015,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label44(NewBranch _owner ) + public Xcls_Label45(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Classification" ); @@ -1945,7 +2130,7 @@ public class NewBranch : Object } - public class Xcls_Label47 : Object + public class Xcls_Label48 : Object { public Gtk.Label el; private NewBranch _this; @@ -1954,7 +2139,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label47(NewBranch _owner ) + public Xcls_Label48(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Assign to" ); @@ -2074,7 +2259,7 @@ public class NewBranch : Object } - public class Xcls_Button50 : Object + public class Xcls_Button51 : Object { public Gtk.Button el; private NewBranch _this; @@ -2083,7 +2268,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Button50(NewBranch _owner ) + public Xcls_Button51(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -2146,7 +2331,7 @@ public class NewBranch : Object } GLib.debug("for is valid"); - _this.el.response(1); + _this.el.response(2); }); } @@ -2155,7 +2340,7 @@ public class NewBranch : Object - public class Xcls_Box51 : Object + public class Xcls_quick_commit_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -2164,26 +2349,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_diff_sv( _this ); child_1.ref(); - this.el.pack_start ( child_1.el , true,true,0 ); + 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; @@ -2192,10 +2382,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( 5, 5, true ); + this.el = new Gtk.Table( 3, 5, true ); // my vars (dec) @@ -2204,20 +2394,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; @@ -2226,10 +2416,10 @@ 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( "Commit Message" ); + this.el = new Gtk.Label( "Just commit with this comment" ); // my vars (dec) @@ -2261,6 +2451,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 @@ -2297,23 +2494,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; } @@ -2324,7 +2516,7 @@ public class NewBranch : Object } - public class Xcls_ScrolledWindow56 : Object + public class Xcls_diff_sv : Object { public Gtk.ScrolledWindow el; private NewBranch _this; @@ -2333,15 +2525,18 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_ScrolledWindow56(NewBranch _owner ) + public Xcls_diff_sv(NewBranch _owner ) { _this = _owner; + _this.diff_sv = this; this.el = new Gtk.ScrolledWindow( null, null ); // my vars (dec) // set gobject values this.el.height_request = 400; + this.el.vexpand = true; + this.el.visible = false; var child_0 = new Xcls_diff_view( _this ); child_0.ref(); this.el.add ( child_0.el );