"listeners" : {
"button_press_event" : "() => {\n var oldq = new Gee.ArrayList<GitMonitorQueue>(); \n\n\tClones.singleton().el.response(-1);\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n return false;\n}"
},
- "label" : "Create Branch",
+ "label" : "Create Branch / Start ticket",
"xtype" : "Button",
"* pack" : "add",
"$ xns" : "Gtk"
},
{
"listeners" : {
- "button_press_event" : "() => {\n _this.el.hide();\n return false;\n}"
+ "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"reset\" , \"--hard\" });\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}"
},
- "label" : "Ignore for now",
+ "label" : "Reset to remote",
+ "* pack" : "add",
+ "xtype" : "Button",
+ "$ xns" : "Gtk"
+ },
+ {
+ "listeners" : {
+ "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"pull\" , \"--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}"
+ },
+ "label" : "Pull updates",
"xtype" : "Button",
"* pack" : "add",
"$ 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}"
+ "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n if (_this.repos.activeTicket != null) {\n\t MergeBranch.singleton().show(this.repo.activeTicket, null); \n }\n return false;\n}"
},
- "label" : "Stash Changes",
+ "label" : "Merge branch/ ticket",
"xtype" : "Button",
"* pack" : "add",
"$ xns" : "Gtk"
+ },
+ {
+ "listeners" : {
+ "button_press_event" : "() => {\n \n\n\n Clones.singleton().el.hide();\n \n _this.el.hide();\n Ticket.singleton().show( _this.repo);\n \n return false;\n}"
+ },
+ "label" : "Create Ticket",
+ "* pack" : "add",
+ "xtype" : "Button",
+ "$ xns" : "Gtk"
}
]
}