diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.ja | 7 | ||||
| -rw-r--r-- | src/icons/Makefile.am | 2 | ||||
| -rw-r--r-- | src/icons/stock_sylpheed_16.png | bin | 0 -> 690 bytes | |||
| -rw-r--r-- | src/stock_pixmap.c | 4 | ||||
| -rw-r--r-- | src/stock_pixmap.h | 3 | ||||
| -rw-r--r-- | src/trayicon.c | 4 |
7 files changed, 25 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2006-09-28 + * src/trayicon.c: use 16x16 icon for Windows system tray. + * src/icons/stock_sylpheed_16.png + src/icons/Makefile.am + src/stock_pixmap.[ch]: added 16x16 Sylpheed icon. + +2006-09-28 + * src/trayicon.c: some code cleanups. 2006-09-27 diff --git a/ChangeLog.ja b/ChangeLog.ja index 9fbc0abd..279fe54c 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,12 @@ 2006-09-28 + * src/trayicon.c: Windows のシステムトレイに16x16のアイコンを使用。 + * src/icons/stock_sylpheed_16.png + src/icons/Makefile.am + src/stock_pixmap.[ch]: 16x16の Sylpheed のアイコンを追加。 + +2006-09-28 + * src/trayicon.c: コードの整理。 2006-09-27 diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am index e18cf8a8..eb59ea85 100644 --- a/src/icons/Makefile.am +++ b/src/icons/Makefile.am @@ -19,6 +19,7 @@ BUILT_SOURCES = \ stock_outbox.h \ stock_spam.h \ stock_sylpheed.h \ + stock_sylpheed_16.h \ sylpheed-logo.h EXTRA_DIST = \ @@ -42,6 +43,7 @@ EXTRA_DIST = \ stock_outbox.png \ stock_spam.png \ stock_sylpheed.png \ + stock_sylpheed_16.png \ sylpheed-logo.png \ clip.xpm \ deleted.xpm \ diff --git a/src/icons/stock_sylpheed_16.png b/src/icons/stock_sylpheed_16.png Binary files differnew file mode 100644 index 00000000..8b02fee2 --- /dev/null +++ b/src/icons/stock_sylpheed_16.png diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index 654f4af8..8fbe92c3 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -71,6 +71,7 @@ #include "icons/stock_spam.h" #include "icons/stock_hand-signed.h" #include "icons/stock_sylpheed.h" +#include "icons/stock_sylpheed_16.h" #include "icons/sylpheed-logo.h" typedef struct _StockPixmapData StockPixmapData; @@ -135,6 +136,7 @@ static StockPixmapData pixmaps[] = {NULL, NULL, NULL, NULL, stock_spam, sizeof(stock_spam), "stock_spam", 24}, {NULL, NULL, NULL, NULL, stock_hand_signed, sizeof(stock_hand_signed), "stock_hand-signed", 24}, {NULL, NULL, NULL, NULL, stock_sylpheed, sizeof(stock_sylpheed), NULL, 0}, + {NULL, NULL, NULL, NULL, stock_sylpheed_16, sizeof(stock_sylpheed_16), NULL, 0}, {NULL, NULL, NULL, NULL, sylpheed_logo, sizeof(sylpheed_logo), NULL, 0}, }; diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h index f6eae939..27e73011 100644 --- a/src/stock_pixmap.h +++ b/src/stock_pixmap.h @@ -1,6 +1,6 @@ /* * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2005 Hiroyuki Yamamoto + * Copyright (C) 1999-2006 Hiroyuki Yamamoto * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -71,6 +71,7 @@ typedef enum STOCK_PIXMAP_SPAM, STOCK_PIXMAP_SIGN, STOCK_PIXMAP_SYLPHEED, + STOCK_PIXMAP_SYLPHEED_SMALL, STOCK_PIXMAP_SYLPHEED_LOGO, N_STOCK_PIXMAPS diff --git a/src/trayicon.c b/src/trayicon.c index 57eb7ab9..35a20083 100644 --- a/src/trayicon.c +++ b/src/trayicon.c @@ -100,7 +100,11 @@ TrayIcon *trayicon_create(MainWindow *mainwin) #if GTK_CHECK_VERSION(2, 10, 0) GdkPixbuf *pixbuf; +#ifdef G_OS_WIN32 + stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_SMALL, &pixbuf); +#else stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED, &pixbuf); +#endif trayicon.status_icon = gtk_status_icon_new_from_pixbuf(pixbuf); g_signal_connect(G_OBJECT(trayicon.status_icon), "activate", |
