X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=3a91a661c305416d9038bfca049d50865b050220;hp=3a41f458950cc7db2dd9251c932979390c8735b5;hb=2a6a46caf4f1d149a8e72cb0fb0c90f9923a27bb;hpb=0227dbeb602a64e67f0afcbb2e162cd98eb4ad18 diff --git a/Clones.vala b/Clones.vala index 3a41f458..3a91a661 100644 --- a/Clones.vala +++ b/Clones.vala @@ -2,7 +2,7 @@ static Clones _Clones; public class Clones : Object { - public Gtk.Popover el; + public Gtk.Dialog el; private Clones _this; public static Clones singleton() @@ -34,37 +34,61 @@ public class Clones : Object public Clones() { _this = this; - this.el = new Gtk.Popover( null ); + this.el = new Gtk.Dialog(); // my vars (dec) // set gobject values + this.el.title = "Manage Clones"; this.el.border_width = 3; + this.el.default_height = 500; + this.el.default_width = 800; + this.el.deletable = true; this.el.modal = true; var child_0 = new Xcls_Box2( _this ); child_0.ref(); - this.el.add ( child_0.el ); + this.el.get_content_area().add ( child_0.el ); + var child_1 = new Xcls_ok_button( _this ); + child_1.ref(); + this.el.add_action_widget ( child_1.el , 1 ); + + //listeners + this.el.delete_event.connect( (self, event) => { + this.el.hide(); + return true; + //test + }); + this.el.response.connect( (self, response_id) => { + + this.el.hide(); + + }); } // user defined functions - public void show (Gtk.Widget menuitem) { + public void show () { - - this.el.set_relative_to( null ); - - - //console.log('show all'); - this.el.set_modal(true); - - - this.el.set_position(Gtk.PositionType.BOTTOM); - // this.el.popup(); - // window + header? - this.el.show_all(); - this.el.set_size_request(800,500); - - //this.view.el.grab_focus(); + 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(); + + //this.get('/ok_button').el.set_sensitive(false); + + // block until we return. + // var run_ret = this.el.run(); + // if (run_ret < 1 ) { + // return "DONE"; + // } + // print("RUN RETURN : " + run_ret); + // return "DONE"; + //print(JSON.stringify(this.get('bug').getValue())); + // return this.get('bug').getValue(); + //this.success = c.success; } public class Xcls_Box2 : Object { @@ -88,10 +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.add ( child_1.el ); - var child_2 = new Xcls_ok_button( _this ); - child_2.ref(); - this.el.add ( child_2.el ); + this.el.pack_end ( child_1.el , true,true,0 ); } // user defined functions @@ -221,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'); @@ -424,6 +449,7 @@ public class Clones : Object // 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(); @@ -489,6 +515,7 @@ public class Clones : Object var description = new Pango.FontDescription(); description.set_size(10000); this.el.override_font(description); + } //listeners @@ -537,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 @@ -553,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 @@ -722,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(); @@ -929,6 +1018,7 @@ public class Clones : Object + public class Xcls_ok_button : Object { public Gtk.Button el; @@ -947,11 +1037,11 @@ public class Clones : Object // my vars (dec) // set gobject values + this.el.expand = false; this.el.label = "Close"; } // user defined functions } - }