RepoStatusPopover.bjs

[gitlive] / RepoStatusPopover.vala

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b6f4f0d..f26bbfa 100644 (file)
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -832,21 +832,27 @@ public class RepoStatusPopover : Object
         public Xcls_ToolButton25(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.SMALL_TOOLBAR), null);;
+            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-revert-to-saved", Gtk.IconSize.SMALL_TOOLBAR), null);;
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Create Branch / Start ticket";
+            this.el.label = "Reset / clear changes";
             this.el.is_important = true;
 
             //listeners
             this.el.button_press_event.connect( () => {
-               var oldq = new Gee.ArrayList<GitMonitorQueue>();  
-            
-               Clones.singleton().el.response(-1);
-               NewBranch.singleton().show(_this.repo, oldq);
-            
+              
+               
+               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;
             });
         }
@@ -866,12 +872,12 @@ public class RepoStatusPopover : Object
         public Xcls_ToolButton26(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-revert-to-saved", Gtk.IconSize.SMALL_TOOLBAR), null);;
+            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-bottom", Gtk.IconSize.SMALL_TOOLBAR), null);;
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Reset / clear changes";
+            this.el.label = "Pull updates";
             this.el.is_important = true;
 
             //listeners
@@ -879,7 +885,7 @@ public class RepoStatusPopover : Object
               
                
                GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "reset" , "--hard" });
+               _this.repo.git({ "pull" , "--all" });
                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
@@ -906,27 +912,21 @@ public class RepoStatusPopover : Object
         public Xcls_ToolButton27(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-goto-bottom", Gtk.IconSize.SMALL_TOOLBAR), null);;
+            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("gtk-add", Gtk.IconSize.SMALL_TOOLBAR), null);;
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Pull updates";
+            this.el.label = "Create Branch / Start ticket";
             this.el.is_important = true;
 
             //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();
-              
-               _this.el.hide();
+               var oldq = new Gee.ArrayList<GitMonitorQueue>();  
+            
+               Clones.singleton().el.response(-1);
+               NewBranch.singleton().show(_this.repo, oldq);
+            
                 return false;
             });
         }