From 012da43ef16a6d3d1fc3bdca0c0d82be16d7b5f9 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 13:07:48 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 27 +++++++--- RepoStatusPopover.vala | 115 +++++++++++++++++++++++++++-------------- 2 files changed, 94 insertions(+), 48 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index 0914b7e9..eced34c5 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -104,7 +104,18 @@ { "* pack" : "pack_start,?bool?,?bool?,?uint?", "xtype" : "Toolbar", - "$ xns" : "Gtk" + "$ xns" : "Gtk", + "items" : [ + { + "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" : "ToolButton", + "* pack" : "add", + "$ xns" : "Gtk" + } + ] }, { "listeners" : { @@ -112,7 +123,7 @@ }, "label" : "Stash Changes", "* pack" : "add", - "xtype" : "Button", + "xtype" : "ToolButton", "$ xns" : "Gtk" }, { @@ -121,7 +132,7 @@ }, "label" : "Commit Changes", "* pack" : "add", - "xtype" : "Button", + "xtype" : "ToolButton", "$ xns" : "Gtk" }, { @@ -129,7 +140,7 @@ "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 / Start ticket", - "xtype" : "Button", + "xtype" : "ToolButton", "* pack" : "add", "$ xns" : "Gtk" }, @@ -139,7 +150,7 @@ }, "label" : "Reset to remote", "* pack" : "add", - "xtype" : "Button", + "xtype" : "ToolButton", "$ xns" : "Gtk" }, { @@ -147,7 +158,7 @@ "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"pull\" , \"--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" : "Pull updates", - "xtype" : "Button", + "xtype" : "ToolButton", "* pack" : "add", "$ xns" : "Gtk" }, @@ -156,7 +167,7 @@ "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n if (_this.repo.activeTicket != null) {\n\t MergeBranch.singleton().show(_this.repo.activeTicket, null); \n }\n return false;\n}" }, "label" : "Merge branch/ ticket", - "xtype" : "Button", + "xtype" : "ToolButton", "* pack" : "add", "$ xns" : "Gtk" }, @@ -167,7 +178,7 @@ "label" : "Create Ticket", "* ctor" : "new GtkButton.new_from_stock()", "* pack" : "add", - "xtype" : "Button", + "xtype" : "ToolButton", "$ xns" : "Gtk" } ] diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index 31498108..751f07c4 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -354,25 +354,25 @@ public class RepoStatusPopover : Object var child_0 = new Xcls_Toolbar13( _this ); child_0.ref(); this.el.pack_start ( child_0.el , ?bool?,?bool?,?uint? ); - var child_1 = new Xcls_Button14( _this ); + var child_1 = new Xcls_ToolButton15( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_Button15( _this ); + var child_2 = new Xcls_ToolButton16( _this ); child_2.ref(); this.el.add ( child_2.el ); - var child_3 = new Xcls_Button16( _this ); + var child_3 = new Xcls_ToolButton17( _this ); child_3.ref(); this.el.add ( child_3.el ); - var child_4 = new Xcls_Button17( _this ); + var child_4 = new Xcls_ToolButton18( _this ); child_4.ref(); this.el.add ( child_4.el ); - var child_5 = new Xcls_Button18( _this ); + var child_5 = new Xcls_ToolButton19( _this ); child_5.ref(); this.el.add ( child_5.el ); - var child_6 = new Xcls_Button19( _this ); + var child_6 = new Xcls_ToolButton20( _this ); child_6.ref(); this.el.add ( child_6.el ); - var child_7 = new Xcls_Button20( _this ); + var child_7 = new Xcls_ToolButton21( _this ); child_7.ref(); this.el.add ( child_7.el ); } @@ -396,29 +396,69 @@ public class RepoStatusPopover : Object // my vars (dec) // set gobject values + var child_0 = new Xcls_ToolButton14( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + } + + // user defined functions + } + public class Xcls_ToolButton14 : Object + { + public Gtk.ToolButton el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_ToolButton14(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.ToolButton( null, "Stash Changes" ); + + // my vars (dec) + + // set gobject values + + //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_Button14 : Object + + public class Xcls_ToolButton15 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button14(RepoStatusPopover _owner ) + public Xcls_ToolButton15(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton( null, "Stash Changes" ); // my vars (dec) // set gobject values - this.el.label = "Stash Changes"; //listeners this.el.button_press_event.connect( () => { @@ -440,24 +480,23 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button15 : Object + public class Xcls_ToolButton16 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button15(RepoStatusPopover _owner ) + public Xcls_ToolButton16(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton( null, "Commit Changes" ); // my vars (dec) // set gobject values - this.el.label = "Commit Changes"; //listeners this.el.button_press_event.connect( () => { @@ -478,24 +517,23 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button16 : Object + public class Xcls_ToolButton17 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button16(RepoStatusPopover _owner ) + public Xcls_ToolButton17(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton( null, "Create Branch / Start ticket" ); // my vars (dec) // set gobject values - this.el.label = "Create Branch / Start ticket"; //listeners this.el.button_press_event.connect( () => { @@ -511,24 +549,23 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button17 : Object + public class Xcls_ToolButton18 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button17(RepoStatusPopover _owner ) + public Xcls_ToolButton18(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton( null, "Reset to remote" ); // my vars (dec) // set gobject values - this.el.label = "Reset to remote"; //listeners this.el.button_press_event.connect( () => { @@ -550,24 +587,23 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button18 : Object + public class Xcls_ToolButton19 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button18(RepoStatusPopover _owner ) + public Xcls_ToolButton19(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton( null, "Pull updates" ); // my vars (dec) // set gobject values - this.el.label = "Pull updates"; //listeners this.el.button_press_event.connect( () => { @@ -589,24 +625,23 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button19 : Object + public class Xcls_ToolButton20 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button19(RepoStatusPopover _owner ) + public Xcls_ToolButton20(RepoStatusPopover _owner ) { _this = _owner; - this.el = new Gtk.Button(); + this.el = new Gtk.ToolButton( null, "Merge branch/ ticket" ); // my vars (dec) // set gobject values - this.el.label = "Merge branch/ ticket"; //listeners this.el.button_press_event.connect( () => { @@ -623,16 +658,16 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button20 : Object + public class Xcls_ToolButton21 : Object { - public Gtk.Button el; + public Gtk.ToolButton el; private RepoStatusPopover _this; // my vars (def) // ctor - public Xcls_Button20(RepoStatusPopover _owner ) + public Xcls_ToolButton21(RepoStatusPopover _owner ) { _this = _owner; this.el = new GtkButton.new_from_stock(); -- 2.39.2