X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=d5e291839bf80b497081cde73c64987e7d400b6c;hp=19420b9b7000c303601735c23ebfaa9ace5482c8;hb=1f7e6b712f9ee99d621a3a67f1c0795c6106bde6;hpb=8bc485999149d7dd148ac9dcf3fc2ec0749a0267 diff --git a/Clones.vala b/Clones.vala index 19420b9b..d5e29183 100644 --- a/Clones.vala +++ b/Clones.vala @@ -12,15 +12,18 @@ public class Clones : Object } return _Clones; } - public Xcls_Clones Clones; public Xcls_reposView reposView; public Xcls_reposStore reposStore; public Xcls_tv_autocommit tv_autocommit; public Xcls_cr_autocommit cr_autocommit; public Xcls_tv_autopush tv_autopush; public Xcls_cr_autopush cr_autopush; + public Xcls_tv_autobranch tv_autobranch; + public Xcls_cr_autobranch cr_autobranch; public Xcls_tv_repo tv_repo; public Xcls_cr_repo cr_repo; + public Xcls_tv_active_ticket tv_active_ticket; + public Xcls_cr_active_ticket cr_active_ticket; public Xcls_tv_current_branch tv_current_branch; public Xcls_cr_current_branch cr_current_branch; public Xcls_tv_last_updated tv_last_updated; @@ -43,10 +46,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 ); @@ -71,7 +74,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(); @@ -88,7 +94,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; @@ -97,11 +103,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) @@ -241,6 +246,10 @@ public class Clones : Object //listeners this.el.clicked.connect( () => { + // + + //NewBranch.singleton().show(); + /* var rv = this.get('/reposView'); var rs = this.get('/reposStore'); @@ -443,12 +452,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 @@ -487,18 +496,24 @@ public class Clones : Object var child_2 = new Xcls_tv_autopush( _this ); child_2.ref(); this.el.append_column ( child_2.el ); - var child_3 = new Xcls_tv_repo( _this ); + var child_3 = new Xcls_tv_autobranch( _this ); child_3.ref(); this.el.append_column ( child_3.el ); - var child_4 = new Xcls_tv_current_branch( _this ); + var child_4 = new Xcls_tv_repo( _this ); child_4.ref(); this.el.append_column ( child_4.el ); - var child_5 = new Xcls_tv_last_updated( _this ); + var child_5 = new Xcls_tv_active_ticket( _this ); child_5.ref(); this.el.append_column ( child_5.el ); - var child_6 = new Xcls_tv_all_branches( _this ); + var child_6 = new Xcls_tv_current_branch( _this ); child_6.ref(); this.el.append_column ( child_6.el ); + var child_7 = new Xcls_tv_last_updated( _this ); + child_7.ref(); + this.el.append_column ( child_7.el ); + var child_8 = new Xcls_tv_all_branches( _this ); + child_8.ref(); + this.el.append_column ( child_8.el ); // init method @@ -510,6 +525,7 @@ public class Clones : Object var description = new Pango.FontDescription(); description.set_size(10000); this.el.override_font(description); + } //listeners @@ -558,14 +574,17 @@ public class Clones : Object { _this = _owner; _this.reposStore = this; - this.el = new Gtk.ListStore( 0, typeof(string), // 0 repo + this.el = new Gtk.ListStore( 10, 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), // 6 repopath + typeof(string), // 7 color highlighting? + typeof(bool), // 8 auto branch, + typeof(string) // 9 active Ticket + ); // my vars (dec) @@ -573,6 +592,71 @@ 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.git_working_dir ); + // 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 ); + var ticket = repo.activeTicket; + + this.el.set_value(iter, 8, repo.is_auto_branch() ); + this.el.set_value(iter, 9, ticket == null ? "" : ticket.id ); + + + } + this.el.set_sort_column_id (0, Gtk.SortType.ASCENDING); + } } public class Xcls_tv_autocommit : Object @@ -629,21 +713,26 @@ public class Clones : Object //listeners this.el.toggled.connect( (self, path) => { - /* var ret ={} ; - var store = this.get('/reposStore'); - store.el.get_iter_from_string(ret, path); - - var value = store.el.get_value(ret.iter,4).value.get_boolean(); - - //print(JSON.stringify(value)); - store.el.set_value(ret.iter,4, !value); - - var path = store.el.get_value(ret.iter, 6).value.get_string(); - var repo = imports.Scm.Repo.Repo.get(path); - repo.autocommit(!value); - */ - - + + Gtk.TreeIter iter; + _this.reposStore.el.get_iter_from_string(out iter, path); + + GLib.Value val; + GLib.Value rval; + _this.reposStore.el.get_value(iter, 4, out val); + _this.reposStore.el.get_value(iter, 6, out rval); + + var repopath = (string)rval; + var bval = (bool)val; + _this.reposStore.el.set_value(iter, 4, !bval); + GLib.debug("got repopath? %s", repopath); + + var repo = GitRepo.get(repopath); + repo.set_autocommit(!bval); + + + + }); } @@ -673,11 +762,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); } @@ -704,19 +793,104 @@ public class Clones : Object this.el.mode = Gtk.CellRendererMode.ACTIVATABLE; //listeners - this.el.toggled.connect( function (self, path) { - var ret ={} ; - var store = this.get('/reposStore'); - store.el.get_iter_from_string(ret, path); - - var value = store.el.get_value(ret.iter,5).value.get_boolean(); - - //print(JSON.stringify(value)); - store.el.set_value(ret.iter,5, !value); - var path = store.el.get_value(ret.iter, 6).value.get_string(); - var repo = imports.Scm.Repo.Repo.get(path); - repo.autopush(!value); - + this.el.toggled.connect( (self, path) => { + + Gtk.TreeIter iter; + _this.reposStore.el.get_iter_from_string(out iter, path); + + GLib.Value val; + GLib.Value rval; + _this.reposStore.el.get_value(iter, 5, out val); + _this.reposStore.el.get_value(iter, 6, out rval); + + var repopath = (string)rval; + var bval = (bool)val; + _this.reposStore.el.set_value(iter, 5, !bval); + var repo = GitRepo.get(repopath); + repo.set_autopush(!bval); + + + + + }); + } + + // user defined functions + } + + + public class Xcls_tv_autobranch : Object + { + public Gtk.TreeViewColumn el; + private Clones _this; + + + // my vars (def) + + // ctor + public Xcls_tv_autobranch(Clones _owner ) + { + _this = _owner; + _this.tv_autobranch = this; + this.el = new Gtk.TreeViewColumn(); + + // my vars (dec) + + // set gobject values + this.el.title = "Auto Branch"; + this.el.min_width = 50; + var child_0 = new Xcls_cr_autobranch( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , false ); + + // init method + + this.el.add_attribute(_this.cr_autobranch.el , "active", 8 ); + // this.items[0].el.set_activatable(true); + } + + // user defined functions + } + public class Xcls_cr_autobranch : Object + { + public Gtk.CellRendererToggle el; + private Clones _this; + + + // my vars (def) + + // ctor + public Xcls_cr_autobranch(Clones _owner ) + { + _this = _owner; + _this.cr_autobranch = this; + this.el = new Gtk.CellRendererToggle(); + + // my vars (dec) + + // set gobject values + this.el.mode = Gtk.CellRendererMode.ACTIVATABLE; + + //listeners + this.el.toggled.connect( (self, path) => { + + Gtk.TreeIter iter; + _this.reposStore.el.get_iter_from_string(out iter, path); + + GLib.Value val; + GLib.Value rval; + _this.reposStore.el.get_value(iter, 8, out val); + _this.reposStore.el.get_value(iter, 6, out rval); + + var repopath = (string)rval; + var bval = (bool)val; + _this.reposStore.el.set_value(iter, 8, !bval); + var repo = GitRepo.get(repopath); + repo.set_auto_branch(!bval); + + + + }); } @@ -742,20 +916,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 @@ -784,7 +956,7 @@ public class Clones : Object } - public class Xcls_tv_current_branch : Object + public class Xcls_tv_active_ticket : Object { public Gtk.TreeViewColumn el; private Clones _this; @@ -793,34 +965,29 @@ public class Clones : Object // my vars (def) // ctor - public Xcls_tv_current_branch(Clones _owner ) + public Xcls_tv_active_ticket(Clones _owner ) { _this = _owner; - _this.tv_current_branch = this; + _this.tv_active_ticket = this; this.el = new Gtk.TreeViewColumn(); // my vars (dec) // set gobject values - this.el.title = "Current Branch"; + this.el.title = "Active Ticket"; this.el.min_width = 50; - var child_0 = new Xcls_cr_current_branch( _this ); + var child_0 = new Xcls_cr_active_ticket( _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_active_ticket.el , "markup", 9 ); } // user defined functions } - public class Xcls_cr_current_branch : Object + public class Xcls_cr_active_ticket : Object { public Gtk.CellRendererText el; private Clones _this; @@ -829,10 +996,10 @@ public class Clones : Object // my vars (def) // ctor - public Xcls_cr_current_branch(Clones _owner ) + public Xcls_cr_active_ticket(Clones _owner ) { _this = _owner; - _this.cr_current_branch = this; + _this.cr_active_ticket = this; this.el = new Gtk.CellRendererText(); // my vars (dec) @@ -844,7 +1011,7 @@ public class Clones : Object } - public class Xcls_tv_last_updated : Object + public class Xcls_tv_current_branch : Object { public Gtk.TreeViewColumn el; private Clones _this; @@ -853,33 +1020,30 @@ public class Clones : Object // my vars (def) // ctor - public Xcls_tv_last_updated(Clones _owner ) + public Xcls_tv_current_branch(Clones _owner ) { _this = _owner; - _this.tv_last_updated = this; + _this.tv_current_branch = this; this.el = new Gtk.TreeViewColumn(); // my vars (dec) // set gobject values - this.el.title = "Last updated"; + this.el.title = "Current Branch"; this.el.min_width = 50; - var child_0 = new Xcls_cr_last_updated( _this ); + 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', 3 ); - - } + 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 } - public class Xcls_cr_last_updated : Object + public class Xcls_cr_current_branch : Object { public Gtk.CellRendererText el; private Clones _this; @@ -888,10 +1052,10 @@ public class Clones : Object // my vars (def) // ctor - public Xcls_cr_last_updated(Clones _owner ) + public Xcls_cr_current_branch(Clones _owner ) { _this = _owner; - _this.cr_last_updated = this; + _this.cr_current_branch = this; this.el = new Gtk.CellRendererText(); // my vars (dec) @@ -903,7 +1067,7 @@ public class Clones : Object } - public class Xcls_tv_all_branches : Object + public class Xcls_tv_last_updated : Object { public Gtk.TreeViewColumn el; private Clones _this; @@ -912,34 +1076,29 @@ public class Clones : Object // my vars (def) // ctor - public Xcls_tv_all_branches(Clones _owner ) + public Xcls_tv_last_updated(Clones _owner ) { _this = _owner; - _this.tv_all_branches = this; + _this.tv_last_updated = this; this.el = new Gtk.TreeViewColumn(); // my vars (dec) // set gobject values - this.el.title = "All Branches"; + this.el.title = "Last updated"; this.el.min_width = 50; - this.el.resizable = false; - var child_0 = new Xcls_cr_all_branches( _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', 2 ); - - } + this.el.add_attribute(_this.cr_last_updated.el , "markup", 3 ); } // user defined functions } - public class Xcls_cr_all_branches : Object + public class Xcls_cr_last_updated : Object { public Gtk.CellRendererText el; private Clones _this; @@ -948,10 +1107,10 @@ public class Clones : Object // my vars (def) // ctor - public Xcls_cr_all_branches(Clones _owner ) + public Xcls_cr_last_updated(Clones _owner ) { _this = _owner; - _this.cr_all_branches = this; + _this.cr_last_updated = this; this.el = new Gtk.CellRendererText(); // my vars (dec) @@ -963,43 +1122,52 @@ public class Clones : Object } - - public class Xcls_TreeView24 : Object + public class Xcls_tv_all_branches : Object { - public Gtk.TreeView el; + public Gtk.TreeViewColumn el; private Clones _this; // my vars (def) // ctor - public Xcls_TreeView24(Clones _owner ) + public Xcls_tv_all_branches(Clones _owner ) { _this = _owner; - this.el = new Gtk.TreeView(); + _this.tv_all_branches = this; + this.el = new Gtk.TreeViewColumn(); // my vars (dec) // set gobject values - var child_0 = new Xcls_ListStore25( _this ); + this.el.title = "All Branches"; + this.el.min_width = 50; + this.el.resizable = false; + var child_0 = new Xcls_cr_all_branches( _this ); child_0.ref(); + this.el.pack_start ( child_0.el , false ); + + // init method + + this.el.add_attribute(_this.cr_all_branches.el , "markup", 2 ); } // user defined functions } - public class Xcls_ListStore25 : Object + public class Xcls_cr_all_branches : Object { - public Gtk.ListStore el; + public Gtk.CellRendererText el; private Clones _this; // my vars (def) // ctor - public Xcls_ListStore25(Clones _owner ) + public Xcls_cr_all_branches(Clones _owner ) { _this = _owner; - this.el = new Gtk.ListStore( 0, null ); + _this.cr_all_branches = this; + this.el = new Gtk.CellRendererText(); // my vars (dec) @@ -1012,6 +1180,7 @@ public class Clones : Object + public class Xcls_ok_button : Object { public Gtk.Button el; @@ -1030,6 +1199,7 @@ public class Clones : Object // my vars (dec) // set gobject values + this.el.expand = false; this.el.label = "Close"; }