From 751f03814a8460213968e1699ffa7d2b55548015 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 12:53:47 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 18 ------- RepoStatusPopover.vala | 104 ++++------------------------------------- 2 files changed, 10 insertions(+), 112 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index c34aa818..e07be689 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -101,24 +101,6 @@ "$ homogeneous" : true, "gboolean vexpand" : false, "items" : [ - { - "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({ \"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}" diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index e0773656..c06cc02b 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -369,12 +369,6 @@ public class RepoStatusPopover : Object 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 @@ -395,84 +389,6 @@ 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_Button14 : Object - { - public Gtk.Button el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_Button14(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_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"; @@ -496,7 +412,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button16 : Object + public class Xcls_Button14 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -505,7 +421,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button16(RepoStatusPopover _owner ) + public Xcls_Button14(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -534,7 +450,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button17 : Object + public class Xcls_Button15 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -543,7 +459,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button17(RepoStatusPopover _owner ) + public Xcls_Button15(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -567,7 +483,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button18 : Object + public class Xcls_Button16 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -576,7 +492,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button18(RepoStatusPopover _owner ) + public Xcls_Button16(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -596,7 +512,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button19 : Object + public class Xcls_Button17 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -605,7 +521,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button19(RepoStatusPopover _owner ) + public Xcls_Button17(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -635,7 +551,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button20 : Object + public class Xcls_Button18 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -644,7 +560,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button20(RepoStatusPopover _owner ) + public Xcls_Button18(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); -- 2.39.2