RepoStatusPopover.bjs

[gitlive] / RepoStatusPopover.vala

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 8876adf..33cd402 100644 (file)
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -92,12 +92,6 @@ public class RepoStatusPopover : Object
             var child_1 = new Xcls_Box12( _this );
             child_1.ref();
             this.el.pack_end (  child_1.el , false,false,0 );
-            var child_2 = new Xcls_Button18( _this );
-            child_2.ref();
-            this.el.add (  child_2.el  );
-            var child_3 = new Xcls_Button19( _this );
-            child_3.ref();
-            this.el.add (  child_3.el  );
         }
 
         // user defined functions
@@ -372,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
@@ -470,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( () => {
@@ -503,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;
             });
         }
 
@@ -532,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);
@@ -554,7 +564,6 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-
     public class Xcls_Button18 : Object
     {
         public Gtk.Button el;
@@ -572,21 +581,16 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Stash Changes";
+            this.el.label = "Merge branch/  ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
-              
-               
-               GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "stash" , "--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();
-              
+            
                _this.el.hide();
+               Clones.singleton().el.response(-1);
+               if (_this.repo.activeTicket != null) {
+                  MergeBranch.singleton().show(this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }
@@ -611,21 +615,18 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Stash Changes";
+            this.el.label = "Create Ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
               
-               
-               GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "stash" , "--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;
             });
         }
@@ -634,4 +635,5 @@ public class RepoStatusPopover : Object
     }
 
 
+
 }