X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=9e40c63daa556caedce44ebcf738874623731de6;hb=68b480d67843927a38e1a087aa75cdaf40daa394;hp=f664fb3efa0f38c16bb8ab3d211983fe5f6b0975;hpb=505c895b219034de70779795db13d0a5d9e0a804;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index f664fb3e..9e40c63d 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -366,6 +366,12 @@ public class RepoStatusPopover : Object
             var child_4 = new Xcls_Button17( _this );
             child_4.ref();
             this.el.add (  child_4.el  );
+            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
@@ -387,14 +393,14 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Reset to remote";
+            this.el.label = "Stash Changes";
 
             //listeners
             this.el.button_press_event.connect( () => {
               
                
                GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "reset" , "--hard" });
+               _this.repo.git({ "stash" , "--all" });
                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
@@ -464,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( () => {
@@ -497,12 +503,22 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Ignore for now";
+            this.el.label = "Reset to remote";
 
             //listeners
             this.el.button_press_event.connect( () => {
-                   _this.el.hide();
-                    return false;
+              
+               
+               GitMonitor.gitmonitor.stop();
+               _this.repo.git({ "reset" , "--hard" });
+               _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();
+              
+               _this.el.hide();
+                return false;
             });
         }
 
@@ -526,14 +542,14 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Stash Changes";
+            this.el.label = "Pull updates";
 
             //listeners
             this.el.button_press_event.connect( () => {
               
                
                GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "stash" , "--all" });
+               _this.repo.git({ "pull" , "--all" });
                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
@@ -548,6 +564,76 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
+    public class Xcls_Button18 : Object
+    {
+        public Gtk.Button el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Button18(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Button();
+
+            // 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 != null) {
+            	   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 GtkButton.new_from_stock();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.label = "Create Ticket";
+
+            //listeners
+            this.el.button_press_event.connect( () => {
+              
+            
+            
+                  Clones.singleton().el.response(-1);
+              
+               _this.el.hide();
+               Ticket.singleton().show( _this.repo);
+               
+                return false;
+            });
+        }
+
+        // user defined functions
+    }
+
 
 
 }