X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.bjs;h=b4bf4aeb0b04b717edc69d82c169ac96e3c4868f;hb=267f1afc73bb376451b5ec8f0014f878f472d740;hp=821af4b3a476317a9d9aac1c13a57bbdd8125627;hpb=505c895b219034de70779795db13d0a5d9e0a804;p=gitlive

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 821af4b3..b4bf4aeb 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -103,9 +103,9 @@
        "items" : [
         {
          "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}"
+          "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" : "Reset to remote",
+         "label" : "Stash Changes",
          "* pack" : "add",
          "xtype" : "Button",
          "$ xns" : "Gtk"
@@ -123,28 +123,46 @@
          "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" : "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" : "Ignore for now",
+         "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.repo.activeTicket) {\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"
         }
        ]
       }