X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=082e2397297c13ebfd56ed3e486d0de3dbdb6cba;hb=11f7e8f96298522baab894c0d41ab47079a384ca;hp=751f07c4b43c8681a6cac9039559637366f6799e;hpb=012da43ef16a6d3d1fc3bdca0c0d82be16d7b5f9;p=gitlive diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala index 751f07c4..082e2397 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 @@ -396,9 +375,28 @@ public class RepoStatusPopover : Object // my vars (dec) // set gobject values + this.el.toolbar_style = Gtk.ToolbarStyle.BOTH_HORIZ; 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 +439,6 @@ public class RepoStatusPopover : Object // user defined functions } - public class Xcls_ToolButton15 : Object { public Gtk.ToolButton el; @@ -452,44 +449,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 +476,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,14 +485,15 @@ 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" ); + 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 = "Create Branch / Start ticket"; //listeners this.el.button_press_event.connect( () => { @@ -549,7 +509,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,14 +518,15 @@ 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" ); + 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"; //listeners this.el.button_press_event.connect( () => { @@ -587,7 +548,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,14 +557,15 @@ 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" ); + 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"; //listeners this.el.button_press_event.connect( () => { @@ -625,7 +587,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,14 +596,15 @@ 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" ); + 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"; //listeners this.el.button_press_event.connect( () => { @@ -658,7 +621,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,10 +630,10 @@ 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(); + this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-new", Gtk.IconSize.SMALL_TOOLBAR), null);; // my vars (dec) @@ -696,4 +659,5 @@ public class RepoStatusPopover : Object + }