X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=MergeBranch.vala;h=747117cd6ca987cf29e15502d640f3216dee3c64;hb=f582f1a378d7dd4fa23a40c5f17c4279d343552a;hp=4acd1afa90f6eeeeb39da84e909875e71c3e679d;hpb=038790bd4663abdcd61ce609c9c791e7d405ba58;p=gitlive diff --git a/MergeBranch.vala b/MergeBranch.vala index 4acd1afa..747117cd 100644 --- a/MergeBranch.vala +++ b/MergeBranch.vala @@ -21,6 +21,8 @@ public class MergeBranch : Object 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; @@ -49,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_Button20( _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_Button21( _this ); + var child_2 = new Xcls_Button25( _this ); child_2.ref(); this.el.add_action_widget ( child_2.el , 1 ); @@ -142,7 +144,7 @@ public class MergeBranch : Object Timeout.add_seconds(1, () => { - + _this.diff_view.el.get_buffer().set_text(repo.previewMerge()); // if we are not working on a ticket, then we should be able to pick one? _this.dbmodel.loadTickets(); _this.actionmodel.loadActions(); @@ -180,12 +182,9 @@ public class MergeBranch : Object var child_1 = new Xcls_Notebook14( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_scrolled_window( _this ); + var child_2 = new Xcls_spinner( _this ); child_2.ref(); this.el.add ( child_2.el ); - var child_3 = new Xcls_spinner( _this ); - child_3.ref(); - this.el.add ( child_3.el ); } // user defined functions @@ -671,8 +670,14 @@ public class MergeBranch : Object this.el.vexpand = true; var child_0 = new Xcls_label_diff( _this ); child_0.ref(); - var child_1 = new Xcls_Label16( _this ); + 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 @@ -700,7 +705,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Label16 : Object + public class Xcls_label_ticket : Object { public Gtk.Label el; private MergeBranch _this; @@ -709,9 +714,10 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Label16(MergeBranch _owner ) + public Xcls_label_ticket(MergeBranch _owner ) { _this = _owner; + _this.label_ticket = this; this.el = new Gtk.Label( "Ticket Details" ); // my vars (dec) @@ -722,7 +728,110 @@ public class MergeBranch : Object // 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); + } + + // 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; @@ -800,6 +909,8 @@ public class MergeBranch : Object } + + public class Xcls_spinner : Object { public Gtk.Spinner el; @@ -826,7 +937,7 @@ public class MergeBranch : Object } - public class Xcls_Button20 : Object + public class Xcls_Button24 : Object { public Gtk.Button el; private MergeBranch _this; @@ -835,7 +946,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button20(MergeBranch _owner ) + public Xcls_Button24(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -850,7 +961,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Button21 : Object + public class Xcls_Button25 : Object { public Gtk.Button el; private MergeBranch _this; @@ -859,7 +970,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button21(MergeBranch _owner ) + public Xcls_Button25(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button();