From 4a4852b09ec5d48748d204dd8b658146bd5eb3a5 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 13:38:24 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 1 + RepoStatusPopover.vala | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index d3827602..f11503cc 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -188,6 +188,7 @@ }, "label" : "Merge branch / Complete ticket", "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-top\", Gtk.IconSize.SMALL_TOOLBAR), null);", + "id" : "btn_merge", "xtype" : "ToolButton", "* pack" : "add", "$ xns" : "Gtk", diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index a99b5fc6..dbe3bb1d 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -16,6 +16,7 @@ public class RepoStatusPopover : Object public Xcls_label_diff label_diff; public Xcls_status_view status_view; public Xcls_diff_view diff_view; + public Xcls_btn_merge btn_merge; // my vars (def) public GitRepo repo; @@ -605,7 +606,7 @@ public class RepoStatusPopover : Object var child_0 = new Xcls_ToolButton20( _this ); child_0.ref(); this.el.add ( child_0.el ); - var child_1 = new Xcls_ToolButton21( _this ); + var child_1 = new Xcls_btn_merge( _this ); child_1.ref(); this.el.add ( child_1.el ); var child_2 = new Xcls_ToolButton22( _this ); @@ -649,7 +650,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton21 : Object + public class Xcls_btn_merge : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -658,9 +659,10 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton21(RepoStatusPopover _owner ) + public Xcls_btn_merge(RepoStatusPopover _owner ) { _this = _owner; + _this.btn_merge = this; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) -- 2.39.2