Fix #5560 - Gitlive - branching wip
[gitlive] / Clones.vala
index b5d943d..3a91a66 100644 (file)
@@ -12,7 +12,6 @@ public class Clones : Object
         }
         return _Clones;
     }
-    public Xcls_Clones Clones;
     public Xcls_reposView reposView;
     public Xcls_reposStore reposStore;
     public Xcls_tv_autocommit tv_autocommit;
@@ -24,7 +23,9 @@ public class Clones : Object
     public Xcls_tv_current_branch tv_current_branch;
     public Xcls_cr_current_branch cr_current_branch;
     public Xcls_tv_last_updated tv_last_updated;
+    public Xcls_cr_last_updated cr_last_updated;
     public Xcls_tv_all_branches tv_all_branches;
+    public Xcls_cr_all_branches cr_all_branches;
     public Xcls_ok_button ok_button;
 
         // my vars (def)
@@ -41,10 +42,10 @@ 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_Clones( _this );
+        var child_0 = new Xcls_Box2( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
         var child_1 = new Xcls_ok_button( _this );
@@ -69,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();
         
@@ -86,7 +90,7 @@ public class Clones : Object
        // return this.get('bug').getValue();
         //this.success = c.success;
     }
-    public class Xcls_Clones : Object
+    public class Xcls_Box2 : Object
     {
         public Gtk.Box el;
         private Clones  _this;
@@ -95,11 +99,10 @@ public class Clones : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Clones(Clones _owner )
+        public Xcls_Box2(Clones _owner )
         {
             _this = _owner;
-            _this.Clones = this;
-            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
+            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
 
             // my vars (dec)
 
@@ -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,12 +448,12 @@ 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();
             this.el.add (  child_0.el  );
-            var child_1 = new Xcls_TreeView24( _this );
-            child_1.ref();
 
             // init method
 
@@ -508,6 +515,7 @@ public class Clones : Object
                 var description = new Pango.FontDescription();
                 description.set_size(10000);
                 this.el.override_font(description);
+             
             }
 
             //listeners
@@ -556,14 +564,15 @@ 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
      typeof(bool),   // 4 auto commit
      typeof(bool),   // 5 auto push
-     typeof(string)   // 7 repopath
-      typeof(string)   // 8 color highlighting? );
+     typeof(string),   // 7 repopath
+      typeof(string)   // 8 color highlighting?
+       );
 
             // my vars (dec)
 
@@ -571,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
@@ -600,7 +669,7 @@ public class Clones : Object
             // init method
 
             //    this.items[0].el.set_activatable(true);
-             this.el.add_attribute(_this.keyrender.el , "active", 4 );
+             this.el.add_attribute(_this.cr_autocommit.el , "active", 4 );
         }
 
         // user defined functions
@@ -671,11 +740,11 @@ public class Clones : Object
             this.el.min_width = 50;
             var child_0 = new Xcls_cr_autopush( _this );
             child_0.ref();
-            this.el.pack_start (  child_0.el  );
+            this.el.pack_start (  child_0.el , false );
 
             // init method
 
-            this.el.add_attribute(this.items[0].el , 'active', 5 );
+            this.el.add_attribute(_this.cr_autopush.el , "active", 5 );
             //      this.items[0].el.set_activatable(true);
         }
 
@@ -702,8 +771,8 @@ public class Clones : Object
             this.el.mode = Gtk.CellRendererMode.ACTIVATABLE;
 
             //listeners
-            this.el.toggled.connect( function (self, path) {
-                var ret ={} ;
+            this.el.toggled.connect( (self, path)  => {
+            /*    var ret ={} ;
                 var store = this.get('/reposStore');
                 store.el.get_iter_from_string(ret, path);
                                                                              
@@ -714,7 +783,7 @@ public class Clones : Object
                   var path =  store.el.get_value(ret.iter, 6).value.get_string();
                  var repo = imports.Scm.Repo.Repo.get(path);
                  repo.autopush(!value);
-                 
+                */
             });
         }
 
@@ -740,20 +809,18 @@ 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();
-            this.el.pack_start (  child_0.el  );
+            this.el.pack_start (  child_0.el , false );
 
             // init method
 
-            function() {
-                XObject.prototype.init.call(this);
-                this.el.add_attribute(this.items[0].el , 'markup', 0 );
-            
-            }
+            this.el.add_attribute(_this.cr_repo.el , "markup", 0 );
         }
 
         // user defined functions
