From: Alan Knowles <alan@roojs.com>
Date: Wed, 19 Dec 2018 05:25:44 +0000 (+0800)
Subject: RepoStatusPopover.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=e1b61c6e25911914e2a4e22856818bde4ecb0606

RepoStatusPopover.bjs
RepoStatusPopover.vala
---

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index dc27804a..bc51e0ee 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -225,17 +225,6 @@
            "$ xns" : "Gtk",
            "bool is_important" : true
           },
-          {
-           "listeners" : {
-            "button_press_event" : "() => {\n   var oldq = new Gee.ArrayList<GitMonitorQueue>();  \n\n\tClones.singleton().el.response(-1);\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n    return false;\n}"
-           },
-           "label" : "Create Branch / Start ticket",
-           "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-add\", Gtk.IconSize.SMALL_TOOLBAR), null);",
-           "xtype" : "ToolButton",
-           "* pack" : "add",
-           "$ xns" : "Gtk",
-           "bool is_important" : true
-          },
           {
            "listeners" : {
             "button_press_event" : "() => {\n  \n   \n   GitMonitor.gitmonitor.stop();\n   _this.repo.git({ \"reset\" , \"--hard\" });\n   _this.repo.loadStatus();\n   GitMonitor.gitmonitor.start();\n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    Clones.singleton().reposStore.load();\n  \n   _this.el.hide();\n    return false;\n}"
@@ -258,6 +247,17 @@
            "$ xns" : "Gtk",
            "bool is_important" : true
           },
+          {
+           "listeners" : {
+            "button_press_event" : "() => {\n   var oldq = new Gee.ArrayList<GitMonitorQueue>();  \n\n\tClones.singleton().el.response(-1);\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n    return false;\n}"
+           },
+           "label" : "Create Branch / Start ticket",
+           "* ctor" : "new Gtk.ToolButton(new Gtk.Image.from_icon_name (\"gtk-add\", Gtk.IconSize.SMALL_TOOLBAR), null);",
+           "xtype" : "ToolButton",
+           "* pack" : "add",
+           "$ xns" : "Gtk",
+           "bool is_important" : true
+          },
           {
            "listeners" : {
             "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repo.activeTicket != null) {\n\t   MergeBranch.singleton().show(_this.repo.activeTicket, null);   \n   }\n    return false;\n}"
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b6f4f0d3..f26bbfa1 100644
--- 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;
             });
         }