X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=StatusIcon.vala;h=d6b34d18ac88807d053aa26b91c38e383673dcb0;hp=efedebaa34e8fc32f788e31b7954c738cbf1fe2a;hb=1b65514c93e260c86b738acbb13cf8ec2a39d596;hpb=9e641e366549656621a3e4fc4950b62c4b395650 diff --git a/StatusIcon.vala b/StatusIcon.vala index efedebaa..d6b34d18 100644 --- a/StatusIcon.vala +++ b/StatusIcon.vala @@ -180,6 +180,7 @@ public class StatusIconA : StatusIcon { 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(); @@ -195,7 +196,7 @@ public class StatusIconA : StatusIcon { } 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()) { + if (r.is_master_branch()) { continue; } GLib.debug("checking for activeTicket"); @@ -296,7 +297,7 @@ public class StatusIconA : StatusIcon { { var image = new Gtk.Image(); - image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU ); + image.set_from_stock(Gtk.Stock.GOTO_BOTTOM,Gtk.IconSize.MENU ); this.set_image (image); this.label= "Pull (Refresh) All"; this.always_show_image = true; @@ -412,7 +413,7 @@ public class StatusIconA : StatusIcon { GitMonitor.gitmonitor.pauseError(this.pull_all_error_message); return; } - + statusicon.set_tooltip_text("Gitlive"); GitMonitor.gitmonitor.start(); @@ -452,14 +453,38 @@ public class StatusIconA : StatusIcon { { var image = new Gtk.Image(); - image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU ); + image.set_from_stock(Gtk.Stock.JUSTIFY_FILL,Gtk.IconSize.MENU ); this.set_image (image); this.label= "Manage Clones"; this.always_show_image = true; this.accel_group = null; this.activate.connect( () => { - GitRepo.updateAll("show_clones"); + //GitRepo.updateAll("show_clones"); + Clones.singleton().loadAndShow(); + + // Clones.singleton().show(); + }); + } + + + } + + class MenuItemNewTicket : ImageMenuItem { + + public MenuItemNewTicket() + { + + var image = new Gtk.Image(); + image.set_from_stock(Gtk.Stock.NEW,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(); }); @@ -468,6 +493,7 @@ public class StatusIconA : StatusIcon { } + class MenuItemAbout : ImageMenuItem { public MenuItemAbout()