X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=822830c4deffde7660f1c8f31e53d7bbcc4d8849;hb=7ae0932f35b466727843cae1dde108927886ae83;hp=5c764dbaa4c44753c4fbe1da6419f9afcccb17af;hpb=0f67ba939412eaf52e4252894e499d66ac6179fc;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 5c764dba..822830c4 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -351,49 +351,72 @@ 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_Button16( _this );
+            var child_3 = new Xcls_ToolButton17( _this );
             child_3.ref();
             this.el.add (  child_3.el  );
-            var child_4 = new Xcls_Button17( _this );
+            var child_4 = new Xcls_ToolButton18( _this );
             child_4.ref();
             this.el.add (  child_4.el  );
-            var child_5 = new Xcls_Button18( _this );
+            var child_5 = new Xcls_ToolButton19( _this );
             child_5.ref();
             this.el.add (  child_5.el  );
-            var child_6 = new Xcls_Button19( _this );
+            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( () => {
@@ -415,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( () => {
@@ -453,24 +475,23 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button15 : Object
+    public class Xcls_ToolButton16 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button15(RepoStatusPopover _owner )
+        public Xcls_ToolButton16(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.ToolButton( null, "Create Branch / Start ticket" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Create Branch";
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -486,24 +507,23 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button16 : Object
+    public class Xcls_ToolButton17 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button16(RepoStatusPopover _owner )
+        public Xcls_ToolButton17(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.ToolButton( null, "Reset to remote" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Reset to remote";
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -525,24 +545,23 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button17 : Object
+    public class Xcls_ToolButton18 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button17(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 = "Pull updates";
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -564,37 +583,32 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button18 : Object
+    public class Xcls_ToolButton19 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button18(RepoStatusPopover _owner )
+        public Xcls_ToolButton19(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.ToolButton( null, "Merge branch/  ticket" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Merge ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
-               _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
-               _this.repo.push();
-               _this.repo.loadStatus();
-               
-                _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
-                _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
-                
+            
                _this.el.hide();
-               Clones.singleton().reposStore.load();
-               
+               Clones.singleton().el.response(-1);
+               if (_this.repo.activeTicket != null) {
+            	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }
@@ -602,19 +616,19 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button19 : Object
+    public class Xcls_ToolButton20 : Object
     {
-        public Gtk.Button el;
+        public Gtk.ToolButton el;
         private RepoStatusPopover  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button19(RepoStatusPopover _owner )
+        public Xcls_ToolButton20(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new GtkButton.new_from_stock();
 
             // my vars (dec)
 
@@ -626,7 +640,7 @@ public class RepoStatusPopover : Object
               
             
             
-                Clones.singleton().el.hide();
+                  Clones.singleton().el.response(-1);
               
                _this.el.hide();
                Ticket.singleton().show( _this.repo);
@@ -640,4 +654,5 @@ public class RepoStatusPopover : Object
 
 
 
+
 }