NewBranch.bjs

[gitlive] / RepoStatusPopover.vala

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 619a997..d9e384e 100644 (file)
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -38,7 +38,7 @@ public class RepoStatusPopover : Object
     }
 
     // user defined functions
-    public void show (Gtk.Widget btn, Gdk.Rectange rect, GitRepo repo) {
+    public void show (Gtk.Widget btn, Gdk.Rectangle rect, GitRepo repo) {
         _this.repo = repo;
         // get the active project.
          var lm = Gtk.SourceLanguageManager.get_default();
@@ -49,21 +49,20 @@ public class RepoStatusPopover : Object
       
         //print (project.fn);
         //project.runhtml = project.runhtml || '';
-        _this.diff_view.el.get_buffer().set_text("diff goes here");
-        _this.status_view.el.get_buffer().set_text("status goes here");
+        _this.diff_view.el.get_buffer().set_text(repo.git_diff);
+        _this.status_view.el.get_buffer().set_text(repo.git_status);
            
                //console.log('show all');
        this.el.set_modal(true);
+       this.el.set_relative_to(btn);
         this.el.set_pointing_to(rect);
-    
-       //this.el.set_relative_to(btn);
-     
+      
        //this.el.set_position(Gtk.PositionType.RIGHT);
     
        // window + header?
-        print("SHOWALL - POPIP\n");
+        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();
@@ -294,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  );
@@ -360,6 +360,9 @@ public class RepoStatusPopover : Object
             var child_2 = new Xcls_Button15( _this );
             child_2.ref();
             this.el.add (  child_2.el  );
+            var child_3 = new Xcls_Button16( _this );
+            child_3.ref();
+            this.el.add (  child_3.el  );
         }
 
         // user defined functions
@@ -385,8 +388,18 @@ public class RepoStatusPopover : Object
 
             //listeners
             this.el.button_press_event.connect( () => {
-                    _this.el.hide();
-                    return false;
+              
+               
+               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();
+              
+               _this.el.hide();
+                return false;
             });
         }
 
@@ -414,8 +427,17 @@ public class RepoStatusPopover : Object
 
             //listeners
             this.el.button_press_event.connect( () => {
-                     _this.el.hide();
-                    return false;
+               _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();
+               
+                return false;
             });
         }
 
@@ -439,7 +461,40 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Ignore or now";
+            this.el.label = "Create Branch";
+
+            //listeners
+            this.el.button_press_event.connect( () => {
+               var oldq = new Gee.ArrayList<GitMonitorQueue>();  
+               _this.el.hide();
+               Clones.singleton().el.hide();
+               NewBranch.singleton().show(_this.repo, oldq);
+            
+                return false;
+            });
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Button16 : Object
+    {
+        public Gtk.Button el;
+        private RepoStatusPopover  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Button16(RepoStatusPopover _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Button();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.label = "Ignore for now";
 
             //listeners
             this.el.button_press_event.connect( () => {