X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=d13b5ba625036cef305c978823972c6ad246ce73;hb=886d2cd45df8370ff1ff789ccab8fa8ef683fabb;hp=4cf54920eac0ba37a0ff5ac607b8e01b7ab49f39;hpb=5647cc05582b3626a666e1419fc085921fed8948;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index 4cf54920..d13b5ba6 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; @@ -73,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 ); @@ -172,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; @@ -181,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) @@ -1135,7 +1137,7 @@ public class NewBranch : Object if (_this.repo != null) { curproj = RooProject.getProjectByRepo(_this.repo); } - _this.prmodel.loadProjects(curproj == null ? "" : curproj.id); + _this.tprmodel.loadProjects(curproj == null ? "" : curproj.id); if (curproj != null) { @@ -2293,7 +2295,7 @@ 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 @@ -2308,7 +2310,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) @@ -2322,10 +2324,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 @@ -2374,6 +2376,12 @@ public class NewBranch : Object // set gobject values this.el.visible = true; + + //listeners + this.el.key_release_event.connect( () => { + + _this.createbtn.updateState(); + }); } // user defined functions @@ -2410,23 +2418,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; }