/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include "defs.h"
#include "utils.h"
#include "prefs_common.h"
+#include "pixmaps/addr_one.xpm"
+#include "pixmaps/addr_two.xpm"
#include "pixmaps/address.xpm"
+#include "pixmaps/anonymous.xpm"
#include "pixmaps/book.xpm"
#include "pixmaps/category.xpm"
#include "pixmaps/checkbox_off.xpm"
#include "pixmaps/complete.xpm"
#include "pixmaps/continue.xpm"
#include "pixmaps/deleted.xpm"
-#include "pixmaps/dir_close.xpm"
-#include "pixmaps/dir_open.xpm"
-#include "pixmaps/dir_open_hrm.xpm"
#include "pixmaps/error.xpm"
+#include "pixmaps/edit_extern.xpm"
#include "pixmaps/forwarded.xpm"
#include "pixmaps/group.xpm"
-#include "pixmaps/inbox.xpm"
-#include "pixmaps/inbox_hrm.xpm"
+#include "pixmaps/insert_file.xpm"
#include "pixmaps/interface.xpm"
#include "pixmaps/jpilot.xpm"
#include "pixmaps/key.xpm"
#include "pixmaps/mark.xpm"
#include "pixmaps/locked.xpm"
#include "pixmaps/new.xpm"
-#include "pixmaps/outbox.xpm"
-#include "pixmaps/outbox_hrm.xpm"
#include "pixmaps/replied.xpm"
#include "pixmaps/close.xpm"
#include "pixmaps/down_arrow.xpm"
#include "pixmaps/mail_reply_to_author.xpm"
#include "pixmaps/mail_send.xpm"
#include "pixmaps/mail_send_queue.xpm"
+#include "pixmaps/mail_sign.xpm"
+#include "pixmaps/open_mail.xpm"
#include "pixmaps/news_compose.xpm"
#include "pixmaps/paste.xpm"
#include "pixmaps/preferences.xpm"
#include "pixmaps/properties.xpm"
-#include "pixmaps/sylpheed_icon.xpm"
-#include "pixmaps/sylpheed_logo.xpm"
+#include "pixmaps/queue_close.xpm"
+#include "pixmaps/queue_close_hrm.xpm"
+#include "pixmaps/queue_open.xpm"
+#include "pixmaps/queue_open_hrm.xpm"
+#include "pixmaps/claws-mail_icon.xpm"
+#ifndef MAEMO
+#include "pixmaps/claws-mail_logo.xpm"
+#else
+#include "pixmaps/claws-mail_logo-small.xpm"
+#endif
#include "pixmaps/address_book.xpm"
-#include "pixmaps/trash.xpm"
-#include "pixmaps/trash_hrm.xpm"
#include "pixmaps/unread.xpm"
#include "pixmaps/read.xpm"
#include "pixmaps/vcard.xpm"
#include "pixmaps/notice_error.xpm"
#include "pixmaps/notice_note.xpm"
#include "pixmaps/quicksearch.xpm"
+#include "pixmaps/clip_gpg_signed.xpm"
#include "pixmaps/gpg_signed.xpm"
-#include "pixmaps/drafts_close.xpm"
-#include "pixmaps/drafts_open.xpm"
+#include "pixmaps/go_folders.xpm"
#include "pixmaps/mime_text_plain.xpm"
#include "pixmaps/mime_text_html.xpm"
#include "pixmaps/mime_application.xpm"
#include "pixmaps/mime_audio.xpm"
#include "pixmaps/mime_text_enriched.xpm"
#include "pixmaps/mime_unknown.xpm"
+#include "pixmaps/mime_pdf.xpm"
+#include "pixmaps/mime_ps.xpm"
+#include "pixmaps/mime_calendar.xpm"
+#include "pixmaps/mime_pgpsig.xpm"
+#include "pixmaps/printer.xpm"
#include "pixmaps/privacy_signed.xpm"
#include "pixmaps/privacy_passed.xpm"
#include "pixmaps/privacy_failed.xpm"
#include "pixmaps/address_search.xpm"
#include "pixmaps/check_spelling.xpm"
+#include "pixmaps/dir_close.xpm"
+#include "pixmaps/dir_close_hrm.xpm"
+#include "pixmaps/dir_open.xpm"
+#include "pixmaps/dir_open_hrm.xpm"
+#include "pixmaps/inbox_open.xpm"
+#include "pixmaps/inbox_open_hrm.xpm"
+#include "pixmaps/inbox_close.xpm"
+#include "pixmaps/inbox_close_hrm.xpm"
+#include "pixmaps/outbox_open.xpm"
+#include "pixmaps/outbox_open_hrm.xpm"
+#include "pixmaps/outbox_close.xpm"
+#include "pixmaps/outbox_close_hrm.xpm"
+#include "pixmaps/trash.xpm"
+#include "pixmaps/trash_btn.xpm"
+#include "pixmaps/trash_hrm.xpm"
+#include "pixmaps/drafts_close.xpm"
+#include "pixmaps/drafts_open.xpm"
+#include "pixmaps/dir_close_mark.xpm"
+#include "pixmaps/dir_close_hrm_mark.xpm"
+#include "pixmaps/dir_open_mark.xpm"
+#include "pixmaps/dir_open_hrm_mark.xpm"
+#include "pixmaps/inbox_open_mark.xpm"
+#include "pixmaps/inbox_open_hrm_mark.xpm"
+#include "pixmaps/inbox_close_mark.xpm"
+#include "pixmaps/inbox_close_hrm_mark.xpm"
+#include "pixmaps/outbox_open_mark.xpm"
+#include "pixmaps/outbox_open_hrm_mark.xpm"
+#include "pixmaps/outbox_close_mark.xpm"
+#include "pixmaps/outbox_close_hrm_mark.xpm"
+#include "pixmaps/trash_mark.xpm"
+#include "pixmaps/queue_close_mark.xpm"
+#include "pixmaps/queue_close_hrm_mark.xpm"
+#include "pixmaps/queue_open_mark.xpm"
+#include "pixmaps/queue_open_hrm_mark.xpm"
+#include "pixmaps/trash_hrm_mark.xpm"
+#include "pixmaps/drafts_close_mark.xpm"
+#include "pixmaps/drafts_open_mark.xpm"
+#include "pixmaps/dir_noselect.xpm"
+#include "pixmaps/spam.xpm"
+#include "pixmaps/spam_btn.xpm"
+#include "pixmaps/ham_btn.xpm"
+#include "pixmaps/moved.xpm"
+#include "pixmaps/copied.xpm"
+#include "pixmaps/selection.xpm"
+#include "pixmaps/watchthread.xpm"
+#include "pixmaps/empty.xpm"
+
typedef struct _StockPixmapData StockPixmapData;
struct _StockPixmapData
OverlayPosition position;
gint border_x;
gint border_y;
+ gboolean highlight;
};
static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname);
static StockPixmapData pixmaps[] =
{
+ {addr_one_xpm , NULL, NULL, "addr_one", NULL},
+ {addr_two_xpm , NULL, NULL, "addr_two", NULL},
{address_xpm , NULL, NULL, "address", NULL},
{address_book_xpm , NULL, NULL, "address_book", NULL},
{address_search_xpm , NULL, NULL, "address_search", NULL},
+ {anonymous_xpm , NULL, NULL, "anonymous", NULL},
{book_xpm , NULL, NULL, "book", NULL},
{category_xpm , NULL, NULL, "category", NULL},
{checkbox_off_xpm , NULL, NULL, "checkbox_off", NULL},
{check_spelling_xpm , NULL, NULL, "check_spelling", NULL},
{clip_xpm , NULL, NULL, "clip", NULL},
{clipkey_xpm , NULL, NULL, "clipkey", NULL},
+ {clip_gpg_signed_xpm , NULL, NULL, "clip_gpg_signed", NULL},
{close_xpm , NULL, NULL, "close", NULL},
{complete_xpm , NULL, NULL, "complete", NULL},
{continue_xpm , NULL, NULL, "continue", NULL},
{deleted_xpm , NULL, NULL, "deleted", NULL},
{dir_close_xpm , NULL, NULL, "dir_close", NULL},
- {dir_close_xpm , NULL, NULL, "dir_close_hrm", NULL},
+ {dir_close_hrm_xpm , NULL, NULL, "dir_close_hrm", NULL},
{dir_open_xpm , NULL, NULL, "dir_open", NULL},
{dir_open_hrm_xpm , NULL, NULL, "dir_open_hrm", NULL},
+ {dir_close_mark_xpm , NULL, NULL, "dir_close_mark", NULL},
+ {dir_close_hrm_mark_xpm , NULL, NULL, "dir_close_hrm_mark", NULL},
+ {dir_open_mark_xpm , NULL, NULL, "dir_open_mark", NULL},
+ {dir_open_hrm_mark_xpm , NULL, NULL, "dir_open_hrm_mark", NULL},
{down_arrow_xpm , NULL, NULL, "down_arrow", NULL},
{up_arrow_xpm , NULL, NULL, "up_arrow", NULL},
- {mail_compose_xpm , NULL, NULL, "edit_extern", NULL},
+ {edit_extern_xpm , NULL, NULL, "edit_extern", NULL},
{error_xpm , NULL, NULL, "error", NULL},
{exec_xpm , NULL, NULL, "exec", NULL},
{forwarded_xpm , NULL, NULL, "forwarded", NULL},
{group_xpm , NULL, NULL, "group", NULL},
{ignorethread_xpm , NULL, NULL, "ignorethread", NULL},
- {inbox_xpm , NULL, NULL, "inbox_close", NULL},
- {inbox_hrm_xpm , NULL, NULL, "inbox_close_hrm", NULL},
- {inbox_xpm , NULL, NULL, "inbox_open", NULL},
- {inbox_hrm_xpm , NULL, NULL, "inbox_open_hrm", NULL},
- {paste_xpm , NULL, NULL, "insert_file", NULL},
+ {inbox_close_xpm , NULL, NULL, "inbox_close", NULL},
+ {inbox_close_hrm_xpm , NULL, NULL, "inbox_close_hrm", NULL},
+ {inbox_open_xpm , NULL, NULL, "inbox_open", NULL},
+ {inbox_open_hrm_xpm , NULL, NULL, "inbox_open_hrm", NULL},
+ {inbox_close_mark_xpm , NULL, NULL, "inbox_close_mark", NULL},
+ {inbox_close_hrm_mark_xpm , NULL, NULL, "inbox_close_hrm_mark", NULL},
+ {inbox_open_mark_xpm , NULL, NULL, "inbox_open_mark", NULL},
+ {inbox_open_hrm_mark_xpm , NULL, NULL, "inbox_open_hrm_mark", NULL},
+ {insert_file_xpm , NULL, NULL, "insert_file", NULL},
{interface_xpm , NULL, NULL, "interface", NULL},
{jpilot_xpm , NULL, NULL, "jpilot", NULL},
{key_xpm , NULL, NULL, "key", NULL},
{mail_reply_to_author_xpm , NULL, NULL, "mail_reply_to_author", NULL},
{mail_send_xpm , NULL, NULL, "mail_send", NULL},
{mail_send_queue_xpm , NULL, NULL, "mail_send_queue", NULL},
- {mail_xpm , NULL, NULL, "mail_sign", NULL},
+ {mail_sign_xpm , NULL, NULL, "mail_sign", NULL},
+ {open_mail_xpm , NULL, NULL, "open_mail", NULL},
{mark_xpm , NULL, NULL, "mark", NULL},
{new_xpm , NULL, NULL, "new", NULL},
{news_compose_xpm , NULL, NULL, "news_compose", NULL},
- {outbox_xpm , NULL, NULL, "outbox_close", NULL},
- {outbox_hrm_xpm , NULL, NULL, "outbox_close_hrm", NULL},
- {outbox_xpm , NULL, NULL, "outbox_open", NULL},
- {outbox_hrm_xpm , NULL, NULL, "outbox_open_hrm", NULL},
+ {outbox_close_xpm , NULL, NULL, "outbox_close", NULL},
+ {outbox_close_hrm_xpm , NULL, NULL, "outbox_close_hrm", NULL},
+ {outbox_open_xpm , NULL, NULL, "outbox_open", NULL},
+ {outbox_open_hrm_xpm , NULL, NULL, "outbox_open_hrm", NULL},
+ {outbox_close_mark_xpm , NULL, NULL, "outbox_close_mark", NULL},
+ {outbox_close_hrm_mark_xpm , NULL, NULL, "outbox_close_hrm_mark", NULL},
+ {outbox_open_mark_xpm , NULL, NULL, "outbox_open_mark", NULL},
+ {outbox_open_hrm_mark_xpm , NULL, NULL, "outbox_open_hrm_mark", NULL},
{replied_xpm , NULL, NULL, "replied", NULL},
{paste_xpm , NULL, NULL, "paste", NULL},
{preferences_xpm , NULL, NULL, "preferences", NULL},
{properties_xpm , NULL, NULL, "properties", NULL},
- {outbox_xpm , NULL, NULL, "queue_close", NULL},
- {outbox_hrm_xpm , NULL, NULL, "queue_close_hrm", NULL},
- {outbox_xpm , NULL, NULL, "queue_open", NULL},
- {outbox_hrm_xpm , NULL, NULL, "queue_open_hrm", NULL},
+ {queue_close_xpm , NULL, NULL, "queue_close", NULL},
+ {queue_close_hrm_xpm , NULL, NULL, "queue_close_hrm", NULL},
+ {queue_open_xpm , NULL, NULL, "queue_open", NULL},
+ {queue_open_hrm_xpm , NULL, NULL, "queue_open_hrm", NULL},
{trash_xpm , NULL, NULL, "trash_open", NULL},
{trash_hrm_xpm , NULL, NULL, "trash_open_hrm", NULL},
{trash_xpm , NULL, NULL, "trash_close", NULL},
{trash_hrm_xpm , NULL, NULL, "trash_close_hrm", NULL},
+ {queue_close_mark_xpm , NULL, NULL, "queue_close_mark", NULL},
+ {queue_close_hrm_mark_xpm , NULL, NULL, "queue_close_hrm_mark", NULL},
+ {queue_open_mark_xpm , NULL, NULL, "queue_open_mark", NULL},
+ {queue_open_hrm_mark_xpm , NULL, NULL, "queue_open_hrm_mark", NULL},
+ {trash_mark_xpm , NULL, NULL, "trash_open_mark", NULL},
+ {trash_hrm_mark_xpm , NULL, NULL, "trash_open_hrm_mark", NULL},
+ {trash_mark_xpm , NULL, NULL, "trash_close_mark", NULL},
+ {trash_hrm_mark_xpm , NULL, NULL, "trash_close_hrm_mark", NULL},
{unread_xpm , NULL, NULL, "unread", NULL},
{vcard_xpm , NULL, NULL, "vcard", NULL},
{online_xpm , NULL, NULL, "online", NULL},
{notice_note_xpm , NULL, NULL, "notice_note", NULL},
{quicksearch_xpm , NULL, NULL, "quicksearch", NULL},
{gpg_signed_xpm , NULL, NULL, "gpg_signed", NULL},
+ {go_folders_xpm , NULL, NULL, "go_folders", NULL},
{drafts_close_xpm , NULL, NULL, "drafts_close", NULL},
{drafts_open_xpm , NULL, NULL, "drafts_open", NULL},
+ {drafts_close_mark_xpm , NULL, NULL, "drafts_close_mark", NULL},
+ {drafts_open_mark_xpm , NULL, NULL, "drafts_open_mark", NULL},
{mime_text_plain_xpm , NULL, NULL, "mime_text_plain", NULL},
{mime_text_html_xpm , NULL, NULL, "mime_text_html", NULL},
{mime_application_xpm , NULL, NULL, "mime_application", NULL},
{mime_audio_xpm , NULL, NULL, "mime_audio", NULL},
{mime_text_enriched_xpm , NULL, NULL, "mime_text_enriched", NULL},
{mime_unknown_xpm , NULL, NULL, "mime_unknown", NULL},
+ {mime_pdf_xpm , NULL, NULL, "mime_pdf", NULL},
+ {mime_ps_xpm , NULL, NULL, "mime_ps", NULL},
+ {mime_calendar_xpm , NULL, NULL, "mime_calendar", NULL},
+ {mime_pgpsig_xpm , NULL, NULL, "mime_pgpsig", NULL},
+ {printer_xpm , NULL, NULL, "printer", NULL},
{privacy_signed_xpm , NULL, NULL, "privacy_signed", NULL},
{privacy_passed_xpm , NULL, NULL, "privacy_passed", NULL},
{privacy_failed_xpm , NULL, NULL, "privacy_failed", NULL},
{privacy_emblem_failed_xpm , NULL, NULL, "privacy_emblem_failed", NULL},
{privacy_emblem_warn_xpm , NULL, NULL, "privacy_emblem_warn", NULL},
{mime_message_xpm , NULL, NULL, "mime_message", NULL},
- {sylpheed_icon_xpm , NULL, NULL, "sylpheed_icon", NULL},
+ {claws_mail_icon_xpm , NULL, NULL, "claws_mail_icon", NULL},
{read_xpm , NULL, NULL, "read", NULL},
- {sylpheed_logo_xpm , NULL, NULL, "sylpheed_logo", NULL},
+ {trash_btn_xpm , NULL, NULL, "trash_btn", NULL},
+#ifndef MAEMO
+ {claws_mail_logo_xpm , NULL, NULL, "claws_mail_logo", NULL},
+#else
+ {claws_mail_logo_small_xpm , NULL, NULL, "claws_mail_logo_small", NULL},
+#endif
+ {dir_noselect_xpm , NULL, NULL, "dir_noselect" , NULL},
+ {spam_xpm , NULL, NULL, "spam" , NULL},
+ {spam_btn_xpm , NULL, NULL, "spam_btn" , NULL},
+ {ham_btn_xpm , NULL, NULL, "ham_btn" , NULL},
+ {moved_xpm , NULL, NULL, "moved", NULL},
+ {copied_xpm , NULL, NULL, "copied", NULL},
+ {selection_xpm , NULL, NULL, "selection", NULL},
+ {watchthread_xpm , NULL, NULL, "watchthread", NULL},
+ {empty_xpm , NULL, NULL, "empty" , NULL}
};
/* return newly constructed GtkPixmap from GdkPixmap */
{
StockPixmapData *pix_d;
- g_return_val_if_fail(window != NULL, -1);
- g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
-
- if (pixbuf)
+ if (pixbuf)
*pixbuf = NULL;
+
+ g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
pix_d = &pixmaps[icon];
if (err) g_error_free(err);
}
if (pix) {
- if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ g_free(pix_d->icon_path);
pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
}
g_free(icon_file_name);
if (!pix_d->pixbuf) {
pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) pix_d->data);
if (pix_d->pixbuf) {
- if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ g_free(pix_d->icon_path);
pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
}
}
if (is_file_exist(icon_file_name))
PIXMAP_CREATE_FROM_FILE(window, pix, pix_d->mask, icon_file_name);
if (pix) {
- if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ g_free(pix_d->icon_path);
pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
}
g_free(icon_file_name);
if (!pix_d->pixmap) {
PIXMAP_CREATE(window, pix_d->pixmap, pix_d->mask, pix_d->data);
if (pix_d->pixmap) {
- if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+ g_free(pix_d->icon_path);
pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
}
}
DIR *dp;
if ((dp = opendir(dirname)) == NULL) {
- debug_print("dir %s not found, skipping theme scan", dirname);
+ debug_print("dir %s not found, skipping theme scan", dirname?dirname:"(null)");
return;
}
filetoexist = g_strconcat(fullentry, G_DIR_SEPARATOR_S, pixmaps[i].file, ".xpm", NULL);
if (is_file_exist(filetoexist)) {
*list = g_list_append(*list, fullentry);
+ g_free(filetoexist);
break;
}
+ g_free(filetoexist);
}
- g_free(filetoexist);
if (i == N_STOCK_PIXMAPS)
g_free(fullentry);
} else
GList *list = NULL;
defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
- userthemes = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
- RC_DIR, G_DIR_SEPARATOR_S,
+ userthemes = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PIXMAP_THEME_DIR, NULL);
systemthemes = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
PIXMAP_THEME_DIR, NULL);
GList *ptr;
for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr))
- if (ptr->data)
- g_free(ptr->data);
+ g_free(ptr->data);
g_list_free(list);
}
gdk_window_clear_area (drawable, expose->area.x, expose->area.y,
expose->area.width, expose->area.height);
+ if (data->highlight) {
+ MainWindow *mw = NULL;
+
+ mw = mainwindow_get_mainwindow();
+ if (mw != NULL && mw->menubar != NULL) {
+ GdkGC *gc_frame = gdk_gc_new((GdkWindow *)drawable);
+ GdkColor color = gtk_widget_get_style(mw->menubar)->base[GTK_STATE_SELECTED];
+
+ gdk_gc_set_foreground(gc_frame, &color);
+ gdk_gc_set_line_attributes(gc_frame, 1, GDK_LINE_SOLID,
+ GDK_CAP_BUTT, GDK_JOIN_BEVEL);
+ gdk_draw_rectangle(drawable, gc_frame, FALSE, data->border_x-2, data->border_y-2,
+ data->base_width+3, data->base_height+3);
+ g_object_unref(gc_frame);
+ }
+ }
+
gdk_gc_set_tile(gc_pix, data->base_pixmap);
gdk_gc_set_ts_origin(gc_pix, data->border_x, data->border_y);
gdk_gc_set_clip_mask(gc_pix, data->base_mask);
gdk_draw_rectangle(drawable, gc_pix, TRUE, left, top,
data->overlay_width, data->overlay_height);
}
- gdk_gc_destroy(gc_pix);
+ g_object_unref(gc_pix);
return TRUE;
}
data->position = pos;
data->border_x = border_x;
data->border_y = border_y;
+ data->highlight = FALSE;
widget = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(widget), data->base_width + border_x * 2,
G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
g_signal_connect(G_OBJECT(widget), "destroy",
G_CALLBACK(pixmap_with_overlay_destroy_cb), data);
+ g_object_set_data(G_OBJECT(widget), "highlight", &(data->highlight));
return widget;
}
projects / claws.git / blobdiff