X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=afe3c54a3250349dedf6591c81f8377993fa2398;hb=9c2e64777747848a1bcaad1d151d5a1c2a0d2719;hp=d725d32766de76c561af492fb37f0aaf5a68f034;hpb=730c5ff2923f1782ebf717efb8337e535b3b3ea0;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index d725d327..afe3c54a 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -15,6 +15,7 @@ public class NewBranch : Object public Xcls_label_select_ticket label_select_ticket; public Xcls_label_create_ticket label_create_ticket; public Xcls_label_quick_commit label_quick_commit; + public Xcls_select_ticket_tab select_ticket_tab; public Xcls_projectsel projectsel; public Xcls_prcellrenderer prcellrenderer; public Xcls_prmodel prmodel; @@ -29,8 +30,8 @@ public class NewBranch : Object public Xcls_view view; public Xcls_table table; public Xcls_project_id project_id; - public Xcls_prcellrenderer prcellrenderer; - public Xcls_prmodel prmodel; + public Xcls_tprcellrenderer tprcellrenderer; + public Xcls_tprmodel tprmodel; public Xcls_summary summary; public Xcls_milestone_id milestone_id; public Xcls_msmodel msmodel; @@ -43,16 +44,9 @@ public class NewBranch : Object public Xcls_clmodel clmodel; public Xcls_developer_id developer_id; public Xcls_devmodel devmodel; - 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_commit_message commit_message; public Xcls_createbtn createbtn; - public Xcls_btn_not_me btn_not_me; - public Xcls_btn_closed btn_closed; + public Xcls_diff_view diff_view; // my vars (def) public GitRepo? repo; @@ -141,39 +135,35 @@ public class NewBranch : Object if (this.running) { // should not happen!! GLib.error("new branch show called, when already being displayed?"); } - this.queue = queue; + + this.queue = queue; this.running = true; GitMonitor.gitmonitor.stop(); + this.repo = repo; - - - this.el.move((Gdk.Screen.width() / 2)- 250 ,0); 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); + + _this.select_ticket_tab.load_data(); + _this.create_ticket_tab.load_data(); + _this.quick_commit_tab.load_data(); + - var curproj = RooProject.getProjectByRepo(this.repo); - _this.prmodel.loadProjects(curproj == null ? "" : curproj.id); - _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid); - _this.createbtn.updateState(); - - _this.ticketsel.el.get_child().get_style_context().remove_class("warning"); - 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())); - } else { - _this.ticketsel.el.get_child().get_style_context().add_class("warning"); - } - _this.view.loadTicket(tid); + + + this.el.run(); } @@ -201,7 +191,7 @@ public class NewBranch : Object child_1.ref(); var child_2 = new Xcls_label_quick_commit( _this ); child_2.ref(); - var child_3 = new Xcls_Box6( _this ); + var child_3 = new Xcls_select_ticket_tab( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_select_ticket.el ); var child_4 = new Xcls_Box25( _this ); @@ -283,7 +273,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Box6 : Object + public class Xcls_select_ticket_tab : Object { public Gtk.Box el; private NewBranch _this; @@ -292,9 +282,10 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box6(NewBranch _owner ) + public Xcls_select_ticket_tab(NewBranch _owner ) { _this = _owner; + _this.select_ticket_tab = this; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); // my vars (dec) @@ -310,6 +301,28 @@ public class NewBranch : Object } // user defined functions + public void load_data () { + + GLib.debug("Loading tickets"); + + var curproj = RooProject.getProjectByRepo(this.repo); + _this.prmodel.loadProjects(curproj == null ? "" : curproj.id); + + _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid); + _this.createbtn.updateState(); + + _this.ticketsel.el.get_child().get_style_context().remove_class("warning"); + 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())); + } else { + _this.ticketsel.el.get_child().get_style_context().add_class("warning"); + } + _this.view.loadTicket(tid); + + + } } public class Xcls_Table7 : Object { @@ -1230,10 +1243,10 @@ public class NewBranch : Object this.loading = false; // set gobject values - var child_0 = new Xcls_prcellrenderer( _this ); + var child_0 = new Xcls_tprcellrenderer( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true ); - var child_1 = new Xcls_prmodel( _this ); + var child_1 = new Xcls_tprmodel( _this ); child_1.ref(); this.el.set_model ( child_1.el ); @@ -1291,7 +1304,7 @@ public class NewBranch : Object this.el.get_active_iter (out iter); - _this.prmodel.el.get_value (iter, 0, out val1); + _this.tprmodel.el.get_value (iter, 0, out val1); return (string) val1; @@ -1301,7 +1314,7 @@ public class NewBranch : Object } } - public class Xcls_prcellrenderer : Object + public class Xcls_tprcellrenderer : Object { public Gtk.CellRendererText el; private NewBranch _this; @@ -1310,10 +1323,10 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_prcellrenderer(NewBranch _owner ) + public Xcls_tprcellrenderer(NewBranch _owner ) { _this = _owner; - _this.prcellrenderer = this; + _this.tprcellrenderer = this; this.el = new Gtk.CellRendererText(); // my vars (dec) @@ -1324,7 +1337,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_prmodel : Object + public class Xcls_tprmodel : Object { public Gtk.ListStore el; private NewBranch _this; @@ -1333,10 +1346,10 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_prmodel(NewBranch _owner ) + public Xcls_tprmodel(NewBranch _owner ) { _this = _owner; - _this.prmodel = this; + _this.tprmodel = this; this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); // my vars (dec) @@ -2183,6 +2196,9 @@ public class NewBranch : Object var child_0 = new Xcls_Table52( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); + var child_1 = new Xcls_ScrolledWindow56( _this ); + child_1.ref(); + this.el.add ( child_1.el ); } // user defined functions @@ -2199,7 +2215,7 @@ public class NewBranch : Object public Xcls_Table52(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Table( 5, 5, true ); + this.el = new Gtk.Table( 2, 5, true ); // my vars (dec) @@ -2211,27 +2227,12 @@ public class NewBranch : Object var child_0 = new Xcls_Label53( _this ); child_0.ref(); this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_Label54( _this ); + var child_1 = new Xcls_commit_message( _this ); child_1.ref(); - this.el.attach_defaults ( child_1.el , 1,2,0,1 ); - var child_2 = new Xcls_projectsel( _this ); + this.el.attach_defaults ( child_1.el , 0,4,1,2 ); + var child_2 = new Xcls_createbtn( _this ); child_2.ref(); - this.el.attach_defaults ( child_2.el , 0,1,1,2 ); - var child_3 = new Xcls_ticketsel( _this ); - child_3.ref(); - this.el.attach_defaults ( child_3.el , 1,5,1,2 ); - var child_4 = new Xcls_Label61( _this ); - child_4.ref(); - this.el.attach_defaults ( child_4.el , 0,1,3,4 ); - var child_5 = new Xcls_name( _this ); - child_5.ref(); - this.el.attach_defaults ( child_5.el , 0,4,4,5 ); - var child_6 = new Xcls_createbtn( _this ); - child_6.ref(); - this.el.attach_defaults ( child_6.el , 4,5,4,5 ); - var child_7 = new Xcls_Box64( _this ); - child_7.ref(); - this.el.attach_defaults ( child_7.el , 0,5,2,3 ); + this.el.attach_defaults ( child_2.el , 4,5,1,2 ); } // user defined functions @@ -2248,614 +2249,158 @@ public class NewBranch : Object public Xcls_Label53(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "Project" ); + this.el = new Gtk.Label( "Just commit with this comment" ); // my vars (dec) // set gobject values this.el.halign = Gtk.Align.START; this.el.justify = Gtk.Justification.RIGHT; - this.el.visible = true; + this.el.xalign = 0.900000f; } // user defined functions } - public class Xcls_Label54 : Object + public class Xcls_commit_message : Object { - public Gtk.Label el; + public Gtk.Entry el; private NewBranch _this; // my vars (def) // ctor - public Xcls_Label54(NewBranch _owner ) + public Xcls_commit_message(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "Ticket" ); + _this.commit_message = this; + this.el = new Gtk.Entry(); // 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 class Xcls_createbtn : Object { - public Gtk.ComboBox el; + public Gtk.Button el; private NewBranch _this; // my vars (def) - public bool loading; // ctor - public Xcls_projectsel(NewBranch _owner ) + public Xcls_createbtn(NewBranch _owner ) { _this = _owner; - _this.projectsel = this; - this.el = new Gtk.ComboBox.with_entry(); + _this.createbtn = this; + this.el = new Gtk.Button(); // 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 ); + this.el.label = "Commit Changes"; // init method - this.el.set_entry_text_column(1); + { + this.el.get_style_context().add_class("suggested-action"); + } //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(); + this.el.clicked.connect( () => { + + GLib.debug("fire response = 1"); - if (ticket_id == "" || ticket_id == null) { + var ticket_id = _this.ticketsel.selectedTicketId(); - var dt = new DateTime.now_local(); - _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d"))); + if (ticket_id == "") { + _this.ticketsel.el.get_child().get_style_context().add_class("warning"); 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); - */ + + _this.el.response(1); }); } // 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); - + public void updateState () { - return (string) val1; - - - + var ticket_id = _this.ticketsel.selectedTicketId(); + if (ticket_id == "") { + this.el.set_sensitive(false); + return; + } + + this.el.set_sensitive(true); + } } - 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 class Xcls_ScrolledWindow56 : Object { - public Gtk.ListStore el; + public Gtk.ScrolledWindow el; private NewBranch _this; // my vars (def) // ctor - public Xcls_prmodel(NewBranch _owner ) + public Xcls_ScrolledWindow56(NewBranch _owner ) { _this = _owner; - _this.prmodel = this; - this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); + this.el = new Gtk.ScrolledWindow( null, null ); // my vars (dec) // set gobject values + this.el.height_request = 400; + this.el.vexpand = true; + var child_0 = new Xcls_diff_view( _this ); + child_0.ref(); + this.el.add ( child_0.el ); } // user defined functions - public void loadProjects (string id) { - - - - _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); - } - - foreach(var project in RooProject.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 class Xcls_diff_view : Object { - public Gtk.ComboBox el; + public Gtk.SourceView el; private NewBranch _this; // my vars (def) - public bool loading; // ctor - public Xcls_ticketsel(NewBranch _owner ) + public Xcls_diff_view(NewBranch _owner ) { _this = _owner; - _this.ticketsel = this; - this.el = new Gtk.ComboBox.with_entry(); + _this.diff_view = this; + this.el = new Gtk.SourceView(); // my vars (dec) - this.loading = false; - - // set gobject values - var child_0 = new Xcls_dbcellrenderer( _this ); - child_0.ref(); - this.el.pack_start ( child_0.el , true ); - var child_1 = new Xcls_dbmodel( _this ); - child_1.ref(); - this.el.set_model ( child_1.el ); // init method - //this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 ); - this.el.set_entry_text_column(1); - this.el.get_child().set_sensitive(false); - - //listeners - this.el.changed.connect( () => { - if (this.loading) { - return; - } - var ticket_id = this.selectedTicketId(); - - var name = RooTicket.singleton().usernameLocal(); - - this.el.get_child().get_style_context().remove_class("warning"); - 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"))); - _this.view.loadTicket(""); - - this.el.get_child().get_style_context().add_class("warning"); - _this.createbtn.updateState(); - return; - } - - - var ticket = RooTicket.singleton().getById(ticket_id); - - _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); - _this.scrolled_window.el.show(); - - _this.view.loadTicket(ticket.id); - _this.createbtn.updateState(); - - //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); - }); - } + var description = Pango.FontDescription.from_string("monospace"); + description.set_size(9000); + this.el.override_font(description); + var lm = Gtk.SourceLanguageManager.get_default(); + + ((Gtk.SourceBuffer)(this.el.get_buffer())).set_language( + lm.get_language("diff") + ); + } // 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 NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_dbcellrenderer(NewBranch _owner ) - { - _this = _owner; - _this.dbcellrenderer = this; - this.el = new Gtk.CellRendererText(); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_dbmodel : Object - { - public Gtk.ListStore el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_dbmodel(NewBranch _owner ) - { - _this = _owner; - _this.dbmodel = this; - this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - public void loadTickets (string project_id , string tid = "") { - - - - // 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; - var el = this.el; - - el.append(out iter); - - - el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select a ticket --"); - - _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".printf( ticket.id, ticket.summary)); - - 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_Label61 : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Label61(NewBranch _owner ) - { - _this = _owner; - 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; - } - - // user defined functions - } - - public class Xcls_name : Object - { - public Gtk.Entry el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_name(NewBranch _owner ) - { - _this = _owner; - _this.name = this; - this.el = new Gtk.Entry(); - - // my vars (dec) - - // set gobject values - this.el.visible = true; - } - - // user defined functions - } - - public class Xcls_createbtn : Object - { - public Gtk.Button el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_createbtn(NewBranch _owner ) - { - _this = _owner; - _this.createbtn = this; - this.el = new Gtk.Button(); - - // my vars (dec) - - // set gobject values - 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"); - - 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); - }); - } - - // user defined functions - public void updateState () { - - var ticket_id = _this.ticketsel.selectedTicketId(); - - if (ticket_id == "") { - this.el.set_sensitive(false); - return; - } - - this.el.set_sensitive(true); - - } - } - - public class Xcls_Box64 : Object - { - public Gtk.Box el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Box64(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); - - // my vars (dec) - - // set gobject values - 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_Label67( _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_Label67 : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Label67(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") { - RooProject.reload(); - var curproj = RooProject.getProjectByRepo(_this.repo); - _this.prmodel.loadProjects(curproj == null ? "": curproj.id); - - _this.dbmodel.loadTickets(curproj == null ? "": curproj.id); - } - return true; - }); - } - - // user defined functions - } -