RepoStatusPopover.bjs

[gitlive] / RepoStatusPopover.vala

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 8876adf..691c389 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,9 @@ 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  );
         }
 
         // user defined functions
@@ -503,43 +500,14 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Ignore for now";
-
-            //listeners
-            this.el.button_press_event.connect( () => {
-                   _this.el.hide();
-                    return false;
-            });
-        }
-
-        // user defined functions
-    }
-
-    public class Xcls_Button17 : Object
-    {
-        public Gtk.Button el;
-        private RepoStatusPopover  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_Button17(RepoStatusPopover _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Button();
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.label = "Stash Changes";
+            this.el.label = "Reset to remote";
 
             //listeners
             this.el.button_press_event.connect( () => {
               
                
                GitMonitor.gitmonitor.stop();
-               _this.repo.git({ "stash" , "--all" });
+               _this.repo.git({ "reset" , "--hard" });
                _this.repo.loadStatus();
                GitMonitor.gitmonitor.start();
                 _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
@@ -554,8 +522,7 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-
-    public class Xcls_Button18 : Object
+    public class Xcls_Button17 : Object
     {
         public Gtk.Button el;
         private RepoStatusPopover  _this;
@@ -564,7 +531,7 @@ public class RepoStatusPopover : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button18(RepoStatusPopover _owner )
+        public Xcls_Button17(RepoStatusPopover _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -572,14 +539,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);
@@ -594,7 +561,7 @@ public class RepoStatusPopover : Object
         // user defined functions
     }
 
-    public class Xcls_Button19 : Object
+    public class Xcls_Button18 : Object
     {
         public Gtk.Button el;
         private RepoStatusPopover  _this;
@@ -603,7 +570,7 @@ public class RepoStatusPopover : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button19(RepoStatusPopover _owner )
+        public Xcls_Button18(RepoStatusPopover _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -611,21 +578,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 +598,5 @@ public class RepoStatusPopover : Object
     }
 
 
+
 }