X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=RepoStatusPopover.vala;h=9c2093678174b69d01fa9d6ea7c2ebcd6c8da890;hp=beb371f517e5687334edfbe65246012b0c8b9125;hb=refs%2Fheads%2Fwip_alan_T5623_reset_pull_create_ticket_on;hpb=0022e58196144b9da447b8c4b1297fce53ca986c diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index beb371f5..9c209367 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -12,10 +12,16 @@ 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; public Xcls_diff_view diff_view; + public Xcls_btn_create btn_create; + public Xcls_btn_merge btn_merge; // my vars (def) public GitRepo repo; @@ -59,6 +65,18 @@ public class RepoStatusPopover : Object //this.el.set_position(Gtk.PositionType.RIGHT); + if (repo.activeTicket == null) { + _this.btn_merge.el.set_sensitive(false); + } else { + _this.btn_merge.el.set_sensitive(true); + } + _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); + _this.btn_reset.el.set_sensitive(repo.has_local_changes); + _this.btn_pull.el.set_sensitive(repo.ahead_or_behind == "B"); + // window + header? GLib.debug("SHOWALL - POPIP\n"); this.el.show_all(); @@ -88,7 +106,7 @@ public class RepoStatusPopover : Object this.el.border_width = 5; var child_0 = new Xcls_Box3( _this ); child_0.ref(); - this.el.pack_end ( child_0.el , false,false,0 ); + this.el.pack_start ( child_0.el , false,false,0 ); var child_1 = new Xcls_Notebook9( _this ); child_1.ref(); this.el.add ( child_1.el ); @@ -144,23 +162,23 @@ public class RepoStatusPopover : Object // set gobject values this.el.toolbar_style = Gtk.ToolbarStyle.BOTH_HORIZ; - var child_0 = new Xcls_ToolButton5( _this ); + 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 ); } // user defined functions } - public class Xcls_ToolButton5 : Object + public class Xcls_btn_stash : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -169,9 +187,10 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton5(RepoStatusPopover _owner ) + public Xcls_btn_stash(RepoStatusPopover _owner ) { _this = _owner; + _this.btn_stash = this; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-undo", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) @@ -200,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; @@ -209,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) @@ -239,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; @@ -248,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) @@ -279,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; @@ -288,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) @@ -602,10 +624,10 @@ public class RepoStatusPopover : Object // set gobject values this.el.toolbar_style = Gtk.ToolbarStyle.BOTH_HORIZ; - var child_0 = new Xcls_ToolButton20( _this ); + var child_0 = new Xcls_btn_create( _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 ); @@ -615,7 +637,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton20 : Object + public class Xcls_btn_create : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -624,9 +646,10 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton20(RepoStatusPopover _owner ) + public Xcls_btn_create(RepoStatusPopover _owner ) { _this = _owner; + _this.btn_create = this; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) @@ -649,7 +672,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,26 +681,27 @@ 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) // set gobject values - this.el.label = "Merge branch/ ticket"; + this.el.label = "Merge branch / Complete ticket"; this.el.is_important = true; //listeners - this.el.button_press_event.connect( () => { + this.el.clicked.connect( () => { _this.el.hide(); Clones.singleton().el.response(-1); if (_this.repo.activeTicket != null) { MergeBranch.singleton().show(_this.repo.activeTicket, null); } - return false; + return ; }); }