X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=3a91a661c305416d9038bfca049d50865b050220;hp=a8687c7c53312beba099813d9376eff9432a0c55;hb=0b86050bdbbbd2985f7078ca9036be0196455398;hpb=dd42b881f212cd9e840937d4caa9b5df4e1756a6

diff --git a/Clones.vala b/Clones.vala
index a8687c7c..3a91a661 100644
--- a/Clones.vala
+++ b/Clones.vala
@@ -42,7 +42,7 @@ public class Clones : Object
         this.el.title = "Manage Clones";
         this.el.border_width = 3;
         this.el.default_height = 500;
-        this.el.default_width = 600;
+        this.el.default_width = 800;
         this.el.deletable = true;
         this.el.modal = true;
         var child_0 = new Xcls_Box2( _this );
@@ -70,7 +70,10 @@ public class Clones : Object
     
         
         this.el.set_deletable(false);
+        this.el.set_gravity(Gdk.Gravity.NORTH);
+        this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);
         this.el.show_all();
+        _this.reposStore.load();
         // load clones..
     //     this.get('/reposStore').load();
         
@@ -109,7 +112,7 @@ public class Clones : Object
             this.el.pack_start (  child_0.el , false,false,0 );
             var child_1 = new Xcls_ScrolledWindow9( _this );
             child_1.ref();
-            this.el.pack_end (  child_1.el , false,false,0 );
+            this.el.pack_end (  child_1.el , true,true,0 );
         }
 
         // user defined functions
@@ -239,6 +242,10 @@ public class Clones : Object
 
             //listeners
             this.el.clicked.connect( () => {
+            // 
+            
+            	//NewBranch.singleton().show();
+            
             /*
                 var rv = this.get('/reposView');
                 var rs = this.get('/reposStore');
@@ -441,6 +448,8 @@ public class Clones : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.expand = true;
+            this.el.hexpand = true;
             this.el.shadow_type = Gtk.ShadowType.IN;
             var child_0 = new Xcls_reposView( _this );
             child_0.ref();
@@ -506,6 +515,7 @@ public class Clones : Object
                 var description = new Pango.FontDescription();
                 description.set_size(10000);
                 this.el.override_font(description);
+             
             }
 
             //listeners
@@ -554,7 +564,7 @@ public class Clones : Object
         {
             _this = _owner;
             _this.reposStore = this;
-            this.el = new Gtk.ListStore( 0,      typeof(string),  // 0 repo
+            this.el = new Gtk.ListStore( 8,      typeof(string),  // 0 repo
      typeof(string),  // 1 current branch
      typeof(string),  // 2 all branch
      typeof(string),  // 3 updated
@@ -570,6 +580,66 @@ public class Clones : Object
         }
 
         // user defined functions
+        public void load ()
+        {
+            //this.insert(citer,iter,0);
+            print("getting list");
+            var tr = GitRepo.list();
+            
+            this.el.clear();
+            
+            // fixme .. sort by last updated ...
+            
+            
+            for(var i =0 ; i < tr.length; i++) {
+        	    var repo = tr.index(i);
+        	    repo.loadBranches();
+        	    
+        	    Gtk.TreeIter iter;
+        	    this.el.append(out iter);
+             
+                
+                //print(JSON.stringify(ret,null,4));
+                 //tr[i].getBranches();
+                 //tr[i].getStatus();
+                 //var hi;
+                 //try {
+                     //tr[i].debug=1;
+                 //     hi = tr[i].history('/', 1, 'branch', tr[i].currentBranch.name );
+        //             print(JSON.stringify(hi,null,4));
+                // } 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, 2,  repo.branchesToString()   );
+        //        this.el.set_value(ret.iter, 2, '' + repo.branches.map(
+        //                        function(e) { return e.name; 
+        //                    }).join(', ') 
+         //        );
+        //        this.el.set_value(iter, 3, '' +  (!hi  ? '??' : hi[0].changed_raw));        
+                this.el.set_value(iter, 4, repo.is_autocommit() );                
+                this.el.set_value(iter, 5, repo.is_autopush() );                        
+                this.el.set_value(iter, 6,  repo.gitdir );  
+                // highlight color.
+                var cb = repo.currentBranch;
+                //print(JSON.stringify(cb,null,4));
+                var col = "#ffffff";
+                /*
+                if (cb.lastrev != cb.remoterev) {
+                    col =  '#ff0000';
+                }
+                if (tr[i].hasLocalChanges) {
+                    col =  '#0000ff';
+                }
+                if  ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {
+                    col =  '#ff00ff';
+                }
+                */
+                this.el.set_value(iter, 7, col  );      
+                
+            }     
+            this.el.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+        }
     }
 
     public class Xcls_tv_autocommit : Object
@@ -739,8 +809,10 @@ public class Clones : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.sort_column_id = 0;
             this.el.title = "Repo";
             this.el.min_width = 200;
+            this.el.sort_order = Gtk.SortType.ASCENDING;
             this.el.resizable = true;
             var child_0 = new Xcls_cr_repo( _this );
             child_0.ref();
@@ -965,6 +1037,7 @@ public class Clones : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.expand = false;
             this.el.label = "Close";
         }