X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=StatusIcon.vala;h=137d750427af53fd9bf89f2acf8d061d46c79872;hp=fe05b39ef0e513da446c7285688f78034105675e;hb=2a6a46caf4f1d149a8e72cb0fb0c90f9923a27bb;hpb=5dc17b617d1782972952d5f9c4cc1ba7faea19c8 diff --git a/StatusIcon.vala b/StatusIcon.vala index fe05b39e..137d7504 100644 --- a/StatusIcon.vala +++ b/StatusIcon.vala @@ -18,7 +18,7 @@ using Gtk; - +/* static int main (string[] args) { // A reference to our file @@ -30,16 +30,17 @@ static int main (string[] args) { } - + */ //public StatusIconA statusicon; public class StatusIconA : StatusIcon { - bool paused = false; - static StatusIconA statusicon; - + public bool paused = false; + public static StatusIconA statusicon; + + public StatusIconA() { statusicon = this; @@ -47,18 +48,45 @@ public class StatusIconA : StatusIcon { //title : 'gitlive', this.stock = Gtk.Stock.REFRESH; this.tooltip_text = "GitLive"; - this.title = "vgitlive"; + this.title = "gitlive"; - this.set_name("vgitlive"); + this.set_name("gitlive"); this.set_visible(true); - var menu = new MenuA(); - - - this.activate.connect( () =>{ + var menu = new GitliveMenu(); + menu.ref(); + this.button_press_event.connect( ( ev ) =>{ + print("button press event called\n"); + menu.updateMerges(); + menu.show_all(); + if (this.paused) { + menu.resume.show(); + menu.pause.hide(); + } else { + menu.resume.hide(); + menu.pause.show(); + } + // public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, + // [CCode (scope = "async")] Gtk.MenuPositionFunc? func, uint button, uint32 activate_time); + //Gtk.get_current_event_device () + menu.popup( + + null, null, + this.position_menu, + + ev.button, ev.time // time + ); + + return true; + + }); + this.popup_menu.connect( ( button, time) =>{ + //this.button_press_event.connect( ( ) =>{ + //print(Array.prototype.slice.call(arguments).join(',')); - + print("menu activiate called\n"); + menu.updateMerges(); //var menu = this.get('menu'); menu.show_all(); @@ -70,17 +98,18 @@ public class StatusIconA : StatusIcon { menu.resume.hide(); menu.pause.show(); } - + // public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, + // [CCode (scope = "async")] Gtk.MenuPositionFunc? func, uint button, uint32 activate_time); //Gtk.get_current_event_device () menu.popup( - + null, null, - this.position_menu, 0, - Gtk.get_current_event_time() + this.position_menu, + + button, time // time ); - //var g = { }; //var a = new Gdk.Rectangle(); // needs direction=inout setting in gir to work (in bugzilla @present) @@ -89,36 +118,125 @@ public class StatusIconA : StatusIcon { // should check to see if @ top or bottom I guess.. //menu.el.get_toplevel().move(a.x, a.y +a.height); //menu.el.get_toplevel().move(10,10); + //return false; }); } - class MenuA : Gtk.Menu + public void pause() + { + this.set_from_stock( Gtk.Stock.MEDIA_PAUSE ); + this.paused = true; + } + + public void resume() + { + this.set_from_stock( Gtk.Stock.MEDIA_PLAY ); + this.paused = false; + } + + public void refreshing() + { + this.set_from_stock( Gtk.Stock.REFRESH ); + } + + public void pauseError() + { + this.paused = true; + var flag = true; + Timeout.add_full(Priority.LOW, 500, () => { + + if (!this.paused) { + return false; + } + this.set_from_stock( flag == true ? Gtk.Stock.MEDIA_RECORD + : Gtk.Stock.MEDIA_PAUSE); + flag = !flag; + return true; + }); + + } + + class GitliveMenu : Gtk.Menu { public ImageMenuItem pause; public ImageMenuItem resume; + public Gtk.MenuItem before_seperator; + public Gtk.MenuItem after_seperator; + - public MenuA() + public GitliveMenu() { - this.pause = new ImageMenuItemA(); + this.pause = new MenuItemPause(); this.append(this.pause); - this.resume = new ImageMenuItemB(); + this.resume = new MenuItemStartCommits(); this.append(this.resume); - this.append(new ImageMenuItemC()); - this.append(new ImageMenuItemD()); - this.append(new ImageMenuItemE()); - this.append(new ImageMenuItemF()); - this.append(new ImageMenuItemG()); - - - + this.append(new MenuItemPullAll()); + this.before_seperator = new Gtk.SeparatorMenuItem(); + this.append(this.before_seperator); + + this.after_seperator = new Gtk.SeparatorMenuItem(); + this.append(this.after_seperator); + //this.append(new MenuItemUpdateTimesheet()); + this.append(new MenuItemManageClones()); + this.append(new MenuItemAbout()); + this.append(new MenuItemQuit()); + this.merge_items = new Gee.ArrayList(); + } + public Gee.ArrayList merge_items; + + + public void updateMerges() + { + // show a list of possible merges on the menu. + foreach (var m in this.merge_items) { + this.remove(m); + } + foreach(var r in GitRepo.singleton().cache.values ) { + GLib.debug("checking %s for branch = %s", r.name, r.currentBranch.name); + if (!r.is_wip_branch()) { + continue; + } + GLib.debug("checking for activeTicket"); + var t = r.activeTicket; + if (t == null) { + continue; + } + var mi = new MergeMenuItem(r,t); + this.insert (mi,4); //backwards. + this.merge_items.add(mi); + + } + } + + class MergeMenuItem : Gtk.MenuItem { - class ImageMenuItemA : ImageMenuItem { + GitRepo repo; + RooTicket ticket; + + public MergeMenuItem(GitRepo r, RooTicket t) + { + this.repo = r; + this.ticket = t; + + this.label = ("Merge [%s] #%s %s".printf(r.name, t.id , t.summary)); + + this.activate.connect(() => { + MergeBranch.singleton().show(this.ticket); + // show merge dialog.. + }); + + } + + } + + + class MenuItemPause : ImageMenuItem { - public ImageMenuItemA() + public MenuItemPause() { //this.set_from_stock( Gtk.Stock.MEDIA_PAUSE ); @@ -132,8 +250,8 @@ public class StatusIconA : StatusIcon { this.activate.connect( () => { statusicon.paused = true; - - //GitMonitor.GitMonitor.stop(); + GitMonitor.gitmonitor.stop(); + // this.el.label = status ? 'Resume' : 'Pause'; statusicon.set_from_stock( Gtk.Stock.MEDIA_PAUSE ); @@ -144,20 +262,20 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemB : ImageMenuItem { + class MenuItemStartCommits : ImageMenuItem { - public ImageMenuItemB() + public MenuItemStartCommits() { var image = new Gtk.Image(); image.set_from_stock(Gtk.Stock.MEDIA_PLAY,Gtk.IconSize.MENU ); - this.set_image (image); + this.set_image (image); this.label= "Start Commits"; this.always_show_image = true; this.accel_group = null; this.activate.connect( () => { - //GitMonitor.GitMonitor.start(); + GitMonitor.gitmonitor.start(); statusicon.paused = false; // @@ -171,78 +289,151 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemC : ImageMenuItem { + + class MenuItemPullAll : ImageMenuItem { - public ImageMenuItemC() + public MenuItemPullAll() { var image = new Gtk.Image(); image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU ); - this.set_image (image); + this.set_image (image); this.label= "Pull (Refresh) All"; this.always_show_image = true; this.accel_group = null; this.activate.connect( () => { + + this.pullAll(); /* - imports.GitMonitor.GitMonitor.stop(); - - - var tr = imports.Scm.Repo.Repo.list(); - for (var i= 0; i< tr.length;i++) { - this.parent.parent.el.set_from_stock( i%2 ? Gtk.STOCK_FULLSCREEN : Gtk.STOCK_LEAVE_FULLSCREEN ); + GitMonitor.gitmonitor.stop(); + var tr = GitRepo.list(); + + + + for (var i= 0; i< tr.length;i++) { + statusicon.set_from_stock( + i%2 == 0 ? Gtk.Stock.FULLSCREEN : Gtk.Stock.LEAVE_FULLSCREEN ); - var repo = tr[i]; - if (!repo.autocommit()) { - //??? should we ignore ones not on autocommit.. - continue; - } - try { - this.parent.parent.el.set_tooltip_text("pull: " + repo.name); - - var str = repo.pull(); + var repo = tr.index(i); + //if (!repo.autocommit()) { + //??? should we ignore ones not on autocommit.. + // continue; + //} + try { + statusicon.set_tooltip_text("pull: " + repo.name); + var str = repo.pull(); // do not care if it's already in sycn.. - if (str.match(/Already up-to-date/)) { - continue; - } - var notification = new Notify.Notification({ - summary: "Updated " + repo.name, - body : str - }); - notification.set_timeout(20); - notification.show(); - - } catch(e) { - this.parent.parent.el.set_from_stock( Gtk.STOCK_MEDIA_RECORD ); - print(JSON.stringify(e)); - print("notification or push errror- probably to many in queue.."); - imports.gitlive.errorDialog(e.message); - - } + if (Regex.match_simple ("Already up-to-date", str) ) { + continue; } - this.parent.parent.el.set_tooltip_text(this.parent.parent.tooltip_text); - + var notification = new Notify.Notification( + "Updated " + repo.name, + str, + "dialog-information" + + ); + + notification.set_timeout(20); + notification.show(); + + } catch(Error e) { + print("notification or push errror- probably to many in queue.."); + statusicon.set_from_stock( Gtk.Stock.MEDIA_RECORD ); + print(e.message); - - - imports.GitMonitor.GitMonitor.start(); - + } + + } */ + + }); } - + void pullAll() + { + var tr = GitRepo.list(); + + GitMonitor.gitmonitor.stop(); + + + this.total = tr.length; + this.has_error = 0; + this.pull_all_error_message = ""; + for (var i= 0; i< tr.length;i++) { + statusicon.set_from_stock( + i%2 == 0 ? Gtk.Stock.FULLSCREEN : Gtk.Stock.LEAVE_FULLSCREEN ); + + var repo = tr.index(i); + //repo.ref(); + //this.ref(); + + statusicon.set_tooltip_text("pull: " + repo.name); + + repo.pull_async(this.pullAllCallback); + // do not care if it's already in sycn.. + + + + } + + + + + } + uint total = 0; + uint has_error = 0; + string pull_all_error_message = ""; + + void pullAllCallback(GitRepo repo, int err, string res) + { + this.total--; + + if (err > 0) { + this.has_error = 1; + this.pull_all_error_message += this.pull_all_error_message.length > 0 ? "\n" : ""; + this.pull_all_error_message += "Error Pulling " + repo.name +"\n" + res; + } + + if (!Regex.match_simple ("Already up-to-date", res) ) { + var notification = new Notify.Notification( + "Pull completed ", + "Updated: " +repo.name + "\n" + res +"\n", + "dialog-information" + ); + notification.set_timeout(20); + notification.show(); + + + + } + if (this.total < 1) { + if (this.has_error > 0) { + GitMonitor.gitmonitor.pauseError(this.pull_all_error_message); + return; + } + + statusicon.set_tooltip_text("Gitlive"); + + GitMonitor.gitmonitor.start(); + //this.unref(); + //repo.unref(); + } + + } + } - class ImageMenuItemD : ImageMenuItem { + class MenuItemUpdateTimesheet : ImageMenuItem { - public ImageMenuItemD() + public MenuItemUpdateTimesheet() { var image = new Gtk.Image(); image.set_from_stock(Gtk.Stock.SAVE,Gtk.IconSize.MENU ); - this.set_image (image); + this.set_image (image); this.label= "Update Timesheet"; this.always_show_image = true; this.accel_group = null; @@ -255,34 +446,34 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemE : ImageMenuItem { + class MenuItemManageClones : ImageMenuItem { - public ImageMenuItemE() + public MenuItemManageClones() { var image = new Gtk.Image(); image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU ); - this.set_image (image); + this.set_image (image); this.label= "Manage Clones"; this.always_show_image = true; this.accel_group = null; this.activate.connect( () => { - //var ret = imports.Clones.Clones.show(); + Clones.singleton().show(); }); } } - class ImageMenuItemF : ImageMenuItem { + class MenuItemAbout : ImageMenuItem { - public ImageMenuItemF() + public MenuItemAbout() { var image = new Gtk.Image(); image.set_from_stock(Gtk.Stock.ABOUT,Gtk.IconSize.MENU ); - this.set_image (image); + this.set_image (image); this.label= "About Gitlive"; this.always_show_image = true; this.accel_group = null; @@ -305,9 +496,9 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemG : ImageMenuItem { + class MenuItemQuit : ImageMenuItem { - public ImageMenuItemG() + public MenuItemQuit() { var image = new Gtk.Image();