X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=RepoStatusPopover.vala;h=9c2093678174b69d01fa9d6ea7c2ebcd6c8da890;hp=26204bee77e450cc6bf3b9a50aa2f28eca33d49e;hb=refs%2Fheads%2Fwip_alan_T5623_reset_pull_create_ticket_on;hpb=1cb2e51f700081c066c4db39ada26fcb48e976dd diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index 26204bee..9c209367 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -13,6 +13,9 @@ public class RepoStatusPopover : Object return _RepoStatusPopover; } public Xcls_btn_stash btn_stash; + public Xcls_btn_commit btn_commit; + public Xcls_btn_reset btn_reset; + public Xcls_btn_pull btn_pull; public Xcls_label_status label_status; public Xcls_label_diff label_diff; public Xcls_status_view status_view; @@ -67,7 +70,7 @@ public class RepoStatusPopover : Object } else { _this.btn_merge.el.set_sensitive(true); } - _this.btn_create.el.set_sensitive(repo.is_master()); + _this.btn_create.el.set_sensitive(repo.is_master_branch()); _this.btn_stash.el.set_sensitive(repo.has_local_changes); _this.btn_commit.el.set_sensitive(repo.has_local_changes); @@ -162,13 +165,13 @@ public class RepoStatusPopover : Object var child_0 = new Xcls_btn_stash( _this ); child_0.ref(); this.el.add ( child_0.el ); - var child_1 = new Xcls_ToolButton6( _this ); + var child_1 = new Xcls_btn_commit( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_ToolButton7( _this ); + var child_2 = new Xcls_btn_reset( _this ); child_2.ref(); this.el.add ( child_2.el ); - var child_3 = new Xcls_ToolButton8( _this ); + var child_3 = new Xcls_btn_pull( _this ); child_3.ref(); this.el.add ( child_3.el ); } @@ -216,7 +219,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton6 : Object + public class Xcls_btn_commit : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -225,9 +228,10 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton6(RepoStatusPopover _owner ) + public Xcls_btn_commit(RepoStatusPopover _owner ) { _this = _owner; + _this.btn_commit = this; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-save", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) @@ -255,7 +259,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton7 : Object + public class Xcls_btn_reset : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -264,9 +268,10 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton7(RepoStatusPopover _owner ) + public Xcls_btn_reset(RepoStatusPopover _owner ) { _this = _owner; + _this.btn_reset = this; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-revert-to-saved", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) @@ -295,7 +300,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton8 : Object + public class Xcls_btn_pull : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -304,9 +309,10 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton8(RepoStatusPopover _owner ) + public Xcls_btn_pull(RepoStatusPopover _owner ) { _this = _owner; + _this.btn_pull = this; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-bottom", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec)