X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=7985727f3e973bbdb8c4e6ff74dd5c8daa951f27;hb=1c3d87de49e514421b3a08bfc3d6d4a822517f98;hp=dd5200eea40389ba233a1b2d42dda89084957cee;hpb=128c96fc9db69baca7ba185e8a3def8fddff5f27;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index dd5200ee..7985727f 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -106,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(); @@ -163,7 +175,7 @@ public class NewBranch : Object _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(""); @@ -2294,8 +2306,8 @@ public class NewBranch : Object // user defined functions public void load_data () { - _this.commit_message.el.set_text(""); - + + _this.createbtn.updateState(); } } public class Xcls_Table53 : Object @@ -2310,7 +2322,7 @@ public class NewBranch : Object 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) @@ -2324,10 +2336,10 @@ public class NewBranch : Object 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 @@ -2376,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 @@ -2412,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; }