X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=RepoStatusPopover.vala;h=e98c999902db1973641d32c76a78a753063614de;hp=0e363fb427d919c9e585718e3f494e9b3068cf73;hb=24f29cdf6887c0f05430d83cffaebf69bfa40083;hpb=1f7e6b712f9ee99d621a3a67f1c0795c6106bde6 diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index 0e363fb4..e98c9999 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -62,7 +62,7 @@ public class RepoStatusPopover : Object // window + header? GLib.debug("SHOWALL - POPIP\n"); this.el.show_all(); - this.el.set_size_request(800,500); + //this.el.set_size_request(800,500); // this.diff_view.el.grab_focus(); //this.el.show_all(); @@ -293,6 +293,7 @@ public class RepoStatusPopover : Object // 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 ); @@ -359,6 +360,9 @@ public class RepoStatusPopover : Object var child_2 = new Xcls_Button15( _this ); child_2.ref(); this.el.add ( child_2.el ); + var child_3 = new Xcls_Button16( _this ); + child_3.ref(); + this.el.add ( child_3.el ); } // user defined functions @@ -384,8 +388,18 @@ public class RepoStatusPopover : Object //listeners this.el.button_press_event.connect( () => { - _this.el.hide(); - return false; + + + GitMonitor.gitmonitor.stop(); + _this.repo.git({ "stash" , "--all" }); + _this.repo.loadStatus(); + GitMonitor.gitmonitor.start(); + _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); + _this.status_view.el.get_buffer().set_text(_this.repo.git_status); + Clones.singleton().reposStore.load(); + + _this.el.hide(); + return false; }); } @@ -413,8 +427,17 @@ public class RepoStatusPopover : Object //listeners this.el.button_press_event.connect( () => { - _this.el.hide(); - return false; + _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" }); + _this.repo.push(); + _this.repo.loadStatus(); + + _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); + _this.status_view.el.get_buffer().set_text(_this.repo.git_status); + + _this.el.hide(); + Clones.singleton().reposStore.load(); + + return false; }); } @@ -437,6 +460,39 @@ public class RepoStatusPopover : Object // my vars (dec) + // set gobject values + this.el.label = "Create Branch"; + + //listeners + this.el.button_press_event.connect( () => { + var oldq = new Gee.ArrayList(); + + Clones.singleton().el.response(-1); + NewBranch.singleton().show(_this.repo, oldq); + + return false; + }); + } + + // user defined functions + } + + public class Xcls_Button16 : Object + { + public Gtk.Button el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Button16(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Button(); + + // my vars (dec) + // set gobject values this.el.label = "Ignore for now";