From: Sergio Villar Senin Date: Tue, 20 Mar 2007 18:38:38 +0000 (+0000) Subject: * Removed platform icons from Maemo UI X-Git-Tag: git_migration_finished~3968 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=cb02c84129626cc87c88381ad9996bca8fb1cec1;ds=sidebyside * Removed platform icons from Maemo UI pmo-trunk-r914 --- diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h index 80e01f3..3dd8b1e 100644 --- a/src/maemo/modest-icon-names.h +++ b/src/maemo/modest-icon-names.h @@ -42,39 +42,35 @@ #define MODEST_APP_ICON PIXMAP_PREFIX "modest-icon.png" -#define MODEST_HEADER_ICON_READ PIXMAP_PREFIX "qgn_list_messagin_mail.png" -#define MODEST_HEADER_ICON_UNREAD PIXMAP_PREFIX "qgn_list_messagin_mail_unread.png" -#define MODEST_HEADER_ICON_DELETED PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png" -#define MODEST_HEADER_ICON_ATTACH PIXMAP_PREFIX "qgn_list_gene_attacpap.png" - -#define MODEST_FOLDER_ICON_OPEN PIXMAP_PREFIX "qgn_list_gene_fldr_opn.png" -#define MODEST_FOLDER_ICON_CLOSED PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png" - -#define MODEST_FOLDER_ICON_ACCOUNT PIXMAP_PREFIX "qgn_addr_icon_user_group.png" -#define MODEST_FOLDER_ICON_INBOX PIXMAP_PREFIX "qgn_list_messagin_inbox.png" -#define MODEST_FOLDER_ICON_OUTBOX PIXMAP_PREFIX "qgn_list_messagin_outbox.png" -#define MODEST_FOLDER_ICON_SENT PIXMAP_PREFIX "qgn_list_messagin_sent.png" -#define MODEST_FOLDER_ICON_TRASH PIXMAP_PREFIX "qgn_toolb_messagin_delete.png" -#define MODEST_FOLDER_ICON_JUNK PIXMAP_PREFIX "qgn_toolb_messagin_delete.png" -#define MODEST_FOLDER_ICON_DRAFTS PIXMAP_PREFIX "qgn_list_messagin_drafts.png" -#define MODEST_FOLDER_ICON_NORMAL PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png" - -#define MODEST_FOLDER_ICON_CONTACTS PIXMAP_PREFIX "qgn_addr_icon_user_group.png" -#define MODEST_FOLDER_ICON_NOTES PIXMAP_PREFIX "qgn_list_messagin_viewer.png" -#define MODEST_FOLDER_ICON_CALENDAR PIXMAP_PREFIX "qgn_widg_datedit.png" +#define MODEST_HEADER_ICON_READ "qgn_list_messagin_mail" +#define MODEST_HEADER_ICON_UNREAD "qgn_list_messagin_mail_unread" +#define MODEST_HEADER_ICON_DELETED "qgn_list_messagin_mail_deleted" +#define MODEST_HEADER_ICON_ATTACH "qgn_list_gene_attacpap" + +#define MODEST_FOLDER_ICON_OPEN "qgn_list_gene_fldr_opn" +#define MODEST_FOLDER_ICON_CLOSED "qgn_list_gene_fldr_cls" + +#define MODEST_FOLDER_ICON_ACCOUNT "qgn_addr_icon_user_group" +#define MODEST_FOLDER_ICON_INBOX "qgn_list_messagin_inbox" +#define MODEST_FOLDER_ICON_OUTBOX "qgn_list_messagin_outbox" +#define MODEST_FOLDER_ICON_SENT "qgn_list_messagin_sent" +#define MODEST_FOLDER_ICON_TRASH "qgn_toolb_messagin_delete" +#define MODEST_FOLDER_ICON_JUNK "qgn_toolb_messagin_delete" +#define MODEST_FOLDER_ICON_DRAFTS "qgn_list_messagin_drafts" +#define MODEST_FOLDER_ICON_NORMAL "qgn_list_gene_fldr_cls" + +#define MODEST_FOLDER_ICON_CONTACTS "qgn_addr_icon_user_group" +#define MODEST_FOLDER_ICON_NOTES "qgn_list_messagin_viewer" +#define MODEST_FOLDER_ICON_CALENDAR "qgn_widg_datedit" /* toolbar */ -#define MODEST_TOOLBAR_ICON_MAIL_SEND PIXMAP_PREFIX "qgn_list_messagin_sent.png" -#define MODEST_TOOLBAR_ICON_NEW_MAIL PIXMAP_PREFIX "qgn_toolb_messagin_new.png" -#define MODEST_TOOLBAR_ICON_SEND_RECEIVE PIXMAP_PREFIX "qgn_toolb_messagin_sendreceive.png" -#define MODEST_TOOLBAR_ICON_REPLY PIXMAP_PREFIX "qgn_toolb_messagin_reply.png" -#define MODEST_TOOLBAR_ICON_REPLY_ALL PIXMAP_PREFIX "qgn_toolb_messagin_replytoall.png" -#define MODEST_TOOLBAR_ICON_FORWARD PIXMAP_PREFIX "qgn_toolb_messagin_forward.png" -#define MODEST_TOOLBAR_ICON_DELETE PIXMAP_PREFIX "qgn_toolb_messagin_delete.png" -#define MODEST_TOOLBAR_ICON_NEXT PIXMAP_PREFIX "forward.png" -#define MODEST_TOOLBAR_ICON_PREV PIXMAP_PREFIX "back.png" -#define MODEST_TOOLBAR_ICON_STOP PIXMAP_PREFIX "stock-stop.svg" - +#define MODEST_TOOLBAR_ICON_MAIL_SEND "qgn_list_messagin_sent" +#define MODEST_TOOLBAR_ICON_NEW_MAIL "qgn_toolb_messagin_new" +#define MODEST_TOOLBAR_ICON_SEND_RECEIVE "qgn_toolb_messagin_sendreceive" +#define MODEST_TOOLBAR_ICON_REPLY "qgn_toolb_messagin_reply" +#define MODEST_TOOLBAR_ICON_REPLY_ALL "qgn_toolb_messagin_replytoall" +#define MODEST_TOOLBAR_ICON_FORWARD "qgn_toolb_messagin_forward" +#define MODEST_TOOLBAR_ICON_DELETE "qgn_toolb_messagin_delete" /* Stock icon names */ #define MODEST_STOCK_MAIL_SEND "modest-stock-mail-send" @@ -88,6 +84,4 @@ #define MODEST_STOCK_PREV "modest-stock-prev" #define MODEST_STOCK_STOP "modest-stock-stop" - - #endif /*__MODEST_TNY_ICON_NAMES_H__*/ diff --git a/src/maemo/pixmaps/back.png b/src/maemo/pixmaps/back.png deleted file mode 100644 index d699776..0000000 Binary files a/src/maemo/pixmaps/back.png and /dev/null differ diff --git a/src/maemo/pixmaps/forward.png b/src/maemo/pixmaps/forward.png deleted file mode 100644 index 3c28925..0000000 Binary files a/src/maemo/pixmaps/forward.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_addr_icon_user_group.png b/src/maemo/pixmaps/qgn_addr_icon_user_group.png deleted file mode 100644 index c5b9f6c..0000000 Binary files a/src/maemo/pixmaps/qgn_addr_icon_user_group.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_gene_attacpap.png b/src/maemo/pixmaps/qgn_list_gene_attacpap.png deleted file mode 100644 index 0448a7d..0000000 Binary files a/src/maemo/pixmaps/qgn_list_gene_attacpap.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_gene_fldr_cls.png b/src/maemo/pixmaps/qgn_list_gene_fldr_cls.png deleted file mode 100644 index 976155c..0000000 Binary files a/src/maemo/pixmaps/qgn_list_gene_fldr_cls.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_gene_fldr_opn.png b/src/maemo/pixmaps/qgn_list_gene_fldr_opn.png deleted file mode 100644 index 2bf04f2..0000000 Binary files a/src/maemo/pixmaps/qgn_list_gene_fldr_opn.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin.png b/src/maemo/pixmaps/qgn_list_messagin.png deleted file mode 100644 index 173f657..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_drafts.png b/src/maemo/pixmaps/qgn_list_messagin_drafts.png deleted file mode 100644 index c16cdcd..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_drafts.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_editor.png b/src/maemo/pixmaps/qgn_list_messagin_editor.png deleted file mode 100644 index c68ef5e..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_editor.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_inbox.png b/src/maemo/pixmaps/qgn_list_messagin_inbox.png deleted file mode 100644 index eb79b09..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_inbox.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_mail.png b/src/maemo/pixmaps/qgn_list_messagin_mail.png deleted file mode 100644 index 4038776..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_mail.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_mail_unread.png b/src/maemo/pixmaps/qgn_list_messagin_mail_unread.png deleted file mode 100644 index 3d15a38..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_mail_unread.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_outbox.png b/src/maemo/pixmaps/qgn_list_messagin_outbox.png deleted file mode 100644 index 2b5a10a..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_outbox.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_sent.png b/src/maemo/pixmaps/qgn_list_messagin_sent.png deleted file mode 100644 index 73c8c27..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_sent.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_list_messagin_viewer.png b/src/maemo/pixmaps/qgn_list_messagin_viewer.png deleted file mode 100644 index 2ee8ca1..0000000 Binary files a/src/maemo/pixmaps/qgn_list_messagin_viewer.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_gene_stop.png b/src/maemo/pixmaps/qgn_toolb_gene_stop.png deleted file mode 100644 index 4b2a753..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_gene_stop.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_gene_stop_pressed.png b/src/maemo/pixmaps/qgn_toolb_gene_stop_pressed.png deleted file mode 100644 index 6c9f918..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_gene_stop_pressed.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin.png b/src/maemo/pixmaps/qgn_toolb_messagin.png deleted file mode 100644 index 4c4899b..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_delete.png b/src/maemo/pixmaps/qgn_toolb_messagin_delete.png deleted file mode 100644 index 0f31b07..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_delete.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_forward.png b/src/maemo/pixmaps/qgn_toolb_messagin_forward.png deleted file mode 100644 index b286238..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_forward.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_new.png b/src/maemo/pixmaps/qgn_toolb_messagin_new.png deleted file mode 100644 index b93921e..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_new.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_reply.png b/src/maemo/pixmaps/qgn_toolb_messagin_reply.png deleted file mode 100644 index 5cdd7c2..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_reply.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_replytoall.png b/src/maemo/pixmaps/qgn_toolb_messagin_replytoall.png deleted file mode 100644 index 78cde69..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_replytoall.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_send.png b/src/maemo/pixmaps/qgn_toolb_messagin_send.png deleted file mode 100644 index 84a3420..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_send.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_toolb_messagin_sendreceive.png b/src/maemo/pixmaps/qgn_toolb_messagin_sendreceive.png deleted file mode 100644 index 0b794cd..0000000 Binary files a/src/maemo/pixmaps/qgn_toolb_messagin_sendreceive.png and /dev/null differ diff --git a/src/maemo/pixmaps/qgn_widg_datedit.png b/src/maemo/pixmaps/qgn_widg_datedit.png deleted file mode 100644 index b942504..0000000 Binary files a/src/maemo/pixmaps/qgn_widg_datedit.png and /dev/null differ diff --git a/src/modest-runtime.c b/src/modest-runtime.c index ef15710..499a8c6 100644 --- a/src/modest-runtime.c +++ b/src/modest-runtime.c @@ -541,6 +541,7 @@ init_stock_icons (void) static gboolean registered = FALSE; if (!registered) { + GtkIconTheme *current_theme; GdkPixbuf *pixbuf; GtkIconFactory *factory; gint i; @@ -580,17 +581,25 @@ init_stock_icons (void) factory = gtk_icon_factory_new (); gtk_icon_factory_add_default (factory); + current_theme = gtk_icon_theme_get_default (); + /* Register icons to accompany stock items */ for (i = 0; i < G_N_ELEMENTS (items); i++) { - pixbuf = NULL; - pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL); +#if MODEST_PLATFORM_ID==1 /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ + pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL); +#else + pixbuf = gtk_icon_theme_load_icon (current_theme, + items_names[i], + 26, + GTK_ICON_LOOKUP_NO_SVG, + NULL); +#endif if (pixbuf != NULL) { GtkIconSet *icon_set; GdkPixbuf *transparent; transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff); - icon_set = gtk_icon_set_new_from_pixbuf (transparent); gtk_icon_factory_add (factory, items[i].stock_id, icon_set); gtk_icon_set_unref (icon_set); diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 5f68032..62904fd 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -258,7 +258,19 @@ get_cached_icon (const gchar *name) MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF); if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key, &pixbuf)) { - pixbuf = (gpointer)gdk_pixbuf_new_from_file (name, &err); + +#if MODEST_PLATFORM_ID==1 /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ + pixbuf = (gpointer) gdk_pixbuf_new_from_file (name, &err); +#else + GtkIconTheme *current_theme; + current_theme = gtk_icon_theme_get_default (); + pixbuf = gtk_icon_theme_load_icon (current_theme, + name, + 26, + GTK_ICON_LOOKUP_NO_SVG, + NULL); +#endif + if (!pixbuf) { g_printerr ("modest: error in icon factory while loading '%s': %s\n", name, err->message); diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 6f07668..f75e9b3 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -475,7 +475,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) static void scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) { -#if MODEST_PLATFORM_ID==1 /* MODES_PLATFORM_ID: 1 ==> gtk, 2==> maemo */ +#if MODEST_PLATFORM_ID==1 /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ GtkTreePath *selected_path; GtkTreePath *start, *end;