From 58446f774c5008eee748b26ffcaf135213e7ed64 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 19 Dec 2018 13:07:14 +0800 Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala --- RepoStatusPopover.bjs | 5 ++++ RepoStatusPopover.vala | 57 ++++++++++++++++++++++++++++++------------ 2 files changed, 46 insertions(+), 16 deletions(-) diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs index 7d052174..0914b7e9 100644 --- a/RepoStatusPopover.bjs +++ b/RepoStatusPopover.bjs @@ -101,6 +101,11 @@ "$ homogeneous" : true, "gboolean vexpand" : false, "items" : [ + { + "* pack" : "pack_start,?bool?,?bool?,?uint?", + "xtype" : "Toolbar", + "$ 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 9e40c63d..31498108 100644 --- a/RepoStatusPopover.vala +++ b/RepoStatusPopover.vala @@ -351,9 +351,9 @@ public class RepoStatusPopover : Object this.el.homogeneous = true; this.el.expand = false; this.el.vexpand = false; - var child_0 = new Xcls_Button13( _this ); + var child_0 = new Xcls_Toolbar13( _this ); child_0.ref(); - this.el.add ( child_0.el ); + this.el.pack_start ( child_0.el , ?bool?,?bool?,?uint? ); var child_1 = new Xcls_Button14( _this ); child_1.ref(); this.el.add ( child_1.el ); @@ -372,11 +372,36 @@ public class RepoStatusPopover : Object 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 + } + public class Xcls_Toolbar13 : Object + { + public Gtk.Toolbar el; + private RepoStatusPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Toolbar13(RepoStatusPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Toolbar(); + + // my vars (dec) + + // set gobject values } // user defined functions } - public class Xcls_Button13 : Object + + public class Xcls_Button14 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -385,7 +410,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button13(RepoStatusPopover _owner ) + public Xcls_Button14(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -415,7 +440,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button14 : Object + public class Xcls_Button15 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -424,7 +449,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button14(RepoStatusPopover _owner ) + public Xcls_Button15(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -453,7 +478,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button15 : Object + public class Xcls_Button16 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -462,7 +487,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button15(RepoStatusPopover _owner ) + public Xcls_Button16(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -486,7 +511,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button16 : Object + public class Xcls_Button17 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -495,7 +520,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button16(RepoStatusPopover _owner ) + public Xcls_Button17(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -525,7 +550,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button17 : Object + public class Xcls_Button18 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -534,7 +559,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button17(RepoStatusPopover _owner ) + public Xcls_Button18(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -564,7 +589,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button18 : Object + public class Xcls_Button19 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -573,7 +598,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button18(RepoStatusPopover _owner ) + public Xcls_Button19(RepoStatusPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -598,7 +623,7 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_Button19 : Object + public class Xcls_Button20 : Object { public Gtk.Button el; private RepoStatusPopover _this; @@ -607,7 +632,7 @@ public class RepoStatusPopover : Object // my vars (def) // ctor - public Xcls_Button19(RepoStatusPopover _owner ) + public Xcls_Button20(RepoStatusPopover _owner ) { _this = _owner; this.el = new GtkButton.new_from_stock(); -- 2.39.2