X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=3a187ecb015e3c2aa317ba0ce5246ff7da1f962c;hp=d5e291839bf80b497081cde73c64987e7d400b6c;hb=9e641e366549656621a3e4fc4950b62c4b395650;hpb=1f7e6b712f9ee99d621a3a67f1c0795c6106bde6 diff --git a/Clones.vala b/Clones.vala index d5e29183..3a187ecb 100644 --- a/Clones.vala +++ b/Clones.vala @@ -30,7 +30,6 @@ public class Clones : Object 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) @@ -46,15 +45,12 @@ public class Clones : Object this.el.title = "Manage Clones"; this.el.border_width = 3; this.el.default_height = 500; - this.el.default_width = 800; + this.el.default_width = 1024; this.el.deletable = true; this.el.modal = true; 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 ); - child_1.ref(); - this.el.add_action_widget ( child_1.el , 1 ); //listeners this.el.delete_event.connect( (self, event) => { @@ -73,11 +69,19 @@ public class Clones : Object public void show () { - this.el.set_deletable(false); + this.el.set_deletable(true); this.el.set_gravity(Gdk.Gravity.NORTH); this.el.move((Gdk.Screen.width() / 2 ) -400 ,0); + + this.el.set_default_size( + int.min(1024,Gdk.Screen.width()), + int.max(500,Gdk.Screen.width() - 300) + ); + this.el.show_all(); _this.reposStore.load(); + this.el.set_keep_above(true); + this.el.run(); // load clones.. // this.get('/reposStore').load(); @@ -138,6 +142,7 @@ public class Clones : Object // my vars (dec) // set gobject values + this.el.homogeneous = true; var child_0 = new Xcls_Button4( _this ); child_0.ref(); this.el.add ( child_0.el ); @@ -174,7 +179,7 @@ public class Clones : Object // my vars (dec) // set gobject values - this.el.label = "Remotes / Clones"; + this.el.label = "Add Repository"; //listeners this.el.clicked.connect( () => { @@ -243,6 +248,7 @@ public class Clones : Object // set gobject values this.el.label = "Branches"; + this.el.visible = false; //listeners this.el.clicked.connect( () => { @@ -319,48 +325,31 @@ public class Clones : Object //listeners this.el.clicked.connect( () => { - /* - var rv = this.get('/reposView'); - var rs = this.get('/reposStore'); - if (rv.el.get_selection().count_selected_rows() != 1) { - //nothing? - // error condition. - return; - } - var Merger = imports.Merger.Merger; - - - var ret = {}; - var s = rv.el.get_selection(); - var path = ''; - s.selected_foreach(function(model,p,iter) { - - path = model.get_value(iter, 6).value.get_string(); - - }); - - var repo = false; - rs.repos.forEach(function(r) { - if (r.repopath == path) { - repo = r; - - } - - }); - Merger.repo = repo; - Merger.el.set_transient_for(Clones.el); - Clones.el.set_title("Manage Clones - " + repo.repopath); - Merger.show(); - Clones.el.set_title("Manage Clones"); - - - - + var rv = _this.reposView; + var rs = _this.reposStore; + var s =rv.el.get_selection(); + if (s.count_selected_rows() != 1) { + return; + } + Gtk.TreeIter iter; + Gtk.TreeModel tm; + s.get_selected(out tm, out iter); + GLib.Value val; + tm.get_value(iter, 6, out val); + var git_working_dir = (string)val; - - */ + var repo = GitRepo.singleton().get(git_working_dir); + // if you hit merge.... in master.. + // ignore.. + if (repo.currentBranch.name == "master") { + return; + } + MergeBranch.singleton().show(repo.activeTicket, repo); + _this.reposStore.load(); + + }); } @@ -386,6 +375,7 @@ public class Clones : Object // set gobject values this.el.label = "Switch Branch"; + this.el.visible = false; //listeners this.el.clicked.connect( () => { @@ -487,6 +477,9 @@ public class Clones : Object // my vars (dec) // set gobject values + this.el.search_column = 0; + this.el.activate_on_single_click = true; + this.el.enable_grid_lines = Gtk.TreeViewGridLines.HORIZONTAL; var child_0 = new Xcls_reposStore( _this ); child_0.ref(); this.el.set_model ( child_0.el ); @@ -529,6 +522,29 @@ public class Clones : Object } //listeners + this.el.row_activated.connect( (path, col) => { + GLib.debug("row activated: %s", col.title); + if (col.title != "Current Branch") { + return; + } + + // + + Gtk.TreeIter iter; + _this.reposStore.el.get_iter(out iter, path); + GLib.Value val; + _this.reposStore.el.get_value(iter, 6, out val); + var git_working_dir = (string)val; + + var repo = GitRepo.singleton().get(git_working_dir); + + Gdk.Rectangle rect; + _this.reposView.el.get_cell_area(path, col, out rect); + RepoStatusPopover.singleton().show(this.el, rect, repo); + + + + }); this.el.cursor_changed.connect( () => { // SEE SELECTION.CHANGED /* @@ -605,12 +621,13 @@ public class Clones : Object for(var i =0 ; i < tr.length; i++) { var repo = tr.index(i); - repo.loadBranches(); + // this is done before we display stuff... + //repo.loadBranches(); + //repo.loadStatus(); Gtk.TreeIter iter; this.el.append(out iter); - //print(JSON.stringify(ret,null,4)); //tr[i].getBranches(); //tr[i].getStatus(); @@ -636,17 +653,20 @@ public class Clones : Object var cb = repo.currentBranch; //print(JSON.stringify(cb,null,4)); var col = "#ffffff"; - /* + if (cb.lastrev != cb.remoterev) { - col = '#ff0000'; + col = "#f2dede"; + this.el.set_value( iter, 1, repo.currentBranch.name +"\nRemote != Local" ); } - if (tr[i].hasLocalChanges) { - col = '#0000ff'; + if (repo.has_local_changes) { + col = "#d9edf7"; + this.el.set_value( iter, 1, repo.currentBranch.name +"\nHas uncommitted changes" ); } - if ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) { - col = '#ff00ff'; + if ((cb.lastrev != cb.remoterev) && (repo.has_local_changes)) { + col = "#fcf8e3"; + this.el.set_value( iter, 1, repo.currentBranch.name +"\nRemote != Local\nHas uncommitted changes" ); } - */ + this.el.set_value(iter, 7, col ); var ticket = repo.activeTicket; @@ -1181,29 +1201,4 @@ public class Clones : Object - public class Xcls_ok_button : Object - { - public Gtk.Button el; - private Clones _this; - - - // my vars (def) - - // ctor - public Xcls_ok_button(Clones _owner ) - { - _this = _owner; - _this.ok_button = this; - this.el = new Gtk.Button(); - - // my vars (dec) - - // set gobject values - this.el.expand = false; - this.el.label = "Close"; - } - - // user defined functions - } - }