*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <stdio.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "common/sylpheed.h"
#include "folder.h"
#include "mainwindow.h"
#include "gtkutils.h"
-#include "intl.h"
#include "menu.h"
#include "toolbar.h"
#include "prefs_common.h"
#include "main.h"
#include "alertpanel.h"
+#include "gtk/manage_window.h"
#include "eggtrayicon.h"
+#include "newmarkedmail.xpm"
+#include "unreadmarkedmail.xpm"
#include "newmail.xpm"
#include "unreadmail.xpm"
#include "nomail.xpm"
static GdkPixmap *newmail_bitmap;
static GdkPixmap *unreadmail_pixmap;
static GdkPixmap *unreadmail_bitmap;
+static GdkPixmap *newmarkedmail_pixmap;
+static GdkPixmap *newmarkedmail_bitmap;
+static GdkPixmap *unreadmarkedmail_pixmap;
+static GdkPixmap *unreadmarkedmail_bitmap;
static GdkPixmap *nomail_pixmap;
static GdkPixmap *nomail_bitmap;
typedef enum
{
TRAYICON_NEW,
+ TRAYICON_NEWMARKED,
TRAYICON_UNREAD,
TRAYICON_UNREADMARKED,
- TRAYICON_NOTHING,
+ TRAYICON_NOTHING
} TrayIconType;
static void trayicon_get_cb (gpointer data, guint action, GtkWidget *widget);
static GtkItemFactoryEntry trayicon_popup_menu_entries[] =
{
{N_("/_Get"), NULL, trayicon_get_cb, 0, NULL},
- {N_("/_Get _All"), NULL, trayicon_get_all_cb, 0, NULL},
+ {N_("/Get _All"), NULL, trayicon_get_all_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Email"), NULL, trayicon_compose_cb, 0, NULL},
{N_("/Open A_ddressbook"), NULL, trayicon_addressbook_cb, 0, NULL},
{
GdkPixmap *pixmap = NULL;
GdkBitmap *bitmap = NULL;
+ static GdkPixmap *last_pixmap = NULL;
switch(icontype) {
case TRAYICON_NEW:
pixmap = newmail_pixmap;
bitmap = newmail_bitmap;
break;
+ case TRAYICON_NEWMARKED:
+ pixmap = newmarkedmail_pixmap;
+ bitmap = newmarkedmail_bitmap;
+ break;
case TRAYICON_UNREAD:
- case TRAYICON_UNREADMARKED:
pixmap = unreadmail_pixmap;
bitmap = unreadmail_bitmap;
break;
+ case TRAYICON_UNREADMARKED:
+ pixmap = unreadmarkedmail_pixmap;
+ bitmap = unreadmarkedmail_bitmap;
+ break;
default:
pixmap = nomail_pixmap;
bitmap = nomail_bitmap;
break;
}
+ if (pixmap == last_pixmap)
+ return;
+
gtk_image_set_from_pixmap(GTK_IMAGE(image), pixmap, bitmap);
- gtk_widget_shape_combine_mask(GTK_WIDGET(trayicon), bitmap, GTK_WIDGET(image)->allocation.x, GTK_WIDGET(image)->allocation.y);
+ last_pixmap = pixmap;
}
static void update(void)
{
- gint new, unread, unreadmarked, total;
+ guint new, unread, unreadmarked, marked, total;
gchar *buf;
+ TrayIconType icontype = TRAYICON_NOTHING;
- folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
- buf = g_strdup_printf("New %d, Unread: %d, Total: %d", new, unread, total);
+ folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total);
+ buf = g_strdup_printf(_("New %d, Unread: %d, Total: %d"), new, unread, total);
gtk_tooltips_set_tip(tooltips, eventbox, buf, "");
g_free(buf);
-
- set_trayicon_pixmap(new > 0 ? TRAYICON_NEW : (unread > 0 ? TRAYICON_UNREAD : TRAYICON_NOTHING));
+
+ if (new > 0 && unreadmarked > 0)
+ icontype = TRAYICON_NEWMARKED;
+ else if (new > 0)
+ icontype = TRAYICON_NEW;
+ else if (unreadmarked > 0)
+ icontype = TRAYICON_UNREADMARKED;
+ else if (unread > 0)
+ icontype = TRAYICON_UNREAD;
+
+ set_trayicon_pixmap(icontype);
}
static gboolean folder_item_update_hook(gpointer source, gpointer data)
PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap, nomail_bitmap, nomail_xpm);
PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap, unreadmail_bitmap, unreadmail_xpm);
PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap, newmail_bitmap, newmail_xpm);
+ PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmarkedmail_pixmap, unreadmarkedmail_bitmap, unreadmarkedmail_xpm);
+ PIXMAP_CREATE(GTK_WIDGET(trayicon), newmarkedmail_pixmap, newmarkedmail_bitmap, newmarkedmail_xpm);
eventbox = gtk_event_box_new();
gtk_container_set_border_width(GTK_CONTAINER(eventbox), 0);
{
if (prefs_common.confirm_on_exit) {
if (alertpanel(_("Exit"), _("Exit this program?"),
- _("OK"), _("Cancel"), NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL) != G_ALERTDEFAULT)
return;
manage_window_focus_in(mainwin->window, NULL, NULL);
}