X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=5f0b2577b7579071feb307042f6fa198f7cb065d;hb=267f1afc73bb376451b5ec8f0014f878f472d740;hp=71ee6fa2ecdd633e8487edcbf36786cad1b496ea;hpb=8c14fe2bd9fe8c9f4e97f1cabf4c22ec7cb1d6cb;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 71ee6fa2..5f0b2577 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -369,6 +369,9 @@ public class RepoStatusPopover : Object
             var child_5 = new Xcls_Button18( _this );
             child_5.ref();
             this.el.add (  child_5.el  );
+            var child_6 = new Xcls_Button19( _this );
+            child_6.ref();
+            this.el.add (  child_6.el  );
         }
 
         // user defined functions
@@ -467,7 +470,7 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Create Branch";
+            this.el.label = "Create Branch / Start ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -577,6 +580,40 @@ public class RepoStatusPopover : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.label = "Merge branch/  ticket";
+
+            //listeners
+            this.el.button_press_event.connect( () => {
+            
+               _this.el.hide();
+               Clones.singleton().el.response(-1);
+               if (this.repo.activeTicket) {
+            	   MergeBranch.singleton().show(this.repo.activeTicket, null);   
+               }
+                return false;
+            });
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Button19 : Object
+    {
+        public Gtk.Button el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Button19(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Button();
+
+            // my vars (dec)
+
             // set gobject values
             this.el.label = "Create Ticket";
 
@@ -588,7 +625,7 @@ public class RepoStatusPopover : Object
                 Clones.singleton().el.hide();
               
                _this.el.hide();
-                  Ticket.singleton().show();
+               Ticket.singleton().show( _this.repo);
                
                 return false;
             });