* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "defs.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#include "claws-features.h"
+#endif
+
#include <glib.h>
#include <gtk/gtk.h>
+#include <librsvg/rsvg.h>
#include <string.h>
#include <dirent.h>
-#include "config.h"
+#include "defs.h"
#include "stock_pixmap.h"
#include "gtkutils.h"
#include "utils.h"
#include "pixmaps/mime_message.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/trash_open.xpm"
#include "pixmaps/trash_close.xpm"
#include "pixmaps/delete_btn.xpm"
+#include "pixmaps/delete_dup_btn.xpm"
#include "pixmaps/cancel.xpm"
#include "pixmaps/trash_btn.xpm"
#include "pixmaps/trash_open_hrm.xpm"
#include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm"
#include "pixmaps/zoom_width.xpm"
+#include "pixmaps/mark_ignorethread.xpm"
+#include "pixmaps/mark_watchthread.xpm"
+#include "pixmaps/mark_mark.xpm"
+#include "pixmaps/mark_unmark.xpm"
+#include "pixmaps/mark_locked.xpm"
+#include "pixmaps/mark_unlocked.xpm"
+#include "pixmaps/mark_allread.xpm"
+#include "pixmaps/mark_allunread.xpm"
+#include "pixmaps/mark_read.xpm"
+#include "pixmaps/mark_unread.xpm"
typedef struct _StockPixmapData StockPixmapData;
gboolean is_pixmap;
cairo_surface_t *base_pixmap;
cairo_surface_t *overlay_pixmap;
-
+
GdkPixbuf *base_pixbuf;
GdkPixbuf *overlay_pixbuf;
-
+
guint base_height;
guint base_width;
guint overlay_height;
static StockPixmapData pixmaps[] =
{
- {addr_one_xpm , NULL, NULL, "addr_one", NULL, NULL},
- {addr_two_xpm , NULL, NULL, "addr_two", NULL, NULL},
- {address_xpm , NULL, NULL, "address", NULL, NULL},
- {address_book_xpm , NULL, NULL, "address_book", NULL, NULL},
- {address_search_xpm , NULL, NULL, "address_search", NULL, NULL},
- {anonymous_xpm , NULL, NULL, "anonymous", NULL, NULL},
- {book_xpm , NULL, NULL, "book", NULL, NULL},
- {category_xpm , NULL, NULL, "category", NULL, NULL},
- {checkbox_off_xpm , NULL, NULL, "checkbox_off", NULL, NULL},
- {checkbox_on_xpm , NULL, NULL, "checkbox_on", NULL, NULL},
- {check_spelling_xpm , NULL, NULL, "check_spelling", NULL, NULL},
- {clip_xpm , NULL, NULL, "clip", NULL, NULL},
- {clipkey_xpm , NULL, NULL, "clipkey", NULL, NULL},
- {clip_gpg_signed_xpm , NULL, NULL, "clip_gpg_signed", NULL, NULL},
- {close_xpm , NULL, NULL, "close", NULL, NULL},
- {complete_xpm , NULL, NULL, "complete", NULL, NULL},
- {continue_xpm , NULL, NULL, "continue", NULL, NULL},
- {deleted_xpm , NULL, NULL, "deleted", NULL, NULL},
- {dir_close_xpm , NULL, NULL, "dir_close", NULL, NULL},
- {dir_close_hrm_xpm , NULL, NULL, "dir_close_hrm", NULL, NULL},
- {dir_open_xpm , NULL, NULL, "dir_open", NULL, NULL},
- {dir_open_hrm_xpm , NULL, NULL, "dir_open_hrm", NULL, NULL},
- {dir_close_mark_xpm , NULL, NULL, "dir_close_mark", NULL, NULL},
- {dir_close_hrm_mark_xpm , NULL, NULL, "dir_close_hrm_mark", NULL, NULL},
- {dir_open_mark_xpm , NULL, NULL, "dir_open_mark", NULL, NULL},
- {dir_open_hrm_mark_xpm , NULL, NULL, "dir_open_hrm_mark", NULL, NULL},
- {down_arrow_xpm , NULL, NULL, "down_arrow", NULL, NULL},
- {up_arrow_xpm , NULL, NULL, "up_arrow", NULL, NULL},
- {edit_extern_xpm , NULL, NULL, "edit_extern", NULL, NULL},
- {error_xpm , NULL, NULL, "error", NULL, NULL},
- {exec_xpm , NULL, NULL, "exec", NULL, NULL},
- {forwarded_xpm , NULL, NULL, "forwarded", NULL, NULL},
- {group_xpm , NULL, NULL, "group", NULL, NULL},
- {ignorethread_xpm , NULL, NULL, "ignorethread", NULL, NULL},
- {inbox_close_xpm , NULL, NULL, "inbox_close", NULL, NULL},
- {inbox_close_hrm_xpm , NULL, NULL, "inbox_close_hrm", NULL, NULL},
- {inbox_open_xpm , NULL, NULL, "inbox_open", NULL, NULL},
- {inbox_open_hrm_xpm , NULL, NULL, "inbox_open_hrm", NULL, NULL},
- {inbox_close_mark_xpm , NULL, NULL, "inbox_close_mark", NULL, NULL},
- {inbox_close_hrm_mark_xpm , NULL, NULL, "inbox_close_hrm_mark", NULL, NULL},
- {inbox_open_mark_xpm , NULL, NULL, "inbox_open_mark", NULL, NULL},
- {inbox_open_hrm_mark_xpm , NULL, NULL, "inbox_open_hrm_mark", NULL, NULL},
- {insert_file_xpm , NULL, NULL, "insert_file", NULL, NULL},
- {interface_xpm , NULL, NULL, "interface", NULL, NULL},
- {jpilot_xpm , NULL, NULL, "jpilot", NULL, NULL},
- {key_xpm , NULL, NULL, "key", NULL, NULL},
- {key_gpg_signed_xpm , NULL, NULL, "key_gpg_signed", NULL, NULL},
- {ldap_xpm , NULL, NULL, "ldap", NULL, NULL},
- {linewrapcurrent_xpm , NULL, NULL, "linewrapcurrent", NULL, NULL},
- {linewrap_xpm , NULL, NULL, "linewrap", NULL, NULL},
- {locked_xpm , NULL, NULL, "locked", NULL, NULL},
- {mail_xpm , NULL, NULL, "mail", NULL, NULL},
- {mail_attach_xpm , NULL, NULL, "mail_attach", NULL, NULL},
- {mail_compose_xpm , NULL, NULL, "mail_compose", NULL, NULL},
- {mail_forward_xpm , NULL, NULL, "mail_forward", NULL, NULL},
- {mail_receive_xpm , NULL, NULL, "mail_receive", NULL, NULL},
- {mail_receive_all_xpm , NULL, NULL, "mail_receive_all", NULL, NULL},
- {mail_reply_xpm , NULL, NULL, "mail_reply", NULL, NULL},
- {mail_reply_to_all_xpm , NULL, NULL, "mail_reply_to_all", NULL, NULL},
- {mail_reply_to_author_xpm , NULL, NULL, "mail_reply_to_author", NULL, NULL},
- {mail_reply_to_list_xpm , NULL, NULL, "mail_reply_to_list", NULL, NULL},
- {mail_send_xpm , NULL, NULL, "mail_send", NULL, NULL},
- {mail_send_queue_xpm , NULL, NULL, "mail_send_queue", NULL, NULL},
- {mail_sign_xpm , NULL, NULL, "mail_sign", NULL, NULL},
- {open_mail_xpm , NULL, NULL, "open_mail", NULL, NULL},
- {mark_xpm , NULL, NULL, "mark", NULL, NULL},
- {new_xpm , NULL, NULL, "new", NULL, NULL},
+ {addr_one_xpm , NULL, NULL, "addr_one", NULL, NULL},
+ {addr_two_xpm , NULL, NULL, "addr_two", NULL, NULL},
+ {address_xpm , NULL, NULL, "address", NULL, NULL},
+ {address_book_xpm , NULL, NULL, "address_book", NULL, NULL},
+ {address_search_xpm , NULL, NULL, "address_search", NULL, NULL},
+ {anonymous_xpm , NULL, NULL, "anonymous", NULL, NULL},
+ {book_xpm , NULL, NULL, "book", NULL, NULL},
+ {category_xpm , NULL, NULL, "category", NULL, NULL},
+ {checkbox_off_xpm , NULL, NULL, "checkbox_off", NULL, NULL},
+ {checkbox_on_xpm , NULL, NULL, "checkbox_on", NULL, NULL},
+ {check_spelling_xpm , NULL, NULL, "check_spelling", NULL, NULL},
+ {clip_xpm , NULL, NULL, "clip", NULL, NULL},
+ {clipkey_xpm , NULL, NULL, "clipkey", NULL, NULL},
+ {clip_gpg_signed_xpm , NULL, NULL, "clip_gpg_signed", NULL, NULL},
+ {close_xpm , NULL, NULL, "close", NULL, NULL},
+ {complete_xpm , NULL, NULL, "complete", NULL, NULL},
+ {continue_xpm , NULL, NULL, "continue", NULL, NULL},
+ {deleted_xpm , NULL, NULL, "deleted", NULL, NULL},
+ {dir_close_xpm , NULL, NULL, "dir_close", NULL, NULL},
+ {dir_close_hrm_xpm , NULL, NULL, "dir_close_hrm", NULL, NULL},
+ {dir_open_xpm , NULL, NULL, "dir_open", NULL, NULL},
+ {dir_open_hrm_xpm , NULL, NULL, "dir_open_hrm", NULL, NULL},
+ {dir_close_mark_xpm , NULL, NULL, "dir_close_mark", NULL, NULL},
+ {dir_close_hrm_mark_xpm , NULL, NULL, "dir_close_hrm_mark", NULL, NULL},
+ {dir_open_mark_xpm , NULL, NULL, "dir_open_mark", NULL, NULL},
+ {dir_open_hrm_mark_xpm , NULL, NULL, "dir_open_hrm_mark", NULL, NULL},
+ {down_arrow_xpm , NULL, NULL, "down_arrow", NULL, NULL},
+ {up_arrow_xpm , NULL, NULL, "up_arrow", NULL, NULL},
+ {edit_extern_xpm , NULL, NULL, "edit_extern", NULL, NULL},
+ {error_xpm , NULL, NULL, "error", NULL, NULL},
+ {exec_xpm , NULL, NULL, "exec", NULL, NULL},
+ {forwarded_xpm , NULL, NULL, "forwarded", NULL, NULL},
+ {group_xpm , NULL, NULL, "group", NULL, NULL},
+ {ignorethread_xpm , NULL, NULL, "ignorethread", NULL, NULL},
+ {inbox_close_xpm , NULL, NULL, "inbox_close", NULL, NULL},
+ {inbox_close_hrm_xpm , NULL, NULL, "inbox_close_hrm", NULL, NULL},
+ {inbox_open_xpm , NULL, NULL, "inbox_open", NULL, NULL},
+ {inbox_open_hrm_xpm , NULL, NULL, "inbox_open_hrm", NULL, NULL},
+ {inbox_close_mark_xpm , NULL, NULL, "inbox_close_mark", NULL, NULL},
+ {inbox_close_hrm_mark_xpm , NULL, NULL, "inbox_close_hrm_mark", NULL, NULL},
+ {inbox_open_mark_xpm , NULL, NULL, "inbox_open_mark", NULL, NULL},
+ {inbox_open_hrm_mark_xpm , NULL, NULL, "inbox_open_hrm_mark", NULL, NULL},
+ {insert_file_xpm , NULL, NULL, "insert_file", NULL, NULL},
+ {interface_xpm , NULL, NULL, "interface", NULL, NULL},
+ {jpilot_xpm , NULL, NULL, "jpilot", NULL, NULL},
+ {key_xpm , NULL, NULL, "key", NULL, NULL},
+ {key_gpg_signed_xpm , NULL, NULL, "key_gpg_signed", NULL, NULL},
+ {ldap_xpm , NULL, NULL, "ldap", NULL, NULL},
+ {linewrapcurrent_xpm , NULL, NULL, "linewrapcurrent", NULL, NULL},
+ {linewrap_xpm , NULL, NULL, "linewrap", NULL, NULL},
+ {locked_xpm , NULL, NULL, "locked", NULL, NULL},
+ {mail_xpm , NULL, NULL, "mail", NULL, NULL},
+ {mail_attach_xpm , NULL, NULL, "mail_attach", NULL, NULL},
+ {mail_compose_xpm , NULL, NULL, "mail_compose", NULL, NULL},
+ {mail_forward_xpm , NULL, NULL, "mail_forward", NULL, NULL},
+ {mail_receive_xpm , NULL, NULL, "mail_receive", NULL, NULL},
+ {mail_receive_all_xpm , NULL, NULL, "mail_receive_all", NULL, NULL},
+ {mail_reply_xpm , NULL, NULL, "mail_reply", NULL, NULL},
+ {mail_reply_to_all_xpm , NULL, NULL, "mail_reply_to_all", NULL, NULL},
+ {mail_reply_to_author_xpm , NULL, NULL, "mail_reply_to_author", NULL, NULL},
+ {mail_reply_to_list_xpm , NULL, NULL, "mail_reply_to_list", NULL, NULL},
+ {mail_send_xpm , NULL, NULL, "mail_send", NULL, NULL},
+ {mail_send_queue_xpm , NULL, NULL, "mail_send_queue", NULL, NULL},
+ {mail_sign_xpm , NULL, NULL, "mail_sign", NULL, NULL},
+ {open_mail_xpm , NULL, NULL, "open_mail", NULL, NULL},
+ {mark_xpm , NULL, NULL, "mark", NULL, NULL},
+ {new_xpm , NULL, NULL, "new", NULL, NULL},
{news_compose_xpm , NULL, NULL, "news_compose", NULL, NULL},
{outbox_close_xpm , NULL, NULL, "outbox_close", NULL, NULL},
{outbox_close_hrm_xpm , NULL, NULL, "outbox_close_hrm", NULL, NULL},
{mime_image_xpm , NULL, NULL, "mime_image", NULL, NULL},
{mime_audio_xpm , NULL, NULL, "mime_audio", NULL, NULL},
{mime_text_enriched_xpm , NULL, NULL, "mime_text_enriched", NULL, NULL},
- {mime_unknown_xpm , NULL, NULL, "mime_unknown", NULL, NULL},
- {mime_pdf_xpm , NULL, NULL, "mime_pdf", NULL, NULL},
- {mime_ps_xpm , NULL, NULL, "mime_ps", NULL, NULL},
- {mime_calendar_xpm , NULL, NULL, "mime_calendar", NULL, NULL},
- {mime_pgpsig_xpm , NULL, NULL, "mime_pgpsig", NULL, NULL},
+ {mime_unknown_xpm , NULL, NULL, "mime_unknown", NULL, NULL},
+ {mime_pdf_xpm , NULL, NULL, "mime_pdf", NULL, NULL},
+ {mime_ps_xpm , NULL, NULL, "mime_ps", NULL, NULL},
+ {mime_calendar_xpm , NULL, NULL, "mime_calendar", NULL, NULL},
+ {mime_pgpsig_xpm , NULL, NULL, "mime_pgpsig", NULL, NULL},
{printer_xpm , NULL, NULL, "printer", NULL, NULL},
{privacy_signed_xpm , NULL, NULL, "privacy_signed", NULL, NULL},
{privacy_passed_xpm , NULL, NULL, "privacy_passed", NULL, NULL},
- {privacy_failed_xpm , NULL, NULL, "privacy_failed", NULL, NULL},
+ {privacy_failed_xpm , NULL, NULL, "privacy_failed", NULL, NULL},
{privacy_unknown_xpm , NULL, NULL, "privacy_unknown", NULL, NULL},
{privacy_expired_xpm , NULL, NULL, "privacy_expired", NULL, NULL},
{privacy_warn_xpm , NULL, NULL, "privacy_warn", NULL, NULL},
{privacy_emblem_encrypted_xpm , NULL, NULL, "privacy_emblem_encrypted", NULL, NULL},
{privacy_emblem_signed_xpm , NULL, NULL, "privacy_emblem_signed", NULL, NULL},
{privacy_emblem_passed_xpm , NULL, NULL, "privacy_emblem_passed", NULL, NULL},
- {privacy_emblem_failed_xpm , NULL, NULL, "privacy_emblem_failed", NULL, NULL},
+ {privacy_emblem_failed_xpm , NULL, NULL, "privacy_emblem_failed", NULL, NULL},
{privacy_emblem_warn_xpm , NULL, NULL, "privacy_emblem_warn", NULL, NULL},
{mime_message_xpm , NULL, NULL, "mime_message", NULL, NULL},
{claws_mail_icon_xpm , NULL, NULL, "claws_mail_icon", NULL, NULL},
{claws_mail_icon_64_xpm , NULL, NULL, "claws_mail_icon_64", NULL, NULL},
{read_xpm , NULL, NULL, "read", NULL, NULL},
{delete_btn_xpm , NULL, NULL, "delete_btn", NULL, NULL},
+ {delete_dup_btn_xpm , NULL, NULL, "delete_dup_btn", NULL, NULL},
{cancel_xpm , NULL, NULL, "cancel", NULL, NULL},
{trash_btn_xpm , NULL, NULL, "trash_btn", NULL, NULL},
{claws_mail_compose_logo_xpm , NULL, NULL, "claws_mail_compose_logo", NULL, NULL},
{tray_unreadmail_xpm , NULL, NULL, "tray_unreadmail", NULL, NULL},
{tray_unreadmarkedmail_offline_xpm, NULL, NULL, "tray_unreadmarkedmail_offline", NULL, NULL},
{tray_unreadmarkedmail_xpm , NULL, NULL, "tray_unreadmarkedmail", NULL, NULL},
- {doc_index_xpm , NULL, NULL, "doc_index", NULL, NULL,},
- {doc_index_close_xpm , NULL, NULL, "doc_index_close", NULL, NULL,},
- {doc_info_xpm , NULL, NULL, "doc_info", NULL, NULL,},
+ {doc_index_xpm , NULL, NULL, "doc_index", NULL, NULL},
+ {doc_index_close_xpm , NULL, NULL, "doc_index_close", NULL, NULL},
+ {doc_info_xpm , NULL, NULL, "doc_info", NULL, NULL},
{first_arrow_xpm , NULL, NULL, "first_arrow", NULL, NULL},
{last_arrow_xpm , NULL, NULL, "last_arrow", NULL, NULL},
{left_arrow_xpm , NULL, NULL, "left_arrow", NULL, NULL},
{zoom_in_xpm , NULL, NULL, "zoom_in", NULL, NULL},
{zoom_out_xpm , NULL, NULL, "zoom_out", NULL, NULL},
{zoom_width_xpm , NULL, NULL, "zoom_width", NULL, NULL},
+ {mark_ignorethread_xpm , NULL, NULL, "mark_ignorethread", NULL, NULL},
+ {mark_watchthread_xpm , NULL, NULL, "mark_watchthread", NULL, NULL},
+ {mark_mark_xpm , NULL, NULL, "mark_mark", NULL, NULL},
+ {mark_unmark_xpm , NULL, NULL, "mark_unmark", NULL, NULL},
+ {mark_locked_xpm , NULL, NULL, "mark_locked", NULL, NULL},
+ {mark_unlocked_xpm , NULL, NULL, "mark_unlocked", NULL, NULL},
+ {mark_allread_xpm , NULL, NULL, "mark_allread", NULL, NULL},
+ {mark_allunread_xpm , NULL, NULL, "mark_allunread", NULL, NULL},
+ {mark_read_xpm , NULL, NULL, "mark_read", NULL, NULL},
+ {mark_unread_xpm , NULL, NULL, "mark_unread", NULL, NULL},
{empty_xpm , NULL, NULL, "empty", NULL, NULL}
};
+/* Supported theme extensions */
+static const char *extension[] = {
+ ".png",
+ ".xpm",
+#ifdef HAVE_SVG
+ ".svg",
+#endif
+ NULL
+};
+
+/* return current supported extensions */
+const char **stock_pixmap_theme_extensions(void)
+{
+ return extension;
+}
+
/* return newly constructed GtkPixmap from GdkPixmap */
GtkWidget *stock_pixmap_widget(StockPixmap icon)
{
GdkPixbuf *pixbuf;
- cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
+ cm_return_val_if_fail(icon < N_STOCK_PIXMAPS, NULL);
if (stock_pixbuf_gdk(icon, &pixbuf) != -1)
return gtk_image_new_from_pixbuf(pixbuf);
-
+
return NULL;
}
/*!
- *\brief
+ *\brief
*/
gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
{
StockPixmapData *pix_d;
- static const char *extension[]={".png", ".xpm", NULL};
int i = 0;
gboolean theme_changed = FALSE;
if (pixbuf)
*pixbuf = NULL;
-
- cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
+
+ cm_return_val_if_fail(icon < N_STOCK_PIXMAPS, -1);
pix_d = &pixmaps[icon];
theme_changed = (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0);
if (!pix_d->pixbuf || theme_changed) {
GdkPixbuf *pix = NULL;
-
+
if (theme_changed && pix_d->pixmap) {
g_object_unref(pix_d->pixmap);
pix_d->pixmap = NULL;
if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {
if (is_dir_exist(prefs_common.pixmap_theme_path)) {
- char *icon_file_name;
-try_next_extension:
+ char *icon_file_name;
+try_next_extension:
icon_file_name = g_strconcat(prefs_common.pixmap_theme_path,
G_DIR_SEPARATOR_S,
pix_d->file,
NULL);
if (is_file_exist(icon_file_name)) {
GError *err = NULL;
- pix = gdk_pixbuf_new_from_file(icon_file_name, &err);
+#ifdef HAVE_SVG
+ if (!strncmp(extension[i], ".svg", 4)) {
+ pix = rsvg_pixbuf_from_file(icon_file_name, &err);
+ } else {
+ pix = gdk_pixbuf_new_from_file(icon_file_name, &err);
+ }
+#else
+ pix = gdk_pixbuf_new_from_file(icon_file_name, &err);
+#endif
if (err) g_error_free(err);
- }
+ }
if (pix) {
g_free(pix_d->icon_path);
pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) pix_d->data);
if (pix_d->pixbuf) {
g_free(pix_d->icon_path);
- pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
+ pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);
}
}
if (pixbuf)
*pixbuf = pix_d->pixbuf;
- /* pixbuf should have one ref outstanding */
+ /* pixbuf should have one ref outstanding */
return 0;
}
gchar *fullentry;
GDir *dp;
GError *error = NULL;
- static const char *extension[]={".png", ".xpm", NULL};
-
+
if ((dp = g_dir_open(dirname, 0, &error)) == NULL) {
debug_print("skipping theme scan, dir %s could not be opened: %s (%d)\n",
dirname ? dirname : "(null)", error->message, error->code);
g_error_free(error);
return;
}
-
+
while ((entry = g_dir_read_name(dp)) != NULL) {
fullentry = g_strconcat(dirname, G_DIR_SEPARATOR_S, entry, NULL);
-
+
if (strcmp(entry, ".") != 0 && strcmp(entry, "..") != 0 && is_dir_exist(fullentry)) {
gchar *filetoexist;
gboolean found = FALSE;
g_free(filetoexist);
}
}
- if (i == N_STOCK_PIXMAPS)
+ if (i == N_STOCK_PIXMAPS)
g_free(fullentry);
- } else
+ } else
g_free(fullentry);
}
g_dir_close(dp);
gchar *userthemes;
gchar *systemthemes;
GList *list = NULL;
-
+
defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
- userthemes = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ userthemes = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
PIXMAP_THEME_DIR, NULL);
systemthemes = stock_pixmap_get_system_theme_dir_for_theme(NULL);
{
GList *ptr;
- for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr))
+ for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr))
g_free(ptr->data);
- g_list_free(list);
+ g_list_free(list);
}
gchar *stock_pixmap_get_name (StockPixmap icon)
{
- if (icon < 0 || icon >= N_STOCK_PIXMAPS)
+ if (icon >= N_STOCK_PIXMAPS)
return NULL;
-
+
return pixmaps[icon].file;
}
StockPixmap stock_pixmap_get_icon (gchar *file)
{
gint i;
-
+
for (i = 0; i < N_STOCK_PIXMAPS; i++) {
if (strcmp (pixmaps[i].file, file) == 0)
return i;
}
static gboolean do_pix_draw(GtkWidget *widget, cairo_t *cr,
- OverlayData *data)
+ OverlayData *data)
{
- GdkWindow *drawable = gtk_widget_get_window(widget);
+ GdkWindow *drawable = gtk_widget_get_window(widget);
gint left = 0;
gint top = 0;
case OVERLAY_MID_RIGHT:
top = (data->base_height + data->border_y * 2 - data->overlay_height)/2;
break;
-
+
case OVERLAY_BOTTOM_LEFT:
case OVERLAY_BOTTOM_CENTER:
case OVERLAY_BOTTOM_RIGHT:
#if !GTK_CHECK_VERSION(3,0,0)
static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventExpose *expose,
- OverlayData *data)
+ OverlayData *data)
#else
static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, cairo_t *cr,
- OverlayData *data)
+ OverlayData *data)
#endif
{
#if !GTK_CHECK_VERSION(3,0,0)
cairo_t *cr;
- GdkWindow *drawable = gtk_widget_get_window(widget);
+ GdkWindow *drawable = gtk_widget_get_window(widget);
gboolean result;
cr = gdk_cairo_create(drawable);
#endif
}
-static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data)
+static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data)
{
if (data->is_pixmap) {
cairo_surface_destroy(data->base_pixmap);
GtkWidget *stock_wid = NULL;
GtkRequisition requisition;
OverlayData *data = NULL;
-
+
data = g_new0(OverlayData, 1);
stock_wid = stock_pixmap_widget(icon);
data->highlight = FALSE;
widget = gtk_drawing_area_new();
- gtk_widget_set_size_request(widget, data->base_width + border_x * 2,
+ gtk_widget_set_size_request(widget, data->base_width + border_x * 2,
data->base_height + border_y * 2);
#if !GTK_CHECK_VERSION(3, 0, 0)
- g_signal_connect(G_OBJECT(widget), "expose_event",
+ g_signal_connect(G_OBJECT(widget), "expose_event",
G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
#else
- g_signal_connect(G_OBJECT(widget), "draw",
+ g_signal_connect(G_OBJECT(widget), "draw",
G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
#endif
g_signal_connect(G_OBJECT(widget), "destroy",
projects / claws.git / blobdiff