From 7ae0932f35b466727843cae1dde108927886ae83 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 13:08:14 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 121 +++++++++++++++++++---------------------- RepoStatusPopover.vala | 101 ++++++++++------------------------ 2 files changed, 86 insertions(+), 136 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index eced34c5..2431332f 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -102,7 +102,7 @@ "gboolean vexpand" : false, "items" : [ { - "* pack" : "pack_start,?bool?,?bool?,?uint?", + "* pack" : "add", "xtype" : "Toolbar", "$ xns" : "Gtk", "items" : [ @@ -114,72 +114,63 @@ "xtype" : "ToolButton", "* pack" : "add", "$ 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}" + }, + "label" : "Commit Changes", + "* pack" : "add", + "xtype" : "ToolButton", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "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" : "ToolButton", + "* 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" : "ToolButton", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "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" : "ToolButton", + "* pack" : "add", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "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" : "ToolButton", + "* pack" : "add", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "button_press_event" : "() => {\n \n\n\n Clones.singleton().el.response(-1);\n \n _this.el.hide();\n Ticket.singleton().show( _this.repo);\n \n return false;\n}" + }, + "label" : "Create Ticket", + "* ctor" : "new GtkButton.new_from_stock()", + "* pack" : "add", + "xtype" : "ToolButton", + "$ 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" : "ToolButton", - "$ 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}" - }, - "label" : "Commit Changes", - "* pack" : "add", - "xtype" : "ToolButton", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "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" : "ToolButton", - "* 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" : "ToolButton", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "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" : "ToolButton", - "* pack" : "add", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "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" : "ToolButton", - "* pack" : "add", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "button_press_event" : "() => {\n \n\n\n Clones.singleton().el.response(-1);\n \n _this.el.hide();\n Ticket.singleton().show( _this.repo);\n \n return false;\n}" - }, - "label" : "Create Ticket", - "* ctor" : "new GtkButton.new_from_stock()", - "* pack" : "add", - "xtype" : "ToolButton", - "$ xns" : "Gtk" } ] } diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index 751f07c4..822830c4 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -353,28 +353,7 @@ public class RepoStatusPopover : Object this.el.vexpand = false; 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_ToolButton15( _this ); - child_1.ref(); - this.el.add ( child_1.el ); - var child_2 = new Xcls_ToolButton16( _this ); - child_2.ref(); - this.el.add ( child_2.el ); - var child_3 = new Xcls_ToolButton17( _this ); - child_3.ref(); - this.el.add ( child_3.el ); - var child_4 = new Xcls_ToolButton18( _this ); - child_4.ref(); - this.el.add ( child_4.el ); - var child_5 = new Xcls_ToolButton19( _this ); - child_5.ref(); - this.el.add ( child_5.el ); - var child_6 = new Xcls_ToolButton20( _this ); - child_6.ref(); - this.el.add ( child_6.el ); - var child_7 = new Xcls_ToolButton21( _this ); - child_7.ref(); - this.el.add ( child_7.el ); + this.el.add ( child_0.el ); } // user defined functions @@ -399,6 +378,24 @@ public class RepoStatusPopover : Object var child_0 = new Xcls_ToolButton14( _this ); child_0.ref(); this.el.add ( child_0.el ); + var child_1 = new Xcls_ToolButton15( _this ); + child_1.ref(); + this.el.add ( child_1.el ); + var child_2 = new Xcls_ToolButton16( _this ); + child_2.ref(); + this.el.add ( child_2.el ); + var child_3 = new Xcls_ToolButton17( _this ); + child_3.ref(); + this.el.add ( child_3.el ); + var child_4 = new Xcls_ToolButton18( _this ); + child_4.ref(); + this.el.add ( child_4.el ); + var child_5 = new Xcls_ToolButton19( _this ); + child_5.ref(); + this.el.add ( child_5.el ); + var child_6 = new Xcls_ToolButton20( _this ); + child_6.ref(); + this.el.add ( child_6.el ); } // user defined functions @@ -441,7 +438,6 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton15 : Object { public Gtk.ToolButton el; @@ -452,44 +448,6 @@ public class RepoStatusPopover : Object // ctor public Xcls_ToolButton15(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_ToolButton16 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton16(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton( null, "Commit Changes" ); @@ -517,7 +475,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton17 : Object + public class Xcls_ToolButton16 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -526,7 +484,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton17(RepoStatusPopover _owner ) + public Xcls_ToolButton16(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton( null, "Create Branch / Start ticket" ); @@ -549,7 +507,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton18 : Object + public class Xcls_ToolButton17 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -558,7 +516,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton18(RepoStatusPopover _owner ) + public Xcls_ToolButton17(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton( null, "Reset to remote" ); @@ -587,7 +545,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton19 : Object + public class Xcls_ToolButton18 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -596,7 +554,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton19(RepoStatusPopover _owner ) + public Xcls_ToolButton18(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton( null, "Pull updates" ); @@ -625,7 +583,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton20 : Object + public class Xcls_ToolButton19 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -634,7 +592,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton20(RepoStatusPopover _owner ) + public Xcls_ToolButton19(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton( null, "Merge branch/ ticket" ); @@ -658,7 +616,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton21 : Object + public class Xcls_ToolButton20 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -667,7 +625,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton21(RepoStatusPopover _owner ) + public Xcls_ToolButton20(RepoStatusPopover _owner ) { _this = _owner; this.el = new GtkButton.new_from_stock(); @@ -696,4 +654,5 @@ public class RepoStatusPopover : Object + } -- 2.39.2