RepoStatusPopover.bjs

[gitlive] / RepoStatusPopover.bjs

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index de5fd84..aca3975 100644 (file)
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -123,7 +123,7 @@
          "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"
@@ -148,7 +148,16 @@
         },
         {
          "listeners" : {
-          "button_press_event" : "() => {\n  \n\n\n    Clones.singleton().el.hide();\n  \n   _this.el.hide();\n      Ticket.singleton().show();\n   \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.repos.activeTicket, null);   \n   }\n    return false;\n}"
+         },
+         "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",