1 static MergeBranch _MergeBranch;
3 public class MergeBranch : Object
6 private MergeBranch _this;
8 public static MergeBranch singleton()
10 if (_MergeBranch == null) {
11 _MergeBranch= new MergeBranch();
15 public Xcls_table table;
16 public Xcls_actionsel actionsel;
17 public Xcls_actioncellrenderer actioncellrenderer;
18 public Xcls_actionmodel actionmodel;
19 public Xcls_ticketsel ticketsel;
20 public Xcls_dbcellrenderer dbcellrenderer;
21 public Xcls_dbmodel dbmodel;
22 public Xcls_name name;
23 public Xcls_scrolled_window scrolled_window;
24 public Xcls_view view;
25 public Xcls_spinner spinner;
29 public RooTicket? ticket;
36 this.el = new Gtk.Dialog();
43 this.el.title = "Merge Branch";
44 this.el.default_height = 200;
45 this.el.default_width = 500;
46 this.el.deletable = true;
48 var child_0 = new Xcls_Box2( _this );
50 this.el.get_content_area().add ( child_0.el );
51 var child_1 = new Xcls_Button17( _this );
53 this.el.add_action_widget ( child_1.el , 0 );
54 var child_2 = new Xcls_Button18( _this );
56 this.el.add_action_widget ( child_2.el , 1 );
59 this.el.delete_event.connect( (self, event) => {
64 this.el.response.connect( (self, response_id) => {
66 GLib.debug("got %d", (int) response_id);
67 if (response_id < 1) {
70 GitMonitor.gitmonitor.start();
74 // have they selected a ticket..
75 // make that the current active ticket?
76 // we really need to store locally what ticket is being worked on..
77 // in theory we could be working on multiple project and not merging..
78 // -- each repo would have their active ticket (only one per repo)
79 // -- so we could just store that in there
80 // -- initial load can check the contents of the ticket files on first scan.
81 var ticket_id = _this.ticketsel.selectedTicketId();
83 if (this.repo != null) {
84 var bn = _this.name.el.get_text();
85 if (ticket_id != "" ) {
86 this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
88 this.repo.createBranchNamed(bn);
93 if (this.repo != null) {
95 _this.actionsel.selectedAction(),
96 _this.ticketsel.selectedTicketId(),
97 _this.name.el.get_text()
102 _this.actionsel.selectedAction(),
103 _this.ticketsel.selectedTicketId(),
104 _this.name.el.get_text()
107 this.running = false;
111 GitMonitor.gitmonitor.start();
117 // user defined functions
118 public void show ( RooTicket ticket, GitRepo? repo )
120 // this.el.set_gravity(Gdk.Gravity.NORTH);
124 GitMonitor.gitmonitor.stop();
128 _this.table.el.hide();
129 _this.scrolled_window.el.hide();
130 _this.spinner.el.show();
131 _this.spinner.el.start();
132 this.el.set_keep_above(true);
133 this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
134 GLib.debug("Loading tickets");
139 this.ticket = ticket;
144 _this.dbmodel.loadTickets();
145 _this.actionmodel.loadActions();
146 _this.view.loadTicket(ticket.id);
149 public class Xcls_Box2 : Object
152 private MergeBranch _this;
158 public Xcls_Box2(MergeBranch _owner )
161 this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
165 // set gobject values
166 var child_0 = new Xcls_table( _this );
168 this.el.pack_start ( child_0.el , false,false,0 );
169 var child_1 = new Xcls_scrolled_window( _this );
171 this.el.add ( child_1.el );
172 var child_2 = new Xcls_spinner( _this );
174 this.el.add ( child_2.el );
177 // user defined functions
179 public class Xcls_table : Object
182 private MergeBranch _this;
188 public Xcls_table(MergeBranch _owner )
192 this.el = new Gtk.Table( 2, 2, false );
196 // set gobject values
198 this.el.column_spacing = 2;
199 this.el.vexpand = false;
200 var child_0 = new Xcls_Label4( _this );
202 this.el.attach_defaults ( child_0.el , 0,1,0,1 );
203 var child_1 = new Xcls_actionsel( _this );
205 this.el.attach_defaults ( child_1.el , 1,2,0,1 );
206 var child_2 = new Xcls_Label8( _this );
208 this.el.attach_defaults ( child_2.el , 0,1,1,2 );
209 var child_3 = new Xcls_ticketsel( _this );
211 this.el.attach_defaults ( child_3.el , 1,2,1,2 );
212 var child_4 = new Xcls_Label12( _this );
214 this.el.attach_defaults ( child_4.el , 0,1,2,3 );
215 var child_5 = new Xcls_name( _this );
217 this.el.attach_defaults ( child_5.el , 1,2,2,3 );
220 // user defined functions
222 public class Xcls_Label4 : Object
225 private MergeBranch _this;
231 public Xcls_Label4(MergeBranch _owner )
234 this.el = new Gtk.Label( "Do what?" );
238 // set gobject values
239 this.el.justify = Gtk.Justification.RIGHT;
240 this.el.xalign = 0.900000f;
241 this.el.visible = true;
244 // user defined functions
247 public class Xcls_actionsel : Object
249 public Gtk.ComboBox el;
250 private MergeBranch _this;
257 public Xcls_actionsel(MergeBranch _owner )
260 _this.actionsel = this;
261 this.el = new Gtk.ComboBox();
264 this.loading = false;
266 // set gobject values
267 var child_0 = new Xcls_actioncellrenderer( _this );
269 this.el.pack_start ( child_0.el , true );
270 var child_1 = new Xcls_actionmodel( _this );
272 this.el.set_model ( child_1.el );
276 this.el.add_attribute(_this.actioncellrenderer.el , "markup", 1 );
279 this.el.changed.connect( () => {
283 _this.name.updateText();
284 //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
288 // user defined functions
289 public string selectedAction () {
293 this.el.get_active_iter (out iter);
294 _this.actionmodel.el.get_value (iter, 0, out val1);
296 return (string) val1;
299 public class Xcls_actioncellrenderer : Object
301 public Gtk.CellRendererText el;
302 private MergeBranch _this;
308 public Xcls_actioncellrenderer(MergeBranch _owner )
311 _this.actioncellrenderer = this;
312 this.el = new Gtk.CellRendererText();
316 // set gobject values
319 // user defined functions
322 public class Xcls_actionmodel : Object
324 public Gtk.ListStore el;
325 private MergeBranch _this;
331 public Xcls_actionmodel(MergeBranch _owner )
334 _this.actionmodel = this;
335 this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
339 // set gobject values
342 // user defined functions
343 public void loadActions () {
347 _this.actionsel.loading = true;
356 el.set_value(iter, 0, "");
357 el.set_value(iter, 1, "-- select action --");
359 _this.actionsel.el.set_active_iter(iter);
362 el.set_value(iter, 0, "CLOSE");
363 el.set_value(iter, 1, "Merge changes to master - and CLOSE ticket");
367 el.set_value(iter, 0, "LEAVE");
368 el.set_value(iter, 1, "Merge changes to master - and LEAVE ticket open");
371 el.set_value(iter, 0, "MASTER");
372 el.set_value(iter, 1, "Merge changes FROM master into this branch");
375 el.set_value(iter, 0, "EXIT");
376 el.set_value(iter, 1, "Switch back to MASTER branch - no merge");
380 _this.actionsel.loading = false;
381 //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);
387 public class Xcls_Label8 : Object
390 private MergeBranch _this;
396 public Xcls_Label8(MergeBranch _owner )
399 this.el = new Gtk.Label( "Select Ticket" );
403 // set gobject values
404 this.el.justify = Gtk.Justification.RIGHT;
405 this.el.xalign = 0.900000f;
406 this.el.visible = true;
409 // user defined functions
412 public class Xcls_ticketsel : Object
414 public Gtk.ComboBox el;
415 private MergeBranch _this;
422 public Xcls_ticketsel(MergeBranch _owner )
425 _this.ticketsel = this;
426 this.el = new Gtk.ComboBox();
431 // set gobject values
432 var child_0 = new Xcls_dbcellrenderer( _this );
434 this.el.pack_start ( child_0.el , true );
435 var child_1 = new Xcls_dbmodel( _this );
437 this.el.set_model ( child_1.el );
441 this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
444 this.el.changed.connect( () => {
448 _this.view.loadTicket(this.selectedTicketId());
450 _this.name.updateText();
451 //_this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
453 //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
457 // user defined functions
458 public string selectedTicketId () {
463 this.el.get_active_iter (out iter);
464 _this.dbmodel.el.get_value (iter, 0, out val1);
467 return (string) val1;
474 public class Xcls_dbcellrenderer : Object
476 public Gtk.CellRendererText el;
477 private MergeBranch _this;
483 public Xcls_dbcellrenderer(MergeBranch _owner )
486 _this.dbcellrenderer = this;
487 this.el = new Gtk.CellRendererText();
491 // set gobject values
494 // user defined functions
497 public class Xcls_dbmodel : Object
499 public Gtk.ListStore el;
500 private MergeBranch _this;
506 public Xcls_dbmodel(MergeBranch _owner )
509 _this.dbmodel = this;
510 this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
514 // set gobject values
517 // user defined functions
518 public void loadTickets () {
520 RooTicket.singleton().loadTickets("",RooTicket.Who.ME, RooTicket.Status.ACTIVE);
522 _this.ticketsel.loading = true;
529 el.set_value(iter, 0, "");
530 el.set_value(iter, 1, "-- select a ticket --");
532 _this.ticketsel.el.set_active_iter(iter);
534 if (_this.ticket != null && _this.ticket.id == "-1") {
536 el.set_value(iter, 0, "-1");
537 el.set_value(iter, 1, "Temporary Branch - No ticket specified/relivant");
538 _this.ticketsel.el.set_active_iter(iter);
544 var tickets = RooTicket.singleton().tickets;
545 foreach(var ticket in tickets) {
549 el.set_value(iter, 0, ticket.id);
550 el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
551 if (_this.ticket != null && _this.ticket.id == ticket.id) {
552 _this.ticketsel.el.set_active_iter(iter);
557 _this.ticketsel.loading = false;
558 //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);
564 public class Xcls_Label12 : Object
567 private MergeBranch _this;
573 public Xcls_Label12(MergeBranch _owner )
576 this.el = new Gtk.Label( "Use this commit message" );
580 // set gobject values
581 this.el.justify = Gtk.Justification.RIGHT;
582 this.el.xalign = 0.900000f;
585 // user defined functions
588 public class Xcls_name : Object
591 private MergeBranch _this;
597 public Xcls_name(MergeBranch _owner )
601 this.el = new Gtk.Entry();
605 // set gobject values
606 this.el.visible = true;
609 // user defined functions
610 public void updateText () {
611 var ticket_id = _this.ticketsel.selectedTicketId();
613 RooTicket ticket = null;
614 if (ticket_id.length > 0){
615 ticket = RooTicket.singleton().getById(ticket_id);
618 var name = RooTicket.singleton().usernameLocal();
619 var action = _this.actionsel.selectedAction();
620 this.el.set_editable(true);
622 case "CLOSE": // merge changes and close..
623 this.el.set_text("Fix #%s - %s".printf(ticket_id, ticket != null ? ticket.summary : ""));
625 case "LEAVE": // partial fix
626 this.el.set_text("Partial Fix #%s - %s".printf(ticket_id, ticket != null ? ticket.summary : ""));
628 case "MASTER": // merge master
629 case "EXIT": // just switch back...
630 this.el.set_editable(false);
631 this.el.set_text(""); // not relivant..
635 break; /// don't fix the text value.
642 public class Xcls_scrolled_window : Object
644 public Gtk.ScrolledWindow el;
645 private MergeBranch _this;
651 public Xcls_scrolled_window(MergeBranch _owner )
654 _this.scrolled_window = this;
655 this.el = new Gtk.ScrolledWindow( null, null );
659 // set gobject values
660 this.el.height_request = 500;
661 this.el.vexpand = true;
662 var child_0 = new Xcls_view( _this );
664 this.el.add ( child_0.el );
669 this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
673 // user defined functions
675 public class Xcls_view : Object
677 public WebKit.WebView el;
678 private MergeBranch _this;
684 public Xcls_view(MergeBranch _owner )
688 this.el = new WebKit.WebView();
692 // set gobject values
695 // user defined functions
696 public void loadTicket (string tid) {
698 _this.el.get_size(out w, out h);
701 _this.scrolled_window.el.hide();
702 _this.el.resize(w, 150);
704 _this.scrolled_window.el.show();
705 _this.el.resize(w, 800);
708 var rs = RooTicket.singleton();
709 var uri = new WebKit.URIRequest("https://roojs.com/admin.php/MTrack/View/" + tid);
710 var hd = uri.get_http_headers();
711 var authCode = Base64.encode ("%s:%s".printf(rs.username, rs.password).data);
712 hd.append("Authorization", "Basic %s".printf(authCode));
714 this.el.load_request(uri);
719 public class Xcls_spinner : Object
721 public Gtk.Spinner el;
722 private MergeBranch _this;
728 public Xcls_spinner(MergeBranch _owner )
731 _this.spinner = this;
732 this.el = new Gtk.Spinner();
736 // set gobject values
737 this.el.hexpand = true;
738 this.el.vexpand = true;
741 // user defined functions
745 public class Xcls_Button17 : Object
747 public Gtk.Button el;
748 private MergeBranch _this;
754 public Xcls_Button17(MergeBranch _owner )
757 this.el = new Gtk.Button();
761 // set gobject values
762 this.el.relief = Gtk.ReliefStyle.NONE;
763 this.el.label = "Cancel";
766 // user defined functions
769 public class Xcls_Button18 : Object
771 public Gtk.Button el;
772 private MergeBranch _this;
778 public Xcls_Button18(MergeBranch _owner )
781 this.el = new Gtk.Button();
785 // set gobject values
786 this.el.label = "Do Merge";
791 this.el.get_style_context().add_class("suggested-action");
795 // user defined functions