X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=8053cc05374023c885077a7d0cb7146763afa11a;hb=b962d43877735134f4d1a70a090a01843e9539f3;hp=136505ccc2da831a13da1cf55eede22cba48ecd0;hpb=2d3bb6db4cf59fb23b8774360ee0f15ffb7dc975;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 136505cc..8053cc05 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -62,7 +62,7 @@ public class RepoStatusPopover : Object
     	// window + header?
     	 GLib.debug("SHOWALL - POPIP\n");
     	this.el.show_all();
-    	this.el.set_size_request(800,500);
+    	//this.el.set_size_request(800,500);
     //	this.diff_view.el.grab_focus();
     	
         //this.el.show_all();
@@ -293,6 +293,7 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.height_request = 400;
             var child_0 = new Xcls_diff_view( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
@@ -350,43 +351,81 @@ public class RepoStatusPopover : Object
             this.el.homogeneous = true;
             this.el.expand = false;
             this.el.vexpand = false;
-            var child_0 = new Xcls_Button13( _this );
+            var child_0 = new Xcls_Toolbar13( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
-            var child_1 = new Xcls_Button14( _this );
+        }
+
+        // user defined functions
+    }
+    public class Xcls_Toolbar13 : Object
+    {
+        public Gtk.Toolbar el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Toolbar13(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Toolbar();
+
+            // my vars (dec)
+
+            // set gobject values
+            var child_0 = new Xcls_ToolButton14( _this );
+            child_0.ref();
+            this.el.add (  child_0.el  );
+            var child_1 = new Xcls_ToolButton15( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
-            var child_2 = new Xcls_Button15( _this );
+            var child_2 = new Xcls_ToolButton16( _this );
             child_2.ref();
             this.el.add (  child_2.el  );
+            var child_3 = new Xcls_ToolButton17( _this );
+            child_3.ref();
+            this.el.add (  child_3.el  );
+            var child_4 = new Xcls_ToolButton18( _this );
+            child_4.ref();
+            this.el.add (  child_4.el  );
+            var child_5 = new Xcls_ToolButton19( _this );
+            child_5.ref();
+            this.el.add (  child_5.el  );
+            var child_6 = new Xcls_ToolButton20( _this );
+            child_6.ref();
+            this.el.add (  child_6.el  );
         }
 
         // user defined functions
     }
-    public class Xcls_Button13 : Object
+    public class Xcls_ToolButton14 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button13(RepoStatusPopover _owner )
+        public Xcls_ToolButton14(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.ToolButton( null, "Stash Changes" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Stash Changes";
 
             //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();
@@ -399,24 +438,23 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button14 : Object
+    public class Xcls_ToolButton15 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button14(RepoStatusPopover _owner )
+        public Xcls_ToolButton15(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.ToolButton( null, "Commit Changes" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Commit Changes";
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -437,35 +475,184 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button15 : Object
+    public class Xcls_ToolButton16 : Object
+    {
+        public Gtk.ToolButton el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_ToolButton16(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.ToolButton( null, "Create Branch / Start ticket" );
+
+            // my vars (dec)
+
+            // set gobject values
+
+            //listeners
+            this.el.button_press_event.connect( () => {
+               var oldq = new Gee.ArrayList<GitMonitorQueue>();  
+            
+            	Clones.singleton().el.response(-1);
+            	NewBranch.singleton().show(_this.repo, oldq);
+            
+                return false;
+            });
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_ToolButton17 : Object
+    {
+        public Gtk.ToolButton el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_ToolButton17(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.ToolButton( null, "Reset to remote" );
+
+            // my vars (dec)
+
+            // set gobject values
+
+            //listeners
+            this.el.button_press_event.connect( () => {
+              
+               
+               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;
+            });
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_ToolButton18 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button15(RepoStatusPopover _owner )
+        public Xcls_ToolButton18(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.ToolButton( null, "Pull updates" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Ignore for now";
 
             //listeners
             this.el.button_press_event.connect( () => {
-                   _this.el.hide();
-                    return false;
+              
+               
+               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();
+                return false;
             });
         }
 
         // user defined functions
     }
 
+    public class Xcls_ToolButton19 : Object
+    {
+        public Gtk.ToolButton el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_ToolButton19(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.ToolButton( null, "Merge branch/  ticket" );
+
+            // my vars (dec)
+
+            // set gobject values
+
+            //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_ToolButton20 : Object
+    {
+        public Gtk.ToolButton el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_ToolButton20(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.ToolButton(new Gtk.Image.from_icon_name ("window-close", Gtk.IconSize.SMALL_TOOLBAR));
+
+            // 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
+    }
+
+
 
 
 }