projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RepoStatusPopover.bjs
[gitlive]
/
RepoStatusPopover.vala
diff --git
a/RepoStatusPopover.vala
b/RepoStatusPopover.vala
index
a99b5fc
..
dbe3bb1
100644
(file)
--- a/
RepoStatusPopover.vala
+++ b/
RepoStatusPopover.vala
@@
-16,6
+16,7
@@
public class RepoStatusPopover : Object
public Xcls_label_diff label_diff;
public Xcls_status_view status_view;
public Xcls_diff_view diff_view;
public Xcls_label_diff label_diff;
public Xcls_status_view status_view;
public Xcls_diff_view diff_view;
+ public Xcls_btn_merge btn_merge;
// my vars (def)
public GitRepo repo;
// my vars (def)
public GitRepo repo;
@@
-605,7
+606,7
@@
public class RepoStatusPopover : Object
var child_0 = new Xcls_ToolButton20( _this );
child_0.ref();
this.el.add ( child_0.el );
var child_0 = new Xcls_ToolButton20( _this );
child_0.ref();
this.el.add ( child_0.el );
- var child_1 = new Xcls_
ToolButton21
( _this );
+ var child_1 = new Xcls_
btn_merge
( _this );
child_1.ref();
this.el.add ( child_1.el );
var child_2 = new Xcls_ToolButton22( _this );
child_1.ref();
this.el.add ( child_1.el );
var child_2 = new Xcls_ToolButton22( _this );
@@
-649,7
+650,7
@@
public class RepoStatusPopover : Object
// user defined functions
}
// user defined functions
}
- public class Xcls_
ToolButton21
: Object
+ public class Xcls_
btn_merge
: Object
{
public Gtk.ToolButton el;
private RepoStatusPopover _this;
{
public Gtk.ToolButton el;
private RepoStatusPopover _this;
@@
-658,9
+659,10
@@
public class RepoStatusPopover : Object
// my vars (def)
// ctor
// my vars (def)
// ctor
- public Xcls_
ToolButton21
(RepoStatusPopover _owner )
+ public Xcls_
btn_merge
(RepoStatusPopover _owner )
{
_this = _owner;
{
_this = _owner;
+ _this.btn_merge = this;
this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);;
// my vars (dec)
this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-top", Gtk.IconSize.SMALL_TOOLBAR), null);;
// my vars (dec)