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

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 3a641b2a..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,22 +580,53 @@ 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";
 
             //listeners
             this.el.button_press_event.connect( () => {
               
-               
-               GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "pull" , "--all" });
-               _this.repo.loadStatus();
-               GitMonitor.gitmonitor.start();
-                _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
-                _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
-                Clones.singleton().reposStore.load();
+            
+            
+                Clones.singleton().el.hide();
               
                _this.el.hide();
+               Ticket.singleton().show( _this.repo);
+               
                 return false;
             });
         }