X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=StatusIcon.vala;h=f429e1a9aea610e0d707c716ac6b3b983ff02f8b;hp=a4f5cfdd88e70f5b040835ae41c13c2b68067987;hb=72a4edfbda67d0bf3eb93a91c28c4084945ddae5;hpb=ac5ce8f17de76f45659ab9b36108028fdf14fa0b diff --git a/StatusIcon.vala b/StatusIcon.vala index a4f5cfdd..f429e1a9 100644 --- a/StatusIcon.vala +++ b/StatusIcon.vala @@ -39,7 +39,8 @@ public class StatusIconA : StatusIcon { public bool paused = false; public static StatusIconA statusicon; - + + public StatusIconA() { statusicon = this; @@ -52,11 +53,11 @@ public class StatusIconA : StatusIcon { this.set_name("gitlive"); this.set_visible(true); - var menu = new MenuA(); + 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) { @@ -82,9 +83,10 @@ public class StatusIconA : StatusIcon { }); 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(); @@ -156,31 +158,86 @@ public class StatusIconA : StatusIcon { } - class MenuA : Gtk.Menu + 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 MenuItemNewTicket()); + 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_master_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 { + + 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, null); + // show merge dialog.. + }); + + } + + } - class ImageMenuItemA : ImageMenuItem { + + class MenuItemPause : ImageMenuItem { - public ImageMenuItemA() + public MenuItemPause() { //this.set_from_stock( Gtk.Stock.MEDIA_PAUSE ); @@ -206,9 +263,9 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemB : ImageMenuItem { + class MenuItemStartCommits : ImageMenuItem { - public ImageMenuItemB() + public MenuItemStartCommits() { var image = new Gtk.Image(); @@ -234,9 +291,9 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemC : ImageMenuItem { + class MenuItemPullAll : ImageMenuItem { - public ImageMenuItemC() + public MenuItemPullAll() { var image = new Gtk.Image(); @@ -302,7 +359,8 @@ public class StatusIconA : StatusIcon { 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 ); @@ -312,7 +370,7 @@ public class StatusIconA : StatusIcon { //this.ref(); statusicon.set_tooltip_text("pull: " + repo.name); - + repo.pull_async(this.pullAllCallback); // do not care if it's already in sycn.. @@ -325,28 +383,39 @@ public class StatusIconA : StatusIcon { } uint total = 0; - + uint has_error = 0; + string pull_all_error_message = ""; - void pullAllCallback(GitRepo repo, string res) + 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) ) { - - - ret_str += ret_str.length > 0 ? "\n" : ""; - ret_str += "Updated: " +repo.name + "\n" + res +"\n"; - } - if (this.total < 1) { - var notification = new Notify.Notification( + var notification = new Notify.Notification( "Pull completed ", - ret_str, + "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(); @@ -358,14 +427,14 @@ public class StatusIconA : StatusIcon { } - 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; @@ -378,9 +447,9 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemE : ImageMenuItem { + class MenuItemManageClones : ImageMenuItem { - public ImageMenuItemE() + public MenuItemManageClones() { var image = new Gtk.Image(); @@ -391,16 +460,42 @@ public class StatusIconA : StatusIcon { this.accel_group = null; this.activate.connect( () => { - //var ret = imports.Clones.Clones.show(); + GitRepo.updateAll("show_clones"); + + // Clones.singleton().show(); + }); + } + + + } + + class MenuItemNewTicket : ImageMenuItem { + + public MenuItemNewTicket() + { + + var image = new Gtk.Image(); + image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU ); + this.set_image (image); + this.label= "New Ticket"; + this.always_show_image = true; + this.accel_group = null; + + this.activate.connect( () => { + Ticket.singleton().show(null); + + + // Clones.singleton().show(); }); } } - class ImageMenuItemF : ImageMenuItem { + + class MenuItemAbout : ImageMenuItem { - public ImageMenuItemF() + public MenuItemAbout() { var image = new Gtk.Image(); @@ -428,9 +523,9 @@ public class StatusIconA : StatusIcon { } - class ImageMenuItemG : ImageMenuItem { + class MenuItemQuit : ImageMenuItem { - public ImageMenuItemG() + public MenuItemQuit() { var image = new Gtk.Image();