X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.bjs;h=79e88ca127207e21dfc89853da14ddbe753f27c6;hb=9b0ec931b3bb641930971d356b70d84ba8f383b8;hp=38abb7698c1bdc8e218d2efbd98ea9796fc3fe16;hpb=dfb3663252725cbb0dfa77de118da220f2011238;p=gitlive

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 38abb769..79e88ca1 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -123,48 +123,48 @@
          "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"
         }
        ]
-      },
-      {
-       "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}"
-       },
-       "label" : "Stash Changes",
-       "* pack" : "add",
-       "xtype" : "Button",
-       "$ 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}"
-       },
-       "label" : "Stash Changes",
-       "xtype" : "Button",
-       "* pack" : "add",
-       "$ xns" : "Gtk"
       }
      ]
     }