projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial Fix #5560 - Gitlive - branching wip
[gitlive]
/
RepoStatusPopover.bjs
diff --git
a/RepoStatusPopover.bjs
b/RepoStatusPopover.bjs
index
a34afca
..
5952a64
100644
(file)
--- a/
RepoStatusPopover.bjs
+++ b/
RepoStatusPopover.bjs
@@
-9,7
+9,7
@@
"items" : [
{
"GitRepo repo" : "",
"items" : [
{
"GitRepo repo" : "",
- "| void show" : " (Gtk.Widget btn, Gdk.Rectangle rect, GitRepo repo) {\n _this.repo = repo;\n // get the active project.\n var lm = Gtk.SourceLanguageManager.get_default();\n \n// ((Gtk.SourceBuffer)(_this.view.el.get_buffer())) .set_language(\n // lm.get_language(\"html\")\n // );\n \n //print (project.fn);\n //project.runhtml = project.runhtml || '';\n _this.diff_view.el.get_buffer().set_text(repo.git_diff);\n _this.status_view.el.get_buffer().set_text(repo.git_status);\n \n \t//console.log('show all');\n\tthis.el.set_modal(true);\n\tthis.el.set_relative_to(btn);\n this.el.set_pointing_to(rect);\n \n\t//this.el.set_position(Gtk.PositionType.RIGHT);\n\n\t// window + header?\n\t GLib.debug(\"SHOWALL - POPIP\\n\");\n\tthis.el.show_all();\n\tthis.el.set_size_request(800,500);\n//\tthis.diff_view.el.grab_focus();\n\t\n //this.el.show_all();\n}\n",
+ "| void show" : " (Gtk.Widget btn, Gdk.Rectangle rect, GitRepo repo) {\n _this.repo = repo;\n // get the active project.\n var lm = Gtk.SourceLanguageManager.get_default();\n \n// ((Gtk.SourceBuffer)(_this.view.el.get_buffer())) .set_language(\n // lm.get_language(\"html\")\n // );\n \n //print (project.fn);\n //project.runhtml = project.runhtml || '';\n _this.diff_view.el.get_buffer().set_text(repo.git_diff);\n _this.status_view.el.get_buffer().set_text(repo.git_status);\n \n \t//console.log('show all');\n\tthis.el.set_modal(true);\n\tthis.el.set_relative_to(btn);\n this.el.set_pointing_to(rect);\n \n\t//this.el.set_position(Gtk.PositionType.RIGHT);\n\n\t// window + header?\n\t GLib.debug(\"SHOWALL - POPIP\\n\");\n\tthis.el.show_all();\n\t
//
this.el.set_size_request(800,500);\n//\tthis.diff_view.el.grab_focus();\n\t\n //this.el.show_all();\n}\n",
"xtype" : "Popover",
"Gtk.PositionType position" : "Gtk.PositionType.RIGHT",
"$ xns" : "Gtk",
"xtype" : "Popover",
"Gtk.PositionType position" : "Gtk.PositionType.RIGHT",
"$ xns" : "Gtk",
@@
-74,6
+74,7
@@
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
"items" : [
{
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
"items" : [
{
+ "int height_request" : 400,
"* pack" : "pack_start,true,true,0",
"xtype" : "ScrolledWindow",
"$ xns" : "Gtk",
"* pack" : "pack_start,true,true,0",
"xtype" : "ScrolledWindow",
"$ xns" : "Gtk",
@@
-102,7
+103,7
@@
"items" : [
{
"listeners" : {
"items" : [
{
"listeners" : {
- "button_press_event" : "() => {\n
_this.repo.git({ \"stash\" , \"--all\" });\n _this.repo.loadStatus();\n
\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 \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}"
},
"label" : "Stash Changes",
"xtype" : "Button",
},
"label" : "Stash Changes",
"xtype" : "Button",
@@
-118,6
+119,15
@@
"* pack" : "add",
"$ xns" : "Gtk"
},
"* pack" : "add",
"$ xns" : "Gtk"
},
+ {
+ "listeners" : {
+ "button_press_event" : "() => {\n var oldq = new Gee.ArrayList<GitMonitorQueue>(); \n\t_this.el.hide();\n\tClones.singleton().el.hide();\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n return false;\n}"
+ },
+ "label" : "Create Branch",
+ "* pack" : "add",
+ "xtype" : "Button",
+ "$ xns" : "Gtk"
+ },
{
"listeners" : {
"button_press_event" : "() => {\n _this.el.hide();\n return false;\n}"
{
"listeners" : {
"button_press_event" : "() => {\n _this.el.hide();\n return false;\n}"