Clones.bjs

Clones.vala

diff --git a/Clones.bjs b/Clones.bjs
index 6392805..7dbe8a4 100644 (file)
--- a/Clones.bjs
+++ b/Clones.bjs
@@ -103,11 +103,11 @@
           {
            "int n_columns" : 10,
            "id" : "reposStore",
-           "columns" : "     typeof(string),  // 0 repo\n     typeof(string),  // 1 current branch\n     typeof(string),  // 2 all branch\n     typeof(string),  // 3 updated\n     typeof(bool),   // 4 auto commit\n     typeof(bool),   // 5 auto push\n     typeof(string),   // 7 repopath\n      typeof(string),   // 8 color highlighting?\n       typeof(bool),   // 9 auto branch,\n      typeof(string)   // 10 active Ticket\n      ",
+           "columns" : "     typeof(string),  // 0 repo\n     typeof(string),  // 1 current branch\n     typeof(string),  // 2 all branch\n     typeof(string),  // 3 updated\n     typeof(bool),   // 4 auto commit\n     typeof(bool),   // 5 auto push\n     typeof(string),   // 6 repopath\n      typeof(string),   // 7 color highlighting?\n       typeof(bool),   // 8 auto branch,\n      typeof(string)   // 9 active Ticket\n      ",
            "$ pathToRepo" : "function(path) {\n\n    var tr= this.repos;\n\n    \n    for(var i =0 ; i < tr.length; i++) {\n        if (tr[i].repopath == path) {\n            return tr[i];\n        }\n    } \n    return false; \n}\n",
            "xtype" : "ListStore",
            "* pack" : "set_model",
-           "| void load" : "()\n{\n    //this.insert(citer,iter,0);\n    print(\"getting list\");\n    var tr = GitRepo.list();\n    \n    this.el.clear();\n    \n    // fixme .. sort by last updated ...\n    \n    \n    for(var i =0 ; i < tr.length; i++) {\n\t    var repo = tr.index(i);\n\t    repo.loadBranches();\n\t    \n\t    Gtk.TreeIter iter;\n\t    this.el.append(out iter);\n     \n        \n        //print(JSON.stringify(ret,null,4));\n         //tr[i].getBranches();\n         //tr[i].getStatus();\n         //var hi;\n         //try {\n             //tr[i].debug=1;\n         //     hi = tr[i].history('/', 1, 'branch', tr[i].currentBranch.name );\n//             print(JSON.stringify(hi,null,4));\n        // } catch(e) { print(e);}\n          \n        this.el.set_value(iter, 0,   repo.name );\n        this.el.set_value( iter, 1, repo.currentBranch.name   );\n        this.el.set_value( iter, 2,  repo.branchesToString()   );\n//        this.el.set_value(ret.iter, 2, '' + repo.branches.map(\n//                        function(e) { return e.name; \n//                    }).join(', ') \n //        );\n//        this.el.set_value(iter, 3, '' +  (!hi  ? '??' : hi[0].changed_raw));        \n        this.el.set_value(iter, 4, repo.is_autocommit() );                \n        this.el.set_value(iter, 5, repo.is_autopush() );                        \n        this.el.set_value(iter, 6,  repo.gitdir );  \n        // highlight color.\n        var cb = repo.currentBranch;\n        //print(JSON.stringify(cb,null,4));\n        var col = \"#ffffff\";\n        /*\n        if (cb.lastrev != cb.remoterev) {\n            col =  '#ff0000';\n        }\n        if (tr[i].hasLocalChanges) {\n            col =  '#0000ff';\n        }\n        if  ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {\n            col =  '#ff00ff';\n        }\n        */\n        this.el.set_value(iter, 7, col  );      \n        var ticket = repo.activeTicket;\n        \n        this.el.set_value(iter, 9, repo.is_auto_branch()  );      \n        this.el.set_value(iter, 10, ticket == null ? \"\" : ticket.id  );      \n        \n        \n    }     \n    this.el.set_sort_column_id (0, Gtk.SortType.ASCENDING);\n} ",
+           "| void load" : "()\n{\n    //this.insert(citer,iter,0);\n    print(\"getting list\");\n    var tr = GitRepo.list();\n    \n    this.el.clear();\n    \n    // fixme .. sort by last updated ...\n    \n    \n    for(var i =0 ; i < tr.length; i++) {\n\t    var repo = tr.index(i);\n\t    repo.loadBranches();\n\t    \n\t    Gtk.TreeIter iter;\n\t    this.el.append(out iter);\n     \n        \n        //print(JSON.stringify(ret,null,4));\n         //tr[i].getBranches();\n         //tr[i].getStatus();\n         //var hi;\n         //try {\n             //tr[i].debug=1;\n         //     hi = tr[i].history('/', 1, 'branch', tr[i].currentBranch.name );\n//             print(JSON.stringify(hi,null,4));\n        // } catch(e) { print(e);}\n          \n        this.el.set_value(iter, 0,   repo.name );\n        this.el.set_value( iter, 1, repo.currentBranch.name   );\n        this.el.set_value( iter, 2,  repo.branchesToString()   );\n//        this.el.set_value(ret.iter, 2, '' + repo.branches.map(\n//                        function(e) { return e.name; \n//                    }).join(', ') \n //        );\n//        this.el.set_value(iter, 3, '' +  (!hi  ? '??' : hi[0].changed_raw));        \n        this.el.set_value(iter, 4, repo.is_autocommit() );                \n        this.el.set_value(iter, 5, repo.is_autopush() );                        \n        this.el.set_value(iter, 6,  repo.gitdir );  \n        // highlight color.\n        var cb = repo.currentBranch;\n        //print(JSON.stringify(cb,null,4));\n        var col = \"#ffffff\";\n        /*\n        if (cb.lastrev != cb.remoterev) {\n            col =  '#ff0000';\n        }\n        if (tr[i].hasLocalChanges) {\n            col =  '#0000ff';\n        }\n        if  ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {\n            col =  '#ff00ff';\n        }\n        */\n        this.el.set_value(iter, 7, col  );      \n        var ticket = repo.activeTicket;\n        \n        this.el.set_value(iter, 8, repo.is_auto_branch()  );      \n        this.el.set_value(iter, 9, ticket == null ? \"\" : ticket.id  );      \n        \n        \n    }     \n    this.el.set_sort_column_id (0, Gtk.SortType.ASCENDING);\n} ",
            "$ xns" : "Gtk"
           },
           {
@@ -154,7 +154,7 @@
           },
           {
            "id" : "tv_autobranch",
-           "* init" : " \n    this.el.add_attribute(_this.cr_autobranch.el , \"active\", 9 );\n//      this.items[0].el.set_activatable(true);\n\n",
+           "* init" : " \n    this.el.add_attribute(_this.cr_autobranch.el , \"active\", 8 );\n//      this.items[0].el.set_activatable(true);\n\n",
            "* pack" : "append_column",
            "title" : "Auto Branch",
            "xtype" : "TreeViewColumn",
@@ -195,7 +195,7 @@
           },
           {
            "id" : "tv_active_ticket",
-           "* init" : "this.el.add_attribute(_this.cr_active_ticket.el , \"markup\", 10 ); ",
+           "* init" : "this.el.add_attribute(_this.cr_active_ticket.el , \"markup\", 9 ); ",
            "* pack" : "append_column",
            "title" : "Active Ticket",
            "xtype" : "TreeViewColumn",

diff --git a/Clones.vala b/Clones.vala
index 1980400..327b382 100644 (file)
--- a/Clones.vala
+++ b/Clones.vala
@@ -580,10 +580,10 @@ public class Clones : Object
      typeof(string),  // 3 updated
      typeof(bool),   // 4 auto commit
      typeof(bool),   // 5 auto push
-     typeof(string),   // 7 repopath
-      typeof(string),   // 8 color highlighting?
-       typeof(bool),   // 9 auto branch,
-      typeof(string)   // 10 active Ticket
+     typeof(string),   // 6 repopath
+      typeof(string),   // 7 color highlighting?
+       typeof(bool),   // 8 auto branch,
+      typeof(string)   // 9 active Ticket
        );
 
             // my vars (dec)
@@ -650,8 +650,8 @@ public class Clones : Object
                 this.el.set_value(iter, 7, col  );      
                 var ticket = repo.activeTicket;
                 
-                this.el.set_value(iter, 9, repo.is_auto_branch()  );      
-                this.el.set_value(iter, 10, ticket == null ? "" : ticket.id  );      
+                this.el.set_value(iter, 8, repo.is_auto_branch()  );      
+                this.el.set_value(iter, 9, ticket == null ? "" : ticket.id  );      
                 
                 
             }     
@@ -834,7 +834,7 @@ public class Clones : Object
 
             // init method
 
-            this.el.add_attribute(_this.cr_autobranch.el , "active", 9 );
+            this.el.add_attribute(_this.cr_autobranch.el , "active", 8 );
             //      this.items[0].el.set_activatable(true);
         }
 
@@ -965,7 +965,7 @@ public class Clones : Object
 
             // init method
 
-            this.el.add_attribute(_this.cr_active_ticket.el , "markup", 10 );
+            this.el.add_attribute(_this.cr_active_ticket.el , "markup", 9 );
         }
 
         // user defined functions