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 );
}
// user defined functions
// my vars (dec)
// set gobject values
- this.el.label = "Create Branch";
+ this.el.label = "Create Branch / Start ticket";
//listeners
this.el.button_press_event.connect( () => {
// my vars (dec)
// set gobject values
- this.el.label = "Ignore for now";
+ this.el.label = "Reset to remote";
//listeners
this.el.button_press_event.connect( () => {
- _this.el.hide();
- return false;
+
+
+ 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;
});
}
// my vars (dec)
// set gobject values
- this.el.label = "Reset to remote";
+ this.el.label = "Pull updates";
//listeners
this.el.button_press_event.connect( () => {
GitMonitor.gitmonitor.stop();
- _this.repo.git({ "reset" , "--hard" });
+ _this.repo.git({ "pull" , "--all" });
_this.repo.loadStatus();
GitMonitor.gitmonitor.start();
_this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
// my vars (dec)
// set gobject values
- this.el.label = "Pull updates";
+ this.el.label = "Merge branch/ ticket";
+
+ //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_Button19 : Object
+ {
+ public Gtk.Button el;
+ private RepoStatusPopover _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Button19(RepoStatusPopover _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Button();
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.label = "Create Ticket";
//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();
+
+
+ Clones.singleton().el.hide();
_this.el.hide();
+ Ticket.singleton().show( _this.repo);
+
return false;
});
}