X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=d4c267b98c2ceee3bd01f9ace9028116504561f5;hp=b152f7685ba220a50e5f3c36e058cbb17d215b08;hb=c245640608475ef3270eb6a48c9af03b274d9996;hpb=7787e7058c952459a07f64edaa20d5e7778dc1fa

diff --git a/Clones.vala b/Clones.vala
index b152f768..d4c267b9 100644
--- a/Clones.vala
+++ b/Clones.vala
@@ -70,47 +70,47 @@ public class Clones : Object
 
     // user defined functions
     public void loadAndShow () {
-    	
-    	_this.el.show_all();
-    	
-    	_this.toolbar.el.hide();
-    	_this.scrolled.el.hide();
-    	_this.spinner.el.show();
-    	_this.spinner.el.start();	
-    	
-    	GitRepo.updateAll("show_clones");
     	this.el.set_deletable(true);
         this.el.set_gravity(Gdk.Gravity.NORTH);
-        this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);
+        this.el.move((Gdk.Screen.width() / 2 ) - (int.min(1280,Gdk.Screen.width()) / 2) ,0);
          this.el.set_keep_above(true);
         this.el.set_default_size(
-    			int.min(1024,Gdk.Screen.width()),
-    			int.max(500,Gdk.Screen.height() - 300)
+    			int.min(1280,Gdk.Screen.width()),
+    			int.max(500,Gdk.Screen.height() - 200)
     	);
+    	this.el.show_all();
+    	
+    	this.toolbar.el.hide();
+    	this.scrolled.el.hide();
+    	this.spinner.el.show();
+    	this.spinner.el.start();	
+    	
+    	GitRepo.updateAllAsync("show_clones");
+    	
          
      
     	
     	
     }
     public void show ()    {
-    
-        this.el.show_all();
-    	_this.spinner.el.stop();
-    	_this.spinner.el.hide();	
-    	_this.toolbar.el.show();
-    	_this.scrolled.el.show();	
-     
-        this.el.set_deletable(true);
+    this.el.set_deletable(true);
         this.el.set_gravity(Gdk.Gravity.NORTH);
-        this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);
+        this.el.move((Gdk.Screen.width() / 2 ) - (int.max(1280,Gdk.Screen.width()) / 2) ,0);
          this.el.set_keep_above(true);
-        this.el.set_default_size(
-    			int.min(1024,Gdk.Screen.width()),
-    			int.max(500,Gdk.Screen.height() - 300)
+       this.el.set_default_size(
+    			int.max(1280,Gdk.Screen.width()),
+    			int.max(500,Gdk.Screen.height() - 100)
     	);
+        this.el.show_all();
+    	this.spinner.el.stop();
+    	this.spinner.el.hide();	
+    	this.toolbar.el.show();
+    	this.scrolled.el.show();	
+     
+        
          
     
-        _this.reposStore.load();
+        this.reposStore.load();
        
         GLib.debug("show clones = run?");
         this.el.run();
@@ -349,7 +349,7 @@ public class Clones : Object
             //listeners
             this.el.row_activated.connect( (path, col)  =>  {
             
-            	if (col.title != "Current Branch") {
+            	if (col.title == "Auto Commit" || col.title == "Auto Push" || col.title == "Auto Branch") {
             		return;
             	}
             	
@@ -361,7 +361,7 @@ public class Clones : Object
                 _this.reposStore.el.get_value(iter, 6, out val);
                 var git_working_dir = (string)val;
                 
-                var repo = GitRepo.singleton().get(git_working_dir);
+                var repo = GitRepo.singleton().get_sync(git_working_dir);
                 
                 Gdk.Rectangle rect;
                 _this.reposView.el.get_cell_area(path, col, out rect);
@@ -464,7 +464,7 @@ public class Clones : Object
                 // } catch(e) { print(e);}
                   
                 this.el.set_value(iter, 0,   repo.name );
-                this.el.set_value( iter, 1, repo.currentBranch.name   );
+                this.el.set_value( iter, 1, repo.getCurrentBranch().name   );
                 this.el.set_value( iter, 2,  repo.branchesToString()   );
         //        this.el.set_value(ret.iter, 2, '' + repo.branches.map(
         //                        function(e) { return e.name; 
@@ -475,24 +475,24 @@ public class Clones : Object
                 this.el.set_value(iter, 5, repo.is_autopush() );                        
                 this.el.set_value(iter, 6,  repo.git_working_dir );  
                 // highlight color.
-                var cb = repo.currentBranch;
+                var cb = repo.getCurrentBranch();
                 //print(JSON.stringify(cb,null,4));
                 var col = "#ffffff";
                 
                 if (cb.lastrev != cb.remoterev) {
                     col =  "#f2dede";
-                    this.el.set_value( iter, 1, repo.currentBranch.name +"\n" +
+                    this.el.set_value( iter, 1, repo.getCurrentBranch().name +"\n" +
                     	(repo.ahead_or_behind == "B" ? "Local is BEHIND remote" : "Local is AHEAD of remote")
                     
                        );
                 }
                 if (repo.has_local_changes) {
                     col =  "#d9edf7";
-                    this.el.set_value( iter, 1, repo.currentBranch.name +"\nHas uncommitted changes"   );
+                    this.el.set_value( iter, 1, repo.getCurrentBranch().name +"\nHas uncommitted changes"   );
                 }
                 if  ((cb.lastrev != cb.remoterev) && (repo.has_local_changes)) {
                     col =  "#fcf8e3";
-                    this.el.set_value( iter, 1, repo.currentBranch.name +"\n" + 
+                    this.el.set_value( iter, 1, repo.getCurrentBranch().name +"\n" + 
                     (repo.ahead_or_behind == "B" ? "Local is BEHIND remote" : "Local is AHEAD of remote") +
                     "\nHas uncommitted changes"   );            
                 }
@@ -577,11 +577,9 @@ public class Clones : Object
               	_this.reposStore.el.set_value(iter, 4, !bval);
               	GLib.debug("got repopath? %s", repopath);
               	
-              	var repo = GitRepo.get(repopath);
+              	var repo = GitRepo.get_sync(repopath);
               	repo.set_autocommit(!bval);
-              	
-              	
-              	
+              	 
               
             });
         }
@@ -656,7 +654,7 @@ public class Clones : Object
               	var repopath = (string)rval;
               	var bval = (bool)val;
               	_this.reposStore.el.set_value(iter, 5, !bval);
-              	var repo = GitRepo.get(repopath);
+              	var repo = GitRepo.get_sync(repopath);
               	repo.set_autopush(!bval);
               	
               	
@@ -735,7 +733,7 @@ public class Clones : Object
               	var repopath = (string)rval;
               	var bval = (bool)val;
               	_this.reposStore.el.set_value(iter, 8, !bval);
-              	var repo = GitRepo.get(repopath);
+              	var repo = GitRepo.get_sync(repopath);
               	repo.set_auto_branch(!bval);