X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=83284d2afce09c8149977a3a480ba42746c28754;hb=48b3d2b4281bfa78ae11b4dfb5f91d5475aefd90;hp=0d232587958d88f4d87e7f26f4b07d3640832ac9;hpb=f6ea95af02288a1c6f9645da316dcb7718f12018;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index 0d232587..83284d2a 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -1,16 +1,16 @@ -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_dbcellrenderer dbcellrenderer; @@ -20,7 +20,7 @@ public class Xcls_DialogNewComponent : Object // my vars (def) // ctor - public Xcls_DialogNewComponent() + public NewBranch() { _this = this; this.el = new Gtk.Dialog(); @@ -51,10 +51,11 @@ public class Xcls_DialogNewComponent : Object }); this.el.response.connect( (self, response_id) => { - + GLib.debug("got %d", (int) response_id); }); this.el.show.connect( (self) => { - this.el.show_all(); + + //test }); } @@ -62,22 +63,29 @@ public class Xcls_DialogNewComponent : Object // user defined functions public void show ( ) { + // this.el.set_gravity(Gdk.Gravity.NORTH); + + this.el.move((Gdk.Screen.width() / 2)- 250 ,0); + GLib.debug("Loading tickets"); + _this.dbmodel.loadTickets(); + + this.el.show_all(); + + + - - //this.success = c.success; - - + } 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 ); @@ -95,20 +103,22 @@ 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 ); @@ -128,13 +138,13 @@ 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( "Select Ticket" ); @@ -153,13 +163,13 @@ public class Xcls_DialogNewComponent : Object public class Xcls_build_module : Object { public Gtk.ComboBox el; - private Xcls_DialogNewComponent _this; + private NewBranch _this; // my vars (def) // ctor - public Xcls_build_module(Xcls_DialogNewComponent _owner ) + public Xcls_build_module(NewBranch _owner ) { _this = _owner; _this.build_module = this; @@ -178,6 +188,30 @@ public class Xcls_DialogNewComponent : Object // init method this.el.add_attribute(_this.dbcellrenderer.el , "markup", 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 (ticket_id == "") { + _this.name.el.set_text("wip_NAME_DATE"); + return; + } + + var ticket = RooTicket.singleton().getById(ticket_id); + + _this.name.el.set_text("wip_NAME_T%s_%s".printf(ticket.id, ticket.summaryToBranchName())); + + //GLib.debug ("Selection: %s, %s\n", (string) val1, (string) val2); + }); } // user defined functions @@ -185,13 +219,13 @@ public class Xcls_DialogNewComponent : Object 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; @@ -208,13 +242,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; @@ -226,38 +260,38 @@ public class Xcls_DialogNewComponent : Object } // user defined functions - public void loadData (Gee.ArrayList data, string cur) { + public void loadTickets () { + + RooTicket.singleton().loadTickets(); + + + 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.build_module.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.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); } } @@ -266,13 +300,13 @@ 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( "or use this as branch name" ); @@ -290,13 +324,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; @@ -316,13 +350,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(); @@ -330,6 +364,7 @@ public class Xcls_DialogNewComponent : Object // my vars (dec) // set gobject values + this.el.relief = Gtk.ReliefStyle.NONE; this.el.label = "Do not create Branch"; } @@ -339,13 +374,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();