X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.vala;h=602922edb30568ab45f7266e8044ec4590dcf48a;hp=9eda8da66fb3772c41f50c86946dbdb0af93344b;hb=1ca3cefd12af4ec1e3cfa3469fbcfc1afc129723;hpb=fdfb0982809b5ff8e42fd306025871b058f70263 diff --git a/NewBranch.vala b/NewBranch.vala index 9eda8da6..602922ed 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -1,35 +1,40 @@ -static Xcls_DialogNewComponent _DialogNewComponent; +static NewBranch _NewBranch; -public class Xcls_DialogNewComponent : Object +public class NewBranch : Object { public Gtk.Dialog el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; - public static Xcls_DialogNewComponent singleton() + public static NewBranch singleton() { - if (_DialogNewComponent == null) { - _DialogNewComponent= new Xcls_DialogNewComponent(); + if (_NewBranch == null) { + _NewBranch= new NewBranch(); } - return _DialogNewComponent; + return _NewBranch; } - public Xcls_build_module build_module; + public Xcls_ticketsel ticketsel; public Xcls_dbcellrenderer dbcellrenderer; public Xcls_dbmodel dbmodel; public Xcls_name name; // my vars (def) - public signal void success (Project.Project pr, JsRender.JsRender file); + public GitRepo? repo; + public bool running; + public Gee.ArrayList queue; // ctor - public Xcls_DialogNewComponent() + public NewBranch() { _this = this; this.el = new Gtk.Dialog(); // my vars (dec) + this.repo = null; + this.running = false; + this.queue = null; // set gobject values - this.el.title = "New Component"; + this.el.title = "Create a working branch "; this.el.default_height = 200; this.el.default_width = 500; this.el.deletable = true; @@ -52,60 +57,78 @@ public class Xcls_DialogNewComponent : Object }); this.el.response.connect( (self, response_id) => { + GLib.debug("got %d", (int) response_id); + if (response_id == 0) { + _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(); + if (ticket_id != "" ) { + this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn); + } else { + this.repo.setActiveTicket( RooTicket.singleton().getById("-1"), bn); + } + } + + this.running = false; + + this.el.hide(); + + + }); this.el.show.connect( (self) => { - this.el.show_all(); + + //test }); } // user defined functions - public void updateFileFromEntry () { - - _this.file.title = _this.title.el.get_text(); - _this.file.region = _this.region.el.get_text(); - _this.file.parent = _this.parent.el.get_text(); - _this.file.permname = _this.permname.el.get_text(); - _this.file.modOrder = _this.modOrder.el.get_text(); - - if (_this.file.name.length > 0 && _this.file.name != _this.name.el.get_text()) { - _this.file.renameTo(_this.name.el.get_text()); - } - // store the module... - _this.file.build_module = ""; - Gtk.TreeIter iter; - if (_this.build_module.el.get_active_iter (out iter)) { - Value vfname; - this.dbmodel.el.get_value (iter, 0, out vfname); - if (((string)vfname).length > 0) { - _this.file.build_module = (string)vfname; - } - - } - - - - - } - public void show ( ) + public void show ( GitRepo repo, Gee.ArrayList queue ) { + // 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.success = c.success; - - + this.el.move((Gdk.Screen.width() / 2)- 250 ,0); + GLib.debug("Loading tickets"); + + + this.el.show_all(); + _this.dbmodel.loadTickets(); + } public class Xcls_VBox2 : Object { public Gtk.VBox el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_VBox2(Xcls_DialogNewComponent _owner ) + public Xcls_VBox2(NewBranch _owner ) { _this = _owner; this.el = new Gtk.VBox( true, 0 ); @@ -123,26 +146,28 @@ public class Xcls_DialogNewComponent : Object public class Xcls_Table3 : Object { public Gtk.Table el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_Table3(Xcls_DialogNewComponent _owner ) + public Xcls_Table3(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Table( 3, 2, true ); + this.el = new Gtk.Table( 2, 2, false ); // my vars (dec) // set gobject values + this.el.margin = 2; + this.el.column_spacing = 2; 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_ticketsel( _this ); child_1.ref(); - this.el.attach_defaults ( child_1.el , 1,2,1,2 ); + this.el.attach_defaults ( child_1.el , 1,2,0,1 ); var child_2 = new Xcls_Label8( _this ); child_2.ref(); this.el.attach_defaults ( child_2.el , 0,1,1,2 ); @@ -156,16 +181,16 @@ public class Xcls_DialogNewComponent : Object public class Xcls_Label4 : Object { public Gtk.Label el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_Label4(Xcls_DialogNewComponent _owner ) + public Xcls_Label4(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "Module to build (Vala only)" ); + this.el = new Gtk.Label( "Select Ticket" ); // my vars (dec) @@ -178,22 +203,24 @@ public class Xcls_DialogNewComponent : Object // user defined functions } - public class Xcls_build_module : Object + public class Xcls_ticketsel : Object { public Gtk.ComboBox el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) + public bool loading; // ctor - public Xcls_build_module(Xcls_DialogNewComponent _owner ) + public Xcls_ticketsel(NewBranch _owner ) { _this = _owner; - _this.build_module = this; + _this.ticketsel = this; this.el = new Gtk.ComboBox(); // my vars (dec) + this.loading = false; // set gobject values var child_0 = new Xcls_dbcellrenderer( _this ); @@ -206,20 +233,59 @@ public class Xcls_DialogNewComponent : Object // init method this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 ); + + //listeners + this.el.changed.connect( () => { + 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 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 { public Gtk.CellRendererText el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_dbcellrenderer(Xcls_DialogNewComponent _owner ) + public Xcls_dbcellrenderer(NewBranch _owner ) { _this = _owner; _this.dbcellrenderer = this; @@ -236,13 +302,13 @@ public class Xcls_DialogNewComponent : Object public class Xcls_dbmodel : Object { public Gtk.ListStore el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_dbmodel(Xcls_DialogNewComponent _owner ) + public Xcls_dbmodel(NewBranch _owner ) { _this = _owner; _this.dbmodel = this; @@ -254,38 +320,39 @@ public class Xcls_DialogNewComponent : Object } // user defined functions - public void loadData (Gee.ArrayList data, string cur) { + public void loadTickets () { + + RooTicket.singleton().loadTickets(); + + _this.ticketsel.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, "aaa - Just add Element - aaa"); - el.append(out iter); el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select a module --"); - _this.build_module.el.set_active_iter(iter); + el.set_value(iter, 1, "-- select a ticket --"); - for (var i = 0; i < data.size;i++) { + _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, data.get(i)); - el.set_value(iter, 1, data.get(i)); + 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 (data.get(i) == cur) { + // _this.build_module.el.set_active_iter(iter); + // } } - this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); + + _this.ticketsel.loading = false; + //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); } } @@ -294,16 +361,16 @@ public class Xcls_DialogNewComponent : Object public class Xcls_Label8 : Object { public Gtk.Label el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_Label8(Xcls_DialogNewComponent _owner ) + public Xcls_Label8(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "Component Name" ); + this.el = new Gtk.Label( "or use this as branch name" ); // my vars (dec) @@ -318,13 +385,13 @@ public class Xcls_DialogNewComponent : Object public class Xcls_name : Object { public Gtk.Entry el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_name(Xcls_DialogNewComponent _owner ) + public Xcls_name(NewBranch _owner ) { _this = _owner; _this.name = this; @@ -344,13 +411,13 @@ public class Xcls_DialogNewComponent : Object public class Xcls_Button10 : Object { public Gtk.Button el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_Button10(Xcls_DialogNewComponent _owner ) + public Xcls_Button10(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -358,7 +425,8 @@ public class Xcls_DialogNewComponent : Object // my vars (dec) // set gobject values - this.el.label = "Cancel"; + this.el.relief = Gtk.ReliefStyle.NONE; + this.el.label = "Do not create Branch"; } // user defined functions @@ -367,13 +435,13 @@ public class Xcls_DialogNewComponent : Object public class Xcls_Button11 : Object { public Gtk.Button el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_Button11(Xcls_DialogNewComponent _owner ) + public Xcls_Button11(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -381,7 +449,7 @@ public class Xcls_DialogNewComponent : Object // my vars (dec) // set gobject values - this.el.label = "OK"; + this.el.label = "Create Branch"; } // user defined functions