X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.vala;h=c9bff826a4caa8360aae952afaf7682bb1e837ae;hp=a2ae2cdd70b9fccfcf5abcccecb3e978ab9bd360;hb=ce5337e4ad3400605415fb497dbbced99ed35860;hpb=c0a1ded8d5edf9d864e8fe66dad9b2bfa2f3b250 diff --git a/NewBranch.vala b/NewBranch.vala index a2ae2cdd..c9bff826 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -12,12 +12,20 @@ public class NewBranch : Object } return _NewBranch; } - public Xcls_build_module build_module; + public Xcls_projectsel projectsel; + public Xcls_prcellrenderer prcellrenderer; + public Xcls_prmodel prmodel; + public Xcls_ticketsel ticketsel; public Xcls_dbcellrenderer dbcellrenderer; public Xcls_dbmodel dbmodel; public Xcls_name name; + public Xcls_btn_not_me btn_not_me; + public Xcls_btn_closed btn_closed; // my vars (def) + public GitRepo? repo; + public bool running; + public Gee.ArrayList queue; // ctor public NewBranch() @@ -26,6 +34,9 @@ public class NewBranch : Object this.el = new Gtk.Dialog(); // my vars (dec) + this.repo = null; + this.running = false; + this.queue = null; // set gobject values this.el.title = "Create a working branch "; @@ -36,12 +47,6 @@ public class NewBranch : Object var child_0 = new Xcls_VBox2( _this ); child_0.ref(); this.el.get_content_area().add ( child_0.el ); - var child_1 = new Xcls_Button10( _this ); - child_1.ref(); - this.el.add_action_widget ( child_1.el , 0 ); - var child_2 = new Xcls_Button11( _this ); - child_2.ref(); - this.el.add_action_widget ( child_2.el , 1 ); //listeners this.el.delete_event.connect( (self, event) => { @@ -51,30 +56,83 @@ public class NewBranch : Object }); this.el.response.connect( (self, response_id) => { - GLib.debug("got %d", (int) response_id); - }); - this.el.show.connect( (self) => { - + GLib.debug("got %d", (int) response_id); + if (response_id < 1) { + _this.el.hide(); + this.running = false; + return; + } + + // have they selected a ticket.. + // make that the current active ticket? + // we really need to store locally what ticket is being worked on.. + // in theory we could be working on multiple project and not merging.. + // -- each repo would have their active ticket (only one per repo) + // -- so we could just store that in there + // -- initial load can check the contents of the ticket files on first scan. + 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(); + + } + } + - //test + this.running = false; + + this.el.hide(); + + + + }); } // user defined functions - public void show ( ) + public void show ( GitRepo repo, Gee.ArrayList queue, string tid = "" ) { // this.el.set_gravity(Gdk.Gravity.NORTH); + if (this.running) { // should not happen!! + GLib.error("new branch show called, when already being displayed?"); + } + this.queue = queue; + + this.running = true; + GitMonitor.gitmonitor.stop(); + + this.repo = repo; + + this.el.move((Gdk.Screen.width() / 2)- 250 ,0); - GLib.debug("Loading tickets"); - _this.dbmodel.loadTickets(); + this.el.set_default_size( 500,200); // not sure why it grows.. + GLib.debug("Loading tickets"); + this.el.show_all(); + this.el.set_keep_above(true); + + + var curproj = RooTicket.singleton().getProjectByRepo(this.repo); + _this.prmodel.loadProjects(curproj == null ? "" : curproj.id); + + _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid); + 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())); + } + this.el.run(); - - - } public class Xcls_VBox2 : Object { @@ -112,25 +170,42 @@ public class NewBranch : Object public Xcls_Table3(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Table( 2, 2, false ); + this.el = new Gtk.Table( 5, 5, true ); // my vars (dec) // set gobject values + this.el.expand = false; this.el.margin = 2; - this.el.column_spacing = 2; + this.el.column_spacing = 4; + this.el.vexpand = false; var child_0 = new Xcls_Label4( _this ); child_0.ref(); this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_build_module( _this ); + var child_1 = new Xcls_Label5( _this ); child_1.ref(); this.el.attach_defaults ( child_1.el , 1,2,0,1 ); - var child_2 = new Xcls_Label8( _this ); + var child_2 = new Xcls_projectsel( _this ); child_2.ref(); this.el.attach_defaults ( child_2.el , 0,1,1,2 ); - var child_3 = new Xcls_name( _this ); + var child_3 = new Xcls_ticketsel( _this ); child_3.ref(); - this.el.attach_defaults ( child_3.el , 1,2,1,2 ); + this.el.attach_defaults ( child_3.el , 1,4,1,2 ); + var child_4 = new Xcls_Button12( _this ); + child_4.ref(); + this.el.attach_defaults ( child_4.el , 4,5,1,2 ); + var child_5 = new Xcls_Label13( _this ); + child_5.ref(); + this.el.attach_defaults ( child_5.el , 0,1,3,4 ); + var child_6 = new Xcls_name( _this ); + child_6.ref(); + this.el.attach_defaults ( child_6.el , 0,4,4,5 ); + var child_7 = new Xcls_Button15( _this ); + child_7.ref(); + this.el.attach_defaults ( child_7.el , 4,5,4,5 ); + var child_8 = new Xcls_Box16( _this ); + child_8.ref(); + this.el.attach_defaults ( child_8.el , 0,5,2,3 ); } // user defined functions @@ -147,36 +222,226 @@ public class NewBranch : Object public Xcls_Label4(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "Select Ticket" ); + this.el = new Gtk.Label( "Project" ); // my vars (dec) // set gobject values + this.el.halign = Gtk.Align.START; this.el.justify = Gtk.Justification.RIGHT; - this.el.xalign = 0.900000f; this.el.visible = true; } // user defined functions } - public class Xcls_build_module : Object + public class Xcls_Label5 : Object + { + public Gtk.Label el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label5(NewBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "Ticket" ); + + // my vars (dec) + + // set gobject values + this.el.halign = Gtk.Align.START; + this.el.visible = true; + } + + // user defined functions + } + + public class Xcls_projectsel : Object { public Gtk.ComboBox el; private NewBranch _this; + // my vars (def) + public bool loading; + + // ctor + public Xcls_projectsel(NewBranch _owner ) + { + _this = _owner; + _this.projectsel = this; + this.el = new Gtk.ComboBox.with_entry(); + + // my vars (dec) + this.loading = false; + + // set gobject values + var child_0 = new Xcls_prcellrenderer( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , true ); + var child_1 = new Xcls_prmodel( _this ); + child_1.ref(); + this.el.set_model ( child_1.el ); + + // init method + + this.el.set_entry_text_column(1); + + //listeners + this.el.changed.connect( () => { + if (this.loading) { + return; + } + var project_id = this.selectedProjectId(); + _this.dbmodel.loadTickets(project_id); + + + /*if (this.loading) { + return; + } + var ticket_id = this.selectedTicketId(); + + var name = RooTicket.singleton().usernameLocal(); + + if (ticket_id == "" || ticket_id == null) { + + var dt = new DateTime.now_local(); + _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d"))); + return; + } + + + var ticket = RooTicket.singleton().getById(ticket_id); + + _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); + + //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); + */ + }); + } + + // user defined functions + public string selectedProjectId () { + Gtk.TreeIter iter; + Value val1; + + + this.el.get_active_iter (out iter); + _this.prmodel.el.get_value (iter, 0, out val1); + + + return (string) val1; + + + + + } + } + public class Xcls_prcellrenderer : Object + { + public Gtk.CellRendererText el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_prcellrenderer(NewBranch _owner ) + { + _this = _owner; + _this.prcellrenderer = this; + this.el = new Gtk.CellRendererText(); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_prmodel : Object + { + public Gtk.ListStore el; + private NewBranch _this; + + // my vars (def) // ctor - public Xcls_build_module(NewBranch _owner ) + public Xcls_prmodel(NewBranch _owner ) { _this = _owner; - _this.build_module = this; - this.el = new Gtk.ComboBox(); + _this.prmodel = this; + this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); // my vars (dec) + // set gobject values + } + + // user defined functions + public void loadProjects (string id) { + + var rt = RooTicket.singleton(); + rt.loadProjects(); + + _this.projectsel.loading = true; + + this.el.clear(); + Gtk.TreeIter iter; + var el = this.el; + + el.append(out iter); + + + el.set_value(iter, 0, ""); + el.set_value(iter, 1, "-- select a project --"); + if (id == "") { + _this.projectsel.el.set_active_iter(iter); + } + var projects = rt.projects; + foreach(var project in projects) { + + el.append(out iter); + + el.set_value(iter, 0, project.id); + el.set_value(iter, 1, project.name ); + if (id == project.id) { + _this.projectsel.el.set_active_iter(iter); + } + + } + + _this.projectsel.loading = false; + //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); + + } + } + + + public class Xcls_ticketsel : Object + { + public Gtk.ComboBox el; + private NewBranch _this; + + + // my vars (def) + public bool loading; + + // ctor + public Xcls_ticketsel(NewBranch _owner ) + { + _this = _owner; + _this.ticketsel = this; + this.el = new Gtk.ComboBox.with_entry(); + + // my vars (dec) + this.loading = false; + // set gobject values var child_0 = new Xcls_dbcellrenderer( _this ); child_0.ref(); @@ -187,29 +452,26 @@ public class NewBranch : Object // init method - this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 ); + //this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 ); + this.el.set_entry_text_column(1); //listeners this.el.changed.connect( () => { - Gtk.TreeIter iter; - Value val1; - Value val2; - - this.el.get_active_iter (out iter); - _this.dbmodel.el.get_value (iter, 0, out val1); - _this.dbmodel.el.get_value (iter, 1, out val2); - - var ticket_id = (string) val1; + if (this.loading) { + return; + } + var ticket_id = this.selectedTicketId(); var name = RooTicket.singleton().usernameLocal(); - if (ticket_id == "") { + if (ticket_id == "" || ticket_id == null) { - var dt = DateTime.now_local(); - _this.name.el.set_text("wip_%s_%s".printf(name,date)); + var dt = new DateTime.now_local(); + _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d"))); return; } + var ticket = RooTicket.singleton().getById(ticket_id); _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); @@ -219,6 +481,21 @@ public class NewBranch : Object } // user defined functions + public string selectedTicketId () { + Gtk.TreeIter iter; + Value val1; + + + this.el.get_active_iter (out iter); + _this.dbmodel.el.get_value (iter, 0, out val1); + + + return (string) val1; + + + + + } } public class Xcls_dbcellrenderer : Object { @@ -264,11 +541,19 @@ public class NewBranch : Object } // user defined functions - public void loadTickets () { + public void loadTickets (string project_id , string tid = "") { + - RooTicket.singleton().loadTickets(); + // fixme .. get project id from selection.. + RooTicket.singleton().loadTickets( + project_id, + _this.btn_not_me.el.active ? RooTicket.Who.ANYBODY : RooTicket.Who.ME, + _this.btn_closed.el.active ? RooTicket.Status.ALL : RooTicket.Status.ACTIVE + ); + + _this.ticketsel.loading = true; this.el.clear(); Gtk.TreeIter iter; @@ -280,28 +565,60 @@ public class NewBranch : Object el.set_value(iter, 0, ""); el.set_value(iter, 1, "-- select a ticket --"); - _this.build_module.el.set_active_iter(iter); + _this.ticketsel.el.set_active_iter(iter); var tickets = RooTicket.singleton().tickets; foreach(var ticket in tickets) { - el.append(out iter); el.set_value(iter, 0, ticket.id); el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary)); - //if (data.get(i) == cur) { - // _this.build_module.el.set_active_iter(iter); - // } + if (ticket.id == tid) { + _this.ticketsel.el.set_active_iter(iter); + } } + + _this.ticketsel.loading = false; //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); } } - public class Xcls_Label8 : Object + public class Xcls_Button12 : Object + { + public Gtk.Button el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Button12(NewBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Button(); + + // my vars (dec) + + // set gobject values + this.el.expand = false; + this.el.label = "New Ticket"; + + //listeners + this.el.clicked.connect( () => { + _this.el.response(-1); + Ticket.singleton().show(_this.repo); + + }); + } + + // user defined functions + } + + public class Xcls_Label13 : Object { public Gtk.Label el; private NewBranch _this; @@ -310,14 +627,15 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label8(NewBranch _owner ) + public Xcls_Label13(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "or use this as branch name" ); + this.el = new Gtk.Label( "Use this as branch name" ); // my vars (dec) // set gobject values + this.el.halign = Gtk.Align.START; this.el.justify = Gtk.Justification.RIGHT; this.el.xalign = 0.900000f; } @@ -349,9 +667,7 @@ public class NewBranch : Object // user defined functions } - - - public class Xcls_Button10 : Object + public class Xcls_Button15 : Object { public Gtk.Button el; private NewBranch _this; @@ -360,7 +676,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Button10(NewBranch _owner ) + public Xcls_Button15(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -368,34 +684,152 @@ public class NewBranch : Object // my vars (dec) // set gobject values - this.el.relief = Gtk.ReliefStyle.NONE; - this.el.label = "Do not create Branch"; + this.el.label = "Create Branch"; + + // init method + + { + this.el.get_style_context().add_class("suggested-action"); + } + + //listeners + this.el.clicked.connect( () => { + GLib.debug("fire response = 1"); + _this.el.response(1); + }); } // user defined functions } - public class Xcls_Button11 : Object + public class Xcls_Box16 : Object { - public Gtk.Button el; + public Gtk.Box el; private NewBranch _this; // my vars (def) // ctor - public Xcls_Button11(NewBranch _owner ) + public Xcls_Box16(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); // my vars (dec) // set gobject values - this.el.label = "Create Branch"; + var child_0 = new Xcls_btn_not_me( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + var child_1 = new Xcls_btn_closed( _this ); + child_1.ref(); + this.el.add ( child_1.el ); + var child_2 = new Xcls_Label19( _this ); + child_2.ref(); + this.el.add ( child_2.el ); } // user defined functions } + public class Xcls_btn_not_me : Object + { + public Gtk.CheckButton el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_btn_not_me(NewBranch _owner ) + { + _this = _owner; + _this.btn_not_me = this; + this.el = new Gtk.CheckButton(); + + // my vars (dec) + + // set gobject values + this.el.label = "Show tickets not assigned to me"; + + //listeners + this.el.toggled.connect( () => { + var project_id = _this.projectsel.selectedProjectId(); + _this.dbmodel.loadTickets(project_id); + }); + } + + // user defined functions + } + + public class Xcls_btn_closed : Object + { + public Gtk.CheckButton el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_btn_closed(NewBranch _owner ) + { + _this = _owner; + _this.btn_closed = this; + this.el = new Gtk.CheckButton(); + + // my vars (dec) + + // set gobject values + this.el.label = "Show closed Tickets"; + + //listeners + this.el.toggled.connect( () => { + var project_id = _this.projectsel.selectedProjectId(); + _this.dbmodel.loadTickets(project_id); + + }); + } + + // user defined functions + } + + public class Xcls_Label19 : Object + { + public Gtk.Label el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label19(NewBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "Refresh Ticket list" ); + + // my vars (dec) + + // set gobject values + this.el.halign = Gtk.Align.END; + this.el.hexpand = true; + this.el.use_markup = true; + + //listeners + this.el.activate_link.connect( (uri) => { + if (uri == "refresh") { + var curproj = RooTicket.singleton().getProjectByRepo(_this.repo); + _this.prmodel.loadProjects(curproj == null ? "": curproj.id); + + _this.dbmodel.loadTickets(curproj == null ? "": curproj.id); + } + return true; + }); + } + + // user defined functions + } + + + }