X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=7985727f3e973bbdb8c4e6ff74dd5c8daa951f27;hb=1c3d87de49e514421b3a08bfc3d6d4a822517f98;hp=f19e2bd3fa4293c215f279e36e13b0002208713c;hpb=68ae63ed1edf06b3b26be68e68ffc9998294b1af;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index f19e2bd3..7985727f 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; @@ -45,6 +46,7 @@ public class NewBranch : Object public Xcls_clmodel clmodel; public Xcls_developer_id developer_id; public Xcls_devmodel devmodel; + public Xcls_spinner spinner; public Xcls_quick_commit_tab quick_commit_tab; public Xcls_commit_message commit_message; public Xcls_createbtn createbtn; @@ -72,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 ); @@ -104,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(); @@ -156,10 +170,12 @@ public class NewBranch : Object this.el.show_all(); 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.create_ticket_tab.load_data(); + //_this.quick_commit_tab.load_data(); + _this.commit_message.el.set_text(""); @@ -169,7 +185,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; @@ -178,9 +194,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) @@ -202,6 +219,23 @@ public class NewBranch : Object 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: + break; // do nothing.. it's already loaded at start. + case 1: + _this.create_ticket_tab.load_data(); + break; + case 2: + _this.quick_commit_tab.load_data(); + break; + default: + break; + } + }); } // user defined functions @@ -1097,16 +1131,17 @@ public class NewBranch : Object var child_0 = new Xcls_table( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); + var child_1 = new Xcls_spinner( _this ); + child_1.ref(); + this.el.add ( child_1.el ); } // 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; - + _this.table.el.hide(); + _this.spinner.el.show(); + _this.spinner.el.start(); Timeout.add_seconds(1, () => { @@ -1114,7 +1149,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) { @@ -1130,11 +1165,11 @@ public class NewBranch : Object } _this.summary.el.set_text(""); _this.description.el.buffer.text = ""; - //_this.spinner.el.stop(); - //_this.spinner.el.hide(); + _this.spinner.el.stop(); + _this.spinner.el.hide(); _this.table.el.show(); - _this.summary.el.grab_focus(); + //_this.summary.el.grab_focus(); return false; }); @@ -2216,6 +2251,31 @@ public class NewBranch : Object } + public class Xcls_spinner : Object + { + public Gtk.Spinner el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_spinner(NewBranch _owner ) + { + _this = _owner; + _this.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_quick_commit_tab : Object { @@ -2236,17 +2296,21 @@ public class NewBranch : Object // 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_ScrolledWindow57( _this ); child_1.ref(); 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; @@ -2255,10 +2319,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( 2, 5, true ); + this.el = new Gtk.Table( 3, 5, true ); // my vars (dec) @@ -2267,20 +2331,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; @@ -2289,7 +2353,7 @@ 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( "Just commit with this comment" ); @@ -2324,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 @@ -2360,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; } @@ -2387,7 +2453,7 @@ public class NewBranch : Object } - public class Xcls_ScrolledWindow56 : Object + public class Xcls_ScrolledWindow57 : Object { public Gtk.ScrolledWindow el; private NewBranch _this; @@ -2396,7 +2462,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_ScrolledWindow56(NewBranch _owner ) + public Xcls_ScrolledWindow57(NewBranch _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null );