X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=3a187ecb015e3c2aa317ba0ce5246ff7da1f962c;hp=17b003824e3a8a31571561eba9e145f37281d880;hb=9e641e366549656621a3e4fc4950b62c4b395650;hpb=82f71e40436c8c3a9b50b40c62d2ad7d468cb35c diff --git a/Clones.vala b/Clones.vala index 17b00382..3a187ecb 100644 --- a/Clones.vala +++ b/Clones.vala @@ -18,15 +18,18 @@ public class Clones : Object 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; 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) @@ -42,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) => { @@ -69,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 ,0); + 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(); @@ -134,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 ); @@ -170,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( () => { @@ -239,9 +248,14 @@ public class Clones : Object // set gobject values this.el.label = "Branches"; + this.el.visible = false; //listeners this.el.clicked.connect( () => { + // + + //NewBranch.singleton().show(); + /* var rv = this.get('/reposView'); var rs = this.get('/reposStore'); @@ -311,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(); + + }); } @@ -378,6 +375,7 @@ public class Clones : Object // set gobject values this.el.label = "Switch Branch"; + this.el.visible = false; //listeners this.el.clicked.connect( () => { @@ -479,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 ); @@ -488,18 +489,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 @@ -515,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 /* @@ -560,14 +590,16 @@ public class Clones : Object { _this = _owner; _this.reposStore = this; - this.el = new Gtk.ListStore( 8, 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) @@ -589,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(); @@ -615,23 +648,31 @@ public class Clones : Object // 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 ); + 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'; + 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; + + 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); @@ -692,21 +733,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); + + + + }); } @@ -768,18 +814,103 @@ 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,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); - */ + + 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); + + + + }); } @@ -845,6 +976,61 @@ public class Clones : Object } + public class Xcls_tv_active_ticket : Object + { + public Gtk.TreeViewColumn el; + private Clones _this; + + + // my vars (def) + + // ctor + public Xcls_tv_active_ticket(Clones _owner ) + { + _this = _owner; + _this.tv_active_ticket = this; + this.el = new Gtk.TreeViewColumn(); + + // my vars (dec) + + // set gobject values + this.el.title = "Active Ticket"; + this.el.min_width = 50; + var child_0 = new Xcls_cr_active_ticket( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , false ); + + // init method + + this.el.add_attribute(_this.cr_active_ticket.el , "markup", 9 ); + } + + // user defined functions + } + public class Xcls_cr_active_ticket : Object + { + public Gtk.CellRendererText el; + private Clones _this; + + + // my vars (def) + + // ctor + public Xcls_cr_active_ticket(Clones _owner ) + { + _this = _owner; + _this.cr_active_ticket = this; + this.el = new Gtk.CellRendererText(); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_tv_current_branch : Object { public Gtk.TreeViewColumn el; @@ -1015,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 - } - }