From: Alan Knowles Date: Wed, 19 Dec 2018 04:53:39 +0000 (+0800) Subject: RepoStatusPopover.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=c9768f99db205bfb2b1424c2fbb09e24287ba133 RepoStatusPopover.bjs RepoStatusPopover.vala --- diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index 821af4b3..c34aa818 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -110,6 +110,24 @@ "xtype" : "Button", "$ xns" : "Gtk" }, + { + "listeners" : { + "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"reset\" , \"--hard\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}" + }, + "label" : "Reset to remote", + "xtype" : "Button", + "* pack" : "add", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"stash\" , \"--all\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}" + }, + "label" : "Stash Changes", + "* pack" : "add", + "xtype" : "Button", + "$ xns" : "Gtk" + }, { "listeners" : { "button_press_event" : "() => {\n _this.repo.git({ \"commit\" , \"-a\" ,\"-m\", \"Uncommited changes synced\" });\n _this.repo.push();\n _this.repo.loadStatus();\n \n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n \n _this.el.hide();\n Clones.singleton().reposStore.load();\n \n return false;\n}" @@ -137,6 +155,15 @@ "* pack" : "add", "$ xns" : "Gtk" }, + { + "listeners" : { + "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"reset\" , \"--hard\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}" + }, + "label" : "Reset to remote", + "* pack" : "add", + "xtype" : "Button", + "$ xns" : "Gtk" + }, { "listeners" : { "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"stash\" , \"--all\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}" diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index f664fb3e..e0773656 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -366,6 +366,15 @@ public class RepoStatusPopover : Object var child_4 = new Xcls_Button17( _this ); child_4.ref(); this.el.add ( child_4.el ); + var child_5 = new Xcls_Button18( _this ); + child_5.ref(); + this.el.add ( child_5.el ); + var child_6 = new Xcls_Button19( _this ); + child_6.ref(); + this.el.add ( child_6.el ); + var child_7 = new Xcls_Button20( _this ); + child_7.ref(); + this.el.add ( child_7.el ); } // user defined functions @@ -425,6 +434,84 @@ public class RepoStatusPopover : Object // my vars (dec) + // set gobject values + this.el.label = "Reset to remote"; + + //listeners + this.el.button_press_event.connect( () => { + + + GitMonitor.gitmonitor.stop(); + _this.repo.git({ "reset" , "--hard" }); + _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; + }); + } + + // user defined functions + } + + public class Xcls_Button15 : Object + { + public Gtk.Button el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Button15(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Button(); + + // my vars (dec) + + // set gobject values + this.el.label = "Stash Changes"; + + //listeners + this.el.button_press_event.connect( () => { + + + 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; + }); + } + + // 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 = "Commit Changes"; @@ -447,7 +534,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button15 : Object + public class Xcls_Button17 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -456,7 +543,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button15(RepoStatusPopover _owner ) + public Xcls_Button17(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -480,7 +567,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button16 : Object + public class Xcls_Button18 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -489,7 +576,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button16(RepoStatusPopover _owner ) + public Xcls_Button18(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -509,7 +596,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button17 : Object + public class Xcls_Button19 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -518,7 +605,46 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button17(RepoStatusPopover _owner ) + public Xcls_Button19(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Button(); + + // my vars (dec) + + // set gobject values + this.el.label = "Reset to remote"; + + //listeners + this.el.button_press_event.connect( () => { + + + GitMonitor.gitmonitor.stop(); + _this.repo.git({ "reset" , "--hard" }); + _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; + }); + } + + // user defined functions + } + + public class Xcls_Button20 : Object + { + public Gtk.Button el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Button20(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button();