X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=MergeBranch.vala;h=900c667935c2fc67e9aaba7b042e09d8d32c310f;hp=56416954c693ae3cd559a2fcc8c671a3a86fe903;hb=d33736b91e5bdee2a751dce3d4199d22244ca786;hpb=d06e3c696bfaee21c6e9201b4cebcd1ac5bcc32a diff --git a/MergeBranch.vala b/MergeBranch.vala index 56416954..900c6679 100644 --- a/MergeBranch.vala +++ b/MergeBranch.vala @@ -12,6 +12,7 @@ public class MergeBranch : Object } return _MergeBranch; } + public Xcls_table table; public Xcls_actionsel actionsel; public Xcls_actioncellrenderer actioncellrenderer; public Xcls_actionmodel actionmodel; @@ -19,8 +20,12 @@ public class MergeBranch : Object public Xcls_dbcellrenderer dbcellrenderer; public Xcls_dbmodel dbmodel; public Xcls_name name; + public Xcls_label_diff label_diff; + public Xcls_label_ticket label_ticket; + public Xcls_diff_view diff_view; public Xcls_scrolled_window scrolled_window; public Xcls_view view; + public Xcls_spinner spinner; // my vars (def) public GitRepo repo; @@ -46,10 +51,10 @@ public class MergeBranch : Object var child_0 = new Xcls_Box2( _this ); child_0.ref(); this.el.get_content_area().add ( child_0.el ); - var child_1 = new Xcls_Button16( _this ); + var child_1 = new Xcls_Button24( _this ); child_1.ref(); this.el.add_action_widget ( child_1.el , 0 ); - var child_2 = new Xcls_Button17( _this ); + var child_2 = new Xcls_Button25( _this ); child_2.ref(); this.el.add_action_widget ( child_2.el , 1 ); @@ -110,11 +115,6 @@ public class MergeBranch : Object }); - this.el.show.connect( (self) => { - - - //test - }); } // user defined functions @@ -126,18 +126,38 @@ public class MergeBranch : Object } GitMonitor.gitmonitor.stop(); + _this.el.show_all(); + + _this.table.el.hide(); + _this.scrolled_window.el.hide(); + _this.spinner.el.show(); + _this.spinner.el.start(); + this.el.set_keep_above(true); + this.el.move((Gdk.Screen.width() / 2)- 250 ,0); + GLib.debug("Loading tickets"); + + this.ticket = ticket; this.repo = repo; - this.el.move((Gdk.Screen.width() / 2)- 250 ,0); - GLib.debug("Loading tickets"); - - - this.el.show_all(); - _this.dbmodel.loadTickets(); - _this.actionmodel.loadActions(); - _this.view.loadTicket(ticket.id); + + Timeout.add_seconds(1, () => { + _this.diff_view.el.get_buffer().set_text( + repo != null ? repo.previewMerge() : GitRepo.previewMerges(ticket.id) + ); + // if we are not working on a ticket, then we should be able to pick one? + _this.dbmodel.loadTickets(); + _this.actionmodel.loadActions(); + _this.view.loadTicket(ticket.id); + _this.spinner.el.stop(); + _this.spinner.el.hide(); + this.table.el.show(); + return false; + }); + + this.el.run(); + } public class Xcls_Box2 : Object { @@ -156,17 +176,20 @@ public class MergeBranch : Object // my vars (dec) // set gobject values - var child_0 = new Xcls_Table3( _this ); + var child_0 = new Xcls_table( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); - var child_1 = new Xcls_scrolled_window( _this ); + var child_1 = new Xcls_Notebook14( _this ); child_1.ref(); this.el.add ( child_1.el ); + var child_2 = new Xcls_spinner( _this ); + child_2.ref(); + this.el.add ( child_2.el ); } // user defined functions } - public class Xcls_Table3 : Object + public class Xcls_table : Object { public Gtk.Table el; private MergeBranch _this; @@ -175,9 +198,10 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Table3(MergeBranch _owner ) + public Xcls_table(MergeBranch _owner ) { _this = _owner; + _this.table = this; this.el = new Gtk.Table( 2, 2, false ); // my vars (dec) @@ -628,6 +652,193 @@ public class MergeBranch : Object } + public class Xcls_Notebook14 : Object + { + public Gtk.Notebook el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Notebook14(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Notebook(); + + // my vars (dec) + + // set gobject values + this.el.vexpand = true; + var child_0 = new Xcls_label_diff( _this ); + child_0.ref(); + var child_1 = new Xcls_label_ticket( _this ); + child_1.ref(); + var child_2 = new Xcls_Box17( _this ); + child_2.ref(); + this.el.append_page ( child_2.el , _this.label_diff.el ); + var child_3 = new Xcls_Box20( _this ); + child_3.ref(); + this.el.append_page ( child_3.el , _this.label_ticket.el ); + } + + // user defined functions + } + public class Xcls_label_diff : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_label_diff(MergeBranch _owner ) + { + _this = _owner; + _this.label_diff = this; + this.el = new Gtk.Label( "Projected Commit Diff" ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_label_ticket : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_label_ticket(MergeBranch _owner ) + { + _this = _owner; + _this.label_ticket = this; + this.el = new Gtk.Label( "Ticket Details" ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_Box17 : Object + { + public Gtk.Box el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Box17(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); + + // my vars (dec) + + // set gobject values + this.el.homogeneous = false; + var child_0 = new Xcls_ScrolledWindow18( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , true,true,0 ); + } + + // user defined functions + } + public class Xcls_ScrolledWindow18 : Object + { + public Gtk.ScrolledWindow el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_ScrolledWindow18(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.ScrolledWindow( null, null ); + + // my vars (dec) + + // set gobject values + this.el.height_request = 400; + 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 MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_diff_view(MergeBranch _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 + } + + + + public class Xcls_Box20 : Object + { + public Gtk.Box el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Box20(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); + + // my vars (dec) + + // set gobject values + this.el.homogeneous = false; + var child_0 = new Xcls_scrolled_window( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + } + + // user defined functions + } public class Xcls_scrolled_window : Object { public Gtk.ScrolledWindow el; @@ -706,7 +917,34 @@ public class MergeBranch : Object - public class Xcls_Button16 : Object + + public class Xcls_spinner : Object + { + public Gtk.Spinner el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_spinner(MergeBranch _owner ) + { + _this = _owner; + _this.spinner = this; + this.el = new Gtk.Spinner(); + + // my vars (dec) + + // set gobject values + this.el.hexpand = true; + this.el.vexpand = true; + } + + // user defined functions + } + + + public class Xcls_Button24 : Object { public Gtk.Button el; private MergeBranch _this; @@ -715,7 +953,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button16(MergeBranch _owner ) + public Xcls_Button24(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -730,7 +968,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Button17 : Object + public class Xcls_Button25 : Object { public Gtk.Button el; private MergeBranch _this; @@ -739,7 +977,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button17(MergeBranch _owner ) + public Xcls_Button25(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -748,6 +986,12 @@ public class MergeBranch : Object // set gobject values this.el.label = "Do Merge"; + + // init method + + { + this.el.get_style_context().add_class("suggested-action"); + } } // user defined functions