X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=afe3c54a3250349dedf6591c81f8377993fa2398;hb=9c2e64777747848a1bcaad1d151d5a1c2a0d2719;hp=c4c372dad80fd5d691acef1e6b0340d1712a4701;hpb=5ca4a426e7459b4296fe0264cf1471c3b4cc6e9b;p=gitlive diff --git a/NewBranch.vala b/NewBranch.vala index c4c372da..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; @@ -45,6 +46,7 @@ public class NewBranch : Object public Xcls_devmodel devmodel; public Xcls_commit_message commit_message; public Xcls_createbtn createbtn; + public Xcls_diff_view diff_view; // my vars (def) public GitRepo? repo; @@ -133,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(); } @@ -193,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 ); @@ -275,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; @@ -284,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) @@ -302,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 { @@ -1222,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 ); @@ -1283,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; @@ -1293,7 +1314,7 @@ public class NewBranch : Object } } - public class Xcls_prcellrenderer : Object + public class Xcls_tprcellrenderer : Object { public Gtk.CellRendererText el; private NewBranch _this; @@ -1302,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) @@ -1316,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; @@ -1325,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) @@ -2175,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 @@ -2191,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) @@ -2208,7 +2232,7 @@ public class NewBranch : Object 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 , 4,5,4,5 ); + this.el.attach_defaults ( child_2.el , 4,5,1,2 ); } // user defined functions @@ -2225,7 +2249,7 @@ public class NewBranch : Object public Xcls_Label53(NewBranch _owner ) { _this = _owner; - this.el = new Gtk.Label( "Commit Message" ); + this.el = new Gtk.Label( "Just commit with this comment" ); // my vars (dec) @@ -2320,6 +2344,65 @@ public class NewBranch : Object } + public class Xcls_ScrolledWindow56 : Object + { + public Gtk.ScrolledWindow el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_ScrolledWindow56(NewBranch _owner ) + { + _this = _owner; + 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 class Xcls_diff_view : Object + { + public Gtk.SourceView el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_diff_view(NewBranch _owner ) + { + _this = _owner; + _this.diff_view = this; + this.el = new Gtk.SourceView(); + + // my vars (dec) + + // init method + + 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 + } + + }