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 );
- var child_1 = new Xcls_Button14( _this );
- child_1.ref();
- this.el.add ( child_1.el );
- var child_2 = new Xcls_Button15( _this );
- child_2.ref();
- this.el.add ( child_2.el );
- var child_3 = new Xcls_Button16( _this );
- child_3.ref();
- this.el.add ( child_3.el );
- var child_4 = new Xcls_Button17( _this );
- child_4.ref();
- this.el.add ( child_4.el );
- var child_5 = new Xcls_Button18( _this );
- child_5.ref();
- this.el.add ( child_5.el );
- 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_Button13 : Object
+ public class Xcls_Toolbar13 : Object
{
- public Gtk.Button el;
+ public Gtk.Toolbar el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button13(RepoStatusPopover _owner )
+ public Xcls_Toolbar13(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ this.el = new Gtk.Toolbar();
// my vars (dec)
// set gobject values
- this.el.label = "Reset to remote";
-
- //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;
- });
+ 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
}
-
- public class Xcls_Button14 : Object
+ public class Xcls_ToolButton14 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button14(RepoStatusPopover _owner )
+ public Xcls_ToolButton14(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ this.el = new Gtk.ToolButton( null, "Stash Changes" );
// my vars (dec)
// set gobject values
- this.el.label = "Reset to remote";
//listeners
this.el.button_press_event.connect( () => {
GitMonitor.gitmonitor.stop();
- _this.repo.git({ "reset" , "--hard" });
+ _this.repo.git({ "stash" , "--all" });
_this.repo.loadStatus();
GitMonitor.gitmonitor.start();
_this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
// user defined functions
}
- public class Xcls_Button15 : Object
+ public class Xcls_ToolButton15 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button15(RepoStatusPopover _owner )
+ public Xcls_ToolButton15(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ this.el = new Gtk.ToolButton( null, "Commit Changes" );
// my vars (dec)
// set gobject values
- this.el.label = "Stash Changes";
//listeners
this.el.button_press_event.connect( () => {
-
-
- GitMonitor.gitmonitor.stop();
- _this.repo.git({ "stash" , "--all" });
+ _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
+ _this.repo.push();
_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();
+ Clones.singleton().reposStore.load();
+
return false;
});
}
// user defined functions
}
- public class Xcls_Button16 : Object
+ public class Xcls_ToolButton16 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button16(RepoStatusPopover _owner )
+ public Xcls_ToolButton16(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ 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 = "Commit Changes";
+ this.el.label = "Create Branch / Start ticket";
//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();
-
+ var oldq = new Gee.ArrayList<GitMonitorQueue>();
+
+ Clones.singleton().el.response(-1);
+ NewBranch.singleton().show(_this.repo, oldq);
+
return false;
});
}
// user defined functions
}
- public class Xcls_Button17 : Object
+ public class Xcls_ToolButton17 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button17(RepoStatusPopover _owner )
+ public Xcls_ToolButton17(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ 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 = "Create Branch";
+ this.el.label = "Reset / clear changes";
//listeners
this.el.button_press_event.connect( () => {
- var oldq = new Gee.ArrayList<GitMonitorQueue>();
-
- Clones.singleton().el.response(-1);
- NewBranch.singleton().show(_this.repo, oldq);
-
+
+
+ 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_Button18 : Object
+ public class Xcls_ToolButton18 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button18(RepoStatusPopover _owner )
+ public Xcls_ToolButton18(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ 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 = "Ignore for now";
+ this.el.label = "Pull updates";
//listeners
this.el.button_press_event.connect( () => {
- _this.el.hide();
- return false;
+
+
+ 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_Button19 : Object
+ public class Xcls_ToolButton19 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button19(RepoStatusPopover _owner )
+ public Xcls_ToolButton19(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ 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 = "Reset to remote";
+ this.el.label = "Merge branch/ ticket";
//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();
+ 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_Button20 : Object
+ public class Xcls_ToolButton20 : Object
{
- public Gtk.Button el;
+ public Gtk.ToolButton el;
private RepoStatusPopover _this;
// my vars (def)
// ctor
- public Xcls_Button20(RepoStatusPopover _owner )
+ public Xcls_ToolButton20(RepoStatusPopover _owner )
{
_this = _owner;
- this.el = new Gtk.Button();
+ 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 = "Stash Changes";
+ this.el.label = "Create Ticket";
//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();
+
+
+ Clones.singleton().el.response(-1);
_this.el.hide();
+ Ticket.singleton().show( _this.repo);
+
return false;
});
}
+
}
projects / gitlive / blobdiff