merge

[gitlive] / Clones.js

diff --git a/Clones.js b/Clones.js
index 06d6174..6e48f5d 100644 (file)
--- a/Clones.js
+++ b/Clones.js
@@ -327,9 +327,11 @@ Clones=new XObject({
                                       _this, [ _this, '']
                                    );
                                          });
+                                      
+                                      
+                                      this.el.set_tooltip_column(8); 
                                          
-                                         
-                               this.el.set_tooltip_column(7);          
+                                        
                               },
                             items : [
                                 {
@@ -338,7 +340,7 @@ Clones=new XObject({
                                     pack : "set_model",
                                     init : function() {
                                         XObject.prototype.init.call(this);
-                                        this.el.set_column_types ( 8, [
+                                        this.el.set_column_types ( 9, [
                                            GObject.TYPE_STRING, // repo  
                                           GObject.TYPE_STRING, // current branch
                                           GObject.TYPE_STRING, // all branch      
@@ -346,7 +348,8 @@ Clones=new XObject({
                                            GObject.TYPE_BOOLEAN, // auto-commit
                                             GObject.TYPE_BOOLEAN, // auto-push
                                                GObject.TYPE_STRING, // repopath
-                                               GObject.TYPE_STRING // color highighling 
+                                               GObject.TYPE_STRING, // color highighling 
+                                               GObject.TYPE_STRING // uncommited. (tip) 
                                       ] );
                                     },
                                     load : function()
@@ -396,7 +399,8 @@ Clones=new XObject({
                                                 col =  '#ff00ff';
                                             }
                                             
-                                            this.el.set_value(ret.iter, 7, col  );      
+                                            this.el.set_value(ret.iter, 7, col  );
+                                            this.el.set_value(ret.iter, 8, tr[i].localChanges  );      
                                             
                                         }     
                                     }
@@ -466,9 +470,9 @@ Clones=new XObject({
                                 },
                                 {
                                     xtype: Gtk.TreeViewColumn,
+                                    resizable : true,
                                     min_width : 200,
                                     pack : "append_column",
-                                    resizable : "true",
                                     title : "Repo",
                                     init : function() {
                                         XObject.prototype.init.call(this);