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.bjs
diff --git
a/RepoStatusPopover.bjs
b/RepoStatusPopover.bjs
index
b9c68f2
..
abd78e6
100644
(file)
--- a/
RepoStatusPopover.bjs
+++ b/
RepoStatusPopover.bjs
@@
-102,6
+102,7
@@
"gboolean vexpand" : false,
"items" : [
{
"gboolean vexpand" : false,
"items" : [
{
+ "Gtk.ToolbarStyle toolbar_style" : "Gtk.ToolbarStyle.BOTH_HORIZ",
"* pack" : "add",
"xtype" : "Toolbar",
"$ xns" : "Gtk",
"* pack" : "add",
"xtype" : "Toolbar",
"$ xns" : "Gtk",
@@
-129,6
+130,7
@@
"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 / Start ticket",
"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 / Start ticket",
+ "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-top\", Gtk.IconSize.SMALL_TOOLBAR), null);",
"xtype" : "ToolButton",
"* pack" : "add",
"$ xns" : "Gtk"
"xtype" : "ToolButton",
"* pack" : "add",
"$ xns" : "Gtk"
@@
-137,7
+139,8
@@
"listeners" : {
"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}"
},
"listeners" : {
"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" : "Reset to remote",
+ "label" : "Reset / clear changes",
+ "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-revert-to-saved\", Gtk.IconSize.SMALL_TOOLBAR), null);",
"* pack" : "add",
"xtype" : "ToolButton",
"$ xns" : "Gtk"
"* pack" : "add",
"xtype" : "ToolButton",
"$ xns" : "Gtk"
@@
-147,6
+150,7
@@
"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",
"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",
+ "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-bottom\", Gtk.IconSize.SMALL_TOOLBAR), null);",
"xtype" : "ToolButton",
"* pack" : "add",
"$ xns" : "Gtk"
"xtype" : "ToolButton",
"* pack" : "add",
"$ xns" : "Gtk"
@@
-156,6
+160,7
@@
"button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n if (_this.repo.activeTicket != null) {\n\t MergeBranch.singleton().show(_this.repo.activeTicket, null); \n }\n return false;\n}"
},
"label" : "Merge branch/ ticket",
"button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n if (_this.repo.activeTicket != null) {\n\t MergeBranch.singleton().show(_this.repo.activeTicket, null); \n }\n return false;\n}"
},
"label" : "Merge branch/ ticket",
+ "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-goto-top\", Gtk.IconSize.SMALL_TOOLBAR), null);",
"xtype" : "ToolButton",
"* pack" : "add",
"$ xns" : "Gtk"
"xtype" : "ToolButton",
"* pack" : "add",
"$ xns" : "Gtk"
@@
-165,7
+170,7
@@
"button_press_event" : "() => {\n \n\n\n Clones.singleton().el.response(-1);\n \n _this.el.hide();\n Ticket.singleton().show( _this.repo);\n \n return false;\n}"
},
"label" : "Create Ticket",
"button_press_event" : "() => {\n \n\n\n Clones.singleton().el.response(-1);\n \n _this.el.hide();\n Ticket.singleton().show( _this.repo);\n \n return false;\n}"
},
"label" : "Create Ticket",
- "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"
window-close\", Gtk.IconSize.SMALL_TOOLBAR))
",
+ "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"
gtk-new\", Gtk.IconSize.SMALL_TOOLBAR), null);
",
"* pack" : "add",
"xtype" : "ToolButton",
"$ xns" : "Gtk"
"* pack" : "add",
"xtype" : "ToolButton",
"$ xns" : "Gtk"