From dfb3663252725cbb0dfa77de118da220f2011238 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 12:52:36 +0800 Subject: [PATCH] Changed RepoStatusPopover.bjsRepoStatusPopover.vala --- RepoStatusPopover.bjs | 39 +++++++++++-- RepoStatusPopover.vala | 126 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 6 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index 8fb48991..38abb769 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -31,15 +31,15 @@ "items" : [ { "id" : "label_status", - "* pack" : false, "xtype" : "Label", + "* pack" : false, "$ xns" : "Gtk", "utf8 label" : "Status" }, { "id" : "label_diff", - "xtype" : "Label", "* pack" : false, + "xtype" : "Label", "$ xns" : "Gtk", "utf8 label" : "Diff" }, @@ -75,8 +75,8 @@ "items" : [ { "int height_request" : 400, - "* pack" : "pack_start,true,true,0", "xtype" : "ScrolledWindow", + "* pack" : "pack_start,true,true,0", "$ xns" : "Gtk", "items" : [ { @@ -106,8 +106,8 @@ "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", - "xtype" : "Button", "* pack" : "add", + "xtype" : "Button", "$ xns" : "Gtk" }, { @@ -115,8 +115,8 @@ "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}" }, "label" : "Commit Changes", - "xtype" : "Button", "* pack" : "add", + "xtype" : "Button", "$ xns" : "Gtk" }, { @@ -124,8 +124,8 @@ "button_press_event" : "() => {\n var oldq = new Gee.ArrayList(); \n\n\tClones.singleton().el.response(-1);\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n return false;\n}" }, "label" : "Create Branch", - "* pack" : "add", "xtype" : "Button", + "* pack" : "add", "$ xns" : "Gtk" }, { @@ -133,11 +133,38 @@ "button_press_event" : "() => {\n _this.el.hide();\n return false;\n}" }, "label" : "Ignore for now", + "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", "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 \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", + "xtype" : "Button", + "* pack" : "add", + "$ xns" : "Gtk" } ] } diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index e98c9999..8876adf3 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -92,6 +92,12 @@ public class RepoStatusPopover : Object var child_1 = new Xcls_Box12( _this ); child_1.ref(); this.el.pack_end ( child_1.el , false,false,0 ); + var child_2 = new Xcls_Button18( _this ); + child_2.ref(); + this.el.add ( child_2.el ); + var child_3 = new Xcls_Button19( _this ); + child_3.ref(); + this.el.add ( child_3.el ); } // user defined functions @@ -363,6 +369,9 @@ public class RepoStatusPopover : Object var child_3 = new Xcls_Button16( _this ); child_3.ref(); this.el.add ( child_3.el ); + var child_4 = new Xcls_Button17( _this ); + child_4.ref(); + this.el.add ( child_4.el ); } // user defined functions @@ -506,6 +515,123 @@ public class RepoStatusPopover : Object // user defined functions } + public class Xcls_Button17 : Object + { + public Gtk.Button el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Button17(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_Button18 : Object + { + public Gtk.Button el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Button18(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_Button19 : Object + { + public Gtk.Button el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Button19(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 + } } -- 2.39.2