From ae306ec8ab3e0b79de915847e9142807f4396a9d Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 13:26:05 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 77 --------- RepoStatusPopover.vala | 350 ++++------------------------------------- 2 files changed, 32 insertions(+), 395 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index bc51e0ee..ce381042 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -61,17 +61,6 @@ "$ xns" : "Gtk", "bool is_important" : true }, - { - "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", - "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-add\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "xtype" : "ToolButton", - "* pack" : "add", - "$ xns" : "Gtk", - "bool is_important" : true - }, { "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}" @@ -93,28 +82,6 @@ "* pack" : "add", "$ xns" : "Gtk", "bool is_important" : true - }, - { - "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", - "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-top\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "xtype" : "ToolButton", - "* pack" : "add", - "$ xns" : "Gtk", - "bool is_important" : true - }, - { - "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 Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-new\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "* pack" : "add", - "xtype" : "ToolButton", - "$ xns" : "Gtk", - "bool is_important" : true } ] } @@ -203,50 +170,6 @@ "* pack" : "add", "$ 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", - "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-undo\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "xtype" : "ToolButton", - "* pack" : "add", - "$ xns" : "Gtk", - "bool is_important" : true - }, - { - "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", - "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-save\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "* pack" : "add", - "xtype" : "ToolButton", - "$ xns" : "Gtk", - "bool is_important" : true - }, - { - "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 / clear changes", - "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-revert-to-saved\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "* pack" : "add", - "xtype" : "ToolButton", - "$ xns" : "Gtk", - "bool is_important" : true - }, - { - "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", - "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-bottom\", Gtk.IconSize.SMALL_TOOLBAR), null);", - "xtype" : "ToolButton", - "* pack" : "add", - "$ xns" : "Gtk", - "bool is_important" : true - }, { "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}" diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index f26bbfa1..cead0d41 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -89,10 +89,10 @@ public class RepoStatusPopover : Object var child_0 = new Xcls_Box3( _this ); child_0.ref(); this.el.pack_end ( child_0.el , false,false,0 ); - var child_1 = new Xcls_Notebook12( _this ); + var child_1 = new Xcls_Notebook9( _this ); child_1.ref(); this.el.pack_start ( child_1.el , true,true,0 ); - var child_2 = new Xcls_Box21( _this ); + var child_2 = new Xcls_Box18( _this ); child_2.ref(); this.el.pack_end ( child_2.el , false,false,0 ); } @@ -156,15 +156,6 @@ public class RepoStatusPopover : Object var child_3 = new Xcls_ToolButton8( _this ); child_3.ref(); this.el.add ( child_3.el ); - var child_4 = new Xcls_ToolButton9( _this ); - child_4.ref(); - this.el.add ( child_4.el ); - var child_5 = new Xcls_ToolButton10( _this ); - child_5.ref(); - this.el.add ( child_5.el ); - var child_6 = new Xcls_ToolButton11( _this ); - child_6.ref(); - this.el.add ( child_6.el ); } // user defined functions @@ -258,40 +249,6 @@ public class RepoStatusPopover : Object // ctor public Xcls_ToolButton7(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Create Branch / Start ticket"; - this.el.is_important = true; - - //listeners - this.el.button_press_event.connect( () => { - var oldq = new Gee.ArrayList(); - - Clones.singleton().el.response(-1); - NewBranch.singleton().show(_this.repo, oldq); - - return false; - }); - } - - // user defined functions - } - - public class Xcls_ToolButton8 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton8(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-revert-to-saved", Gtk.IconSize.SMALL_TOOLBAR), null);; @@ -322,7 +279,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton9 : Object + public class Xcls_ToolButton8 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -331,7 +288,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton9(RepoStatusPopover _owner ) + public Xcls_ToolButton8(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-bottom", Gtk.IconSize.SMALL_TOOLBAR), null);; @@ -362,81 +319,9 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton10 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton10(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Merge branch/ ticket"; - this.el.is_important = true; - - //listeners - this.el.button_press_event.connect( () => { - - _this.el.hide(); - Clones.singleton().el.response(-1); - if (_this.repo.activeTicket != null) { - MergeBranch.singleton().show(_this.repo.activeTicket, null); - } - return false; - }); - } - - // user defined functions - } - - public class Xcls_ToolButton11 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton11(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-new", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Create Ticket"; - this.el.is_important = true; - - //listeners - this.el.button_press_event.connect( () => { - - - - Clones.singleton().el.response(-1); - - _this.el.hide(); - Ticket.singleton().show( _this.repo); - - return false; - }); - } - - // user defined functions - } - - public class Xcls_Notebook12 : Object + public class Xcls_Notebook9 : Object { public Gtk.Notebook el; private RepoStatusPopover _this; @@ -445,7 +330,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Notebook12(RepoStatusPopover _owner ) + public Xcls_Notebook9(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Notebook(); @@ -457,10 +342,10 @@ public class RepoStatusPopover : Object child_0.ref(); var child_1 = new Xcls_label_diff( _this ); child_1.ref(); - var child_2 = new Xcls_Box15( _this ); + var child_2 = new Xcls_Box12( _this ); child_2.ref(); this.el.append_page ( child_2.el , _this.label_status.el ); - var child_3 = new Xcls_Box18( _this ); + var child_3 = new Xcls_Box15( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_diff.el ); } @@ -513,7 +398,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Box15 : Object + public class Xcls_Box12 : Object { public Gtk.Box el; private RepoStatusPopover _this; @@ -522,7 +407,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Box15(RepoStatusPopover _owner ) + public Xcls_Box12(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -531,14 +416,14 @@ public class RepoStatusPopover : Object // set gobject values this.el.homogeneous = false; - var child_0 = new Xcls_ScrolledWindow16( _this ); + var child_0 = new Xcls_ScrolledWindow13( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); } // user defined functions } - public class Xcls_ScrolledWindow16 : Object + public class Xcls_ScrolledWindow13 : Object { public Gtk.ScrolledWindow el; private RepoStatusPopover _this; @@ -547,7 +432,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ScrolledWindow16(RepoStatusPopover _owner ) + public Xcls_ScrolledWindow13(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -591,7 +476,7 @@ public class RepoStatusPopover : Object - public class Xcls_Box18 : Object + public class Xcls_Box15 : Object { public Gtk.Box el; private RepoStatusPopover _this; @@ -600,7 +485,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Box18(RepoStatusPopover _owner ) + public Xcls_Box15(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -609,14 +494,14 @@ public class RepoStatusPopover : Object // set gobject values this.el.homogeneous = false; - var child_0 = new Xcls_ScrolledWindow19( _this ); + var child_0 = new Xcls_ScrolledWindow16( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); } // user defined functions } - public class Xcls_ScrolledWindow19 : Object + public class Xcls_ScrolledWindow16 : Object { public Gtk.ScrolledWindow el; private RepoStatusPopover _this; @@ -625,7 +510,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ScrolledWindow19(RepoStatusPopover _owner ) + public Xcls_ScrolledWindow16(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -671,7 +556,7 @@ public class RepoStatusPopover : Object - public class Xcls_Box21 : Object + public class Xcls_Box18 : Object { public Gtk.Box el; private RepoStatusPopover _this; @@ -680,7 +565,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Box21(RepoStatusPopover _owner ) + public Xcls_Box18(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -691,14 +576,14 @@ public class RepoStatusPopover : Object this.el.homogeneous = true; this.el.expand = false; this.el.vexpand = false; - var child_0 = new Xcls_Toolbar22( _this ); + var child_0 = new Xcls_Toolbar19( _this ); child_0.ref(); this.el.add ( child_0.el ); } // user defined functions } - public class Xcls_Toolbar22 : Object + public class Xcls_Toolbar19 : Object { public Gtk.Toolbar el; private RepoStatusPopover _this; @@ -707,7 +592,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Toolbar22(RepoStatusPopover _owner ) + public Xcls_Toolbar19(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Toolbar(); @@ -716,191 +601,20 @@ public class RepoStatusPopover : Object // set gobject values this.el.toolbar_style = Gtk.ToolbarStyle.BOTH_HORIZ; - var child_0 = new Xcls_ToolButton23( _this ); + var child_0 = new Xcls_ToolButton20( _this ); child_0.ref(); this.el.add ( child_0.el ); - var child_1 = new Xcls_ToolButton24( _this ); + var child_1 = new Xcls_ToolButton21( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_ToolButton25( _this ); + var child_2 = new Xcls_ToolButton22( _this ); child_2.ref(); this.el.add ( child_2.el ); - var child_3 = new Xcls_ToolButton26( _this ); - child_3.ref(); - this.el.add ( child_3.el ); - var child_4 = new Xcls_ToolButton27( _this ); - child_4.ref(); - this.el.add ( child_4.el ); - var child_5 = new Xcls_ToolButton28( _this ); - child_5.ref(); - this.el.add ( child_5.el ); - var child_6 = new Xcls_ToolButton29( _this ); - child_6.ref(); - this.el.add ( child_6.el ); } // user defined functions } - public class Xcls_ToolButton23 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton23(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-undo", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Stash Changes"; - this.el.is_important = true; - - //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_ToolButton24 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton24(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-save", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Commit Changes"; - this.el.is_important = true; - - //listeners - this.el.button_press_event.connect( () => { - _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" }); - _this.repo.push(); - _this.repo.loadStatus(); - - _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff); - _this.status_view.el.get_buffer().set_text(_this.repo.git_status); - - _this.el.hide(); - Clones.singleton().reposStore.load(); - - return false; - }); - } - - // user defined functions - } - - public class Xcls_ToolButton25 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton25(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-revert-to-saved", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Reset / clear changes"; - this.el.is_important = true; - - //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_ToolButton26 : Object - { - public Gtk.ToolButton el; - private RepoStatusPopover _this; - - - // my vars (def) - - // ctor - public Xcls_ToolButton26(RepoStatusPopover _owner ) - { - _this = _owner; - this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-bottom", Gtk.IconSize.SMALL_TOOLBAR), null);; - - // my vars (dec) - - // set gobject values - this.el.label = "Pull updates"; - this.el.is_important = true; - - //listeners - this.el.button_press_event.connect( () => { - - - GitMonitor.gitmonitor.stop(); - _this.repo.git({ "pull" , "--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_ToolButton27 : Object + public class Xcls_ToolButton20 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -909,7 +623,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton27(RepoStatusPopover _owner ) + public Xcls_ToolButton20(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.SMALL_TOOLBAR), null);; @@ -934,7 +648,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton28 : Object + public class Xcls_ToolButton21 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -943,7 +657,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton28(RepoStatusPopover _owner ) + public Xcls_ToolButton21(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);; @@ -969,7 +683,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton29 : Object + public class Xcls_ToolButton22 : Object { public Gtk.ToolButton el; private RepoStatusPopover _this; @@ -978,7 +692,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_ToolButton29(RepoStatusPopover _owner ) + public Xcls_ToolButton22(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-new", Gtk.IconSize.SMALL_TOOLBAR), null);; -- 2.39.2