Attachment #176207 for bug #308959

View | Details | Raw Unified | Return to bug 308959
Collapse All | Expand All

Lines 218-224 static EMFBSearchBarItem temp_view_items Link Here

(-)mail/em-folder-browser.c (-1 / +1 lines)
218	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},	218	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
219	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},	219	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
220	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},	220	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
221	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"},	221	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
222	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},	222	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
223	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},	223	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"},
224	/* { NULL, 0, NULL }, */	224	/* { NULL, 0, NULL }, */

Lines 223-229 static struct { Link Here

(-)mail/message-list.c (-1 / +1 lines)
223	{ "stock_mail-unread-multiple", NULL },	223	{ "stock_mail-unread-multiple", NULL },
224	{ "stock_mail-open-multiple", NULL },	224	{ "stock_mail-open-multiple", NULL },
225	{ NULL, NULL },	225	{ NULL, NULL },
226	{ "stock_attach", NULL },	226	{ "mail-attachment", NULL },
227	{ "emblem-important", NULL },	227	{ "emblem-important", NULL },
228	{ "stock_score-lowest", NULL },	228	{ "stock_score-lowest", NULL },
229	{ "stock_score-lower", NULL },	229	{ "stock_score-lower", NULL },




};

static EPixmap pixcache [] = {
	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
	
/*	E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */
	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),

	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
	expander_hbox = gtk_hbox_new (FALSE, 0);
	
	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);





		attachment = priv->attachments->pdata[i];
		
		if (!attachment->is_available_local || !attachment->body) {
			if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
			if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
				g_object_unref (pixbuf);
			}

			pixbuf = e_icon_for_mime_type (mime_type, 48);
			if (pixbuf == NULL) {
				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
				pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
			}
			g_free (mime_type);
		}

Lines 1419-1425 e_day_view_realize (GtkWidget *widget) Link Here

(-)calendar/gui/e-day-view.c (-2 / +2 lines)
1419	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);	1419	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
1420	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);	1420	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
1421	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);	1421	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
1422	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);	1422	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
1423		1423
1424		1424
1425	/* Set the canvas item colors. */	1425	/* Set the canvas item colors. */
Lines 1493-1499 e_day_view_realize (GtkWidget *widget) Link Here
1493	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);	1493	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
1494	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);	1494	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
1495	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);	1495	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
1496	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);	1496	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
1497		1497
1498		1498
1499	/* Set the canvas item colors. */	1499	/* Set the canvas item colors. */

Lines 693-699 e_week_view_realize (GtkWidget *widget) Link Here

(-)calendar/gui/e-week-view.c (-1 / +1 lines)
693	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);	693	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
694	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);	694	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
695	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);	695	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
696	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);	696	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
697	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);	697	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
698	}	698	}
699		699

Lines 1487-1494 Link Here

(-)calendar/gui/dialogs/comp-editor.c (-3 / +3 lines)
1487	};	1487	};
1488		1488
1489	static EPixmap pixmaps[] = {	1489	static EPixmap pixmaps[] = {
1490	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),	1490	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
1491	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),	1491	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
1492	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),	1492	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
1493		1493
1494	E_PIXMAP_END	1494	E_PIXMAP_END
Lines 1548-1554 Link Here
1548	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);	1548	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
1549	expander_hbox = gtk_hbox_new (FALSE, 0);	1549	expander_hbox = gtk_hbox_new (FALSE, 0);
1550		1550
1551	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);	1551	attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
1552	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);	1552	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
1553	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);	1553	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
1554	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);	1554	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);

Return to bug 308959

Lines 281-288 update (EAttachmentBar *bar) Link Here

(-)widgets/misc/e-attachment-bar.c (-4 / +2 lines)
281	attachment = priv->attachments->pdata[i];	281	attachment = priv->attachments->pdata[i];
282		282
283	if (!attachment->is_available_local \|\| !attachment->body) {	283	if (!attachment->is_available_local \|\| !attachment->body) {
284	/* stock_attach would be better, but its fugly scaled up */	284	if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
285	if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) {
286	attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");	285	attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
287	g_object_unref (pixbuf);	286	g_object_unref (pixbuf);
288	}	287	}
Lines 373-380 update (EAttachmentBar *bar) Link Here
373	pixbuf = e_icon_for_mime_type (mime_type, 48);	372	pixbuf = e_icon_for_mime_type (mime_type, 48);
374	if (pixbuf == NULL) {	373	if (pixbuf == NULL) {
375	g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);	374	g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
376	/* stock_attach would be better, but its fugly scaled up */	375	pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
377	pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG);
378	}	376	}
379	g_free (mime_type);	377	g_free (mime_type);
380	}	378	}

Lines 2208-2218 static BonoboUIVerb verbs [] = { Link Here

(-)composer/e-msg-composer.c (-3 / +3 lines)
2208	};	2208	};
2209		2209
2210	static EPixmap pixcache [] = {	2210	static EPixmap pixcache [] = {
2211	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),	2211	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
2212	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),	2212	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
2213	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,	2213	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
2214		2214
2215	/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */	2215	/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */
2216	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),	2216	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
2217	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),	2217	E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU),
2218	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),	2218	E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU),
Lines 3989-3995 create_composer (int visible_mask) Link Here
3989	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);	3989	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
3990	expander_hbox = gtk_hbox_new (FALSE, 0);	3990	expander_hbox = gtk_hbox_new (FALSE, 0);
3991		3991
3992	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);	3992	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
3993	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);	3993	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
3994	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);	3994	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);
3995		3995