@@ -804,16 +871,12 @@ public class Clones : Object
             this.el.min_width = 50;
             var child_0 = new Xcls_cr_current_branch( _this );
             child_0.ref();
-            this.el.pack_start (  child_0.el  );
+            this.el.pack_start (  child_0.el , false );
 
             // init method
 
-            function() {
-                XObject.prototype.init.call(this);
-                this.el.add_attribute(this.items[0].el , 'markup', 1 );
-                 this.el.add_attribute(this.items[0].el , 'cell-background', 7 );
-            
-            }
+            this.el.add_attribute(_this.cr_current_branch.el , "markup", 1 );
+                 this.el.add_attribute(_this.cr_current_branch.el, "cell-background", 7 );
         }
 
         // user defined functions
@@ -862,22 +925,18 @@ public class Clones : Object
             // set gobject values
             this.el.title = "Last updated";
             this.el.min_width = 50;
-            var child_0 = new Xcls_CellRendererText21( _this );
+            var child_0 = new Xcls_cr_last_updated( _this );
             child_0.ref();
-            this.el.pack_start (  child_0.el  );
+            this.el.pack_start (  child_0.el , false );
 
             // init method
 
-            function() {
-                XObject.prototype.init.call(this);
-                this.el.add_attribute(this.items[0].el , 'markup', 3 );
-            
-            }
+            this.el.add_attribute(_this.cr_last_updated.el , "markup", 3 );
         }
 
         // user defined functions
     }
-    public class Xcls_CellRendererText21 : Object
+    public class Xcls_cr_last_updated : Object
     {
         public Gtk.CellRendererText el;
         private Clones  _this;
@@ -886,9 +945,10 @@ public class Clones : Object
             // my vars (def)
 
         // ctor
-        public Xcls_CellRendererText21(Clones _owner )
+        public Xcls_cr_last_updated(Clones _owner )
         {
             _this = _owner;
+            _this.cr_last_updated = this;
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
@@ -921,22 +981,18 @@ public class Clones : Object
             this.el.title = "All Branches";
             this.el.min_width = 50;
             this.el.resizable = false;
-            var child_0 = new Xcls_CellRendererText23( _this );
+            var child_0 = new Xcls_cr_all_branches( _this );
             child_0.ref();
-            this.el.pack_start (  child_0.el  );
+            this.el.pack_start (  child_0.el , false );
 
             // init method
 
-            function() {
-                XObject.prototype.init.call(this);
-                this.el.add_attribute(this.items[0].el , 'markup', 2 );
-            
-            }
+            this.el.add_attribute(_this.cr_all_branches.el , "markup", 2 );
         }
 
         // user defined functions
     }
-    public class Xcls_CellRendererText23 : Object
+    public class Xcls_cr_all_branches : Object
     {
         public Gtk.CellRendererText el;
         private Clones  _this;
@@ -945,9 +1001,10 @@ public class Clones : Object
             // my vars (def)
 
         // ctor
-        public Xcls_CellRendererText23(Clones _owner )
+        public Xcls_cr_all_branches(Clones _owner )
         {
             _this = _owner;
+            _this.cr_all_branches = this;
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
@@ -960,52 +1017,6 @@ public class Clones : Object
 
 
 
-    public class Xcls_TreeView24 : Object
-    {
-        public Gtk.TreeView el;
-        private Clones  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_TreeView24(Clones _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.TreeView();
-
-            // my vars (dec)
-
-            // set gobject values
-            var child_0 = new Xcls_ListStore25( _this );
-            child_0.ref();
-        }
-
-        // user defined functions
-    }
-    public class Xcls_ListStore25 : Object
-    {
-        public Gtk.ListStore el;
-        private Clones  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_ListStore25(Clones _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.ListStore( 0, null );
-
-            // my vars (dec)
-
-            // set gobject values
-        }
-
-        // user defined functions
-    }
-
-
 
 
     public class Xcls_ok_button : Object
@@ -1026,6 +1037,7 @@ public class Clones : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.expand = false;
             this.el.label = "Close";
         }