callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Same.

Browse Source 
2004-04-19  Jeffrey Stedfast  <fejj@ximian.com>

	* message-tag-followup.c (construct): Same.

	* message-list.c (message_list_init_images): Same.

	* mail-send-recv.c (build_dialog): Same.

	* mail-mt.c (do_op_status): Same.

	* mail-config-druid.c (evolution_mail_config_wizard_new): Same.

	* em-popup.c (em_popup_create_menu): Same.

	* em-format-html-display.c (efhd_format_prefix): Same.

	* em-format-html.c (efh_format_secure): Same as below.

	* em-folder-tree.c (render_pixbuf): Don't use absolute icon sizes,
	use the e-icon-factory enums.

svn path=/trunk/; revision=25527
This commit is contained in:
Jeffrey Stedfast
2004-04-19 21:45:14 +00:00
committed by Jeffrey Stedfast
parent 6a49b78893
commit e739391cce
11 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mail/ChangeLog
View File

@ -1,3 +1,24 @@
2004-04-19 Jeffrey Stedfast <fejj@ximian.com>
* message-tag-followup.c (construct): Same.
* message-list.c (message_list_init_images): Same.
* mail-send-recv.c (build_dialog): Same.
* mail-mt.c (do_op_status): Same.
* mail-config-druid.c (evolution_mail_config_wizard_new): Same.
* em-popup.c (em_popup_create_menu): Same.
* em-format-html-display.c (efhd_format_prefix): Same.
* em-format-html.c (efh_format_secure): Same as below.
* em-folder-tree.c (render_pixbuf): Don't use absolute icon sizes,
use the e-icon-factory enums.
2004-04-19 Jeffrey Stedfast <fejj@ximian.com>
* em-composer-prefs.h: Removed variables that got re-added with

2
mail/em-composer-prefs.c
View File

@ -100,7 +100,7 @@ em_composer_prefs_class_init (EMComposerPrefsClass *klass)
static void
em_composer_prefs_init (EMComposerPrefs *prefs)
{
prefs->enabled_pixbuf = e_icon_factory_get_icon ("stock_mark", 16);
prefs->enabled_pixbuf = e_icon_factory_get_icon ("stock_mark", E_ICON_SIZE_MENU);
prefs->sig_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
}

10
mail/em-folder-tree.c
View File

@ -258,11 +258,11 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
char *path;
if (!initialised) {
folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", 16);
folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", 16);
folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", 16);
folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_delete", 16);
folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", 16);
folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU);
folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU);
initialised = TRUE;
}

6
mail/em-format-html-display.c
View File

@ -844,8 +844,8 @@ efhd_xpkcs7mime_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje
/* FIXME: need to have it based on encryption and signing too */
name = smime_sign_table[po->valid->sign.status].icon;
pixbuf = e_icon_factory_get_icon (name, 24);
pixbuf = e_icon_factory_get_icon (name, E_ICON_SIZE_LARGE_TOOLBAR);
icon = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref(pixbuf);
gtk_widget_show(icon);
@ -977,7 +977,7 @@ static void efhd_format_prefix(EMFormat *emf, CamelStream *stream)
camel_stream_printf(stream, "<table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
comp = camel_folder_get_message_user_tag(emf->folder, emf->uid, "completed-on");
iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_flag-for-followup-done" : "stock_flag-for-followup", 16);
iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_flag-for-followup-done" : "stock_flag-for-followup", E_ICON_SIZE_MENU);
if (iconpath) {
CamelMimePart *iconpart;

2
mail/em-format-html.c
View File

@ -604,7 +604,7 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
classid = g_strdup_printf("smime:///em-format-html/%s/icon/signed", emf->part_id->str);
camel_stream_printf(stream, "<td valign=\"top\"><img src=\"%s\"></td><td valign=\"top\" width=\"100%%\">", classid);
iconpath = e_icon_factory_get_icon_filename (smime_sign_table[valid->sign.status].icon, 48);
iconpath = e_icon_factory_get_icon_filename (smime_sign_table[valid->sign.status].icon, E_ICON_SIZE_DIALOG);
iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", iconpath);
if (iconpart) {
(void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);

4
mail/em-popup.c
View File

@ -295,8 +295,8 @@ em_popup_create_menu(EMPopup *emp, guint32 hide_mask, guint32 disable_mask)
if (item->image) {
GdkPixbuf *pixbuf;
GtkWidget *image;
pixbuf = e_icon_factory_get_icon ((char *)item->image, 16);
pixbuf = e_icon_factory_get_icon ((char *)item->image, E_ICON_SIZE_MENU);
image = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);

4
mail/mail-config-druid.c
View File

@ -621,7 +621,7 @@ mail_config_druid_new (void)
for (i = 0; i < num_wizard_pages; i++) {
page = glade_xml_get_widget (mcw->gui->xml,
wizard_pages[i].page_name);
icon = e_icon_factory_get_icon (wizard_pages[i].icon_name, 48);
icon = e_icon_factory_get_icon (wizard_pages[i].icon_name, E_ICON_SIZE_DIALOG);
gnome_druid_page_standard_set_logo (GNOME_DRUID_PAGE_STANDARD (page), icon);
g_object_unref (icon);
g_ptr_array_add (mcw->interior_pages, page);
@ -748,7 +748,7 @@ evolution_mail_config_wizard_new (void)
wizard = evolution_wizard_new ();
for (i = 0; i < MAIL_CONFIG_WIZARD_NUM_PAGES; i++) {
icon = e_icon_factory_get_icon (wizard_pages[i].icon_name, 48);
icon = e_icon_factory_get_icon (wizard_pages[i].icon_name, E_ICON_SIZE_DIALOG);
evolution_wizard_add_page (wizard, _(wizard_pages[i].title),
icon, get_page (mcw->gui->xml, i));
g_object_unref (icon);

2
mail/mail-mt.c
View File

@ -892,7 +892,7 @@ static void do_op_status(struct _mail_msg *mm)
data->activity_state = 1;
if (progress_icon == NULL)
progress_icon = e_icon_factory_get_icon ("stock_mail-unread", 16);
progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
MAIL_MT_UNLOCK (mail_msg_lock);
if (msg->ops->describe_msg)

4
mail/mail-send-recv.c
View File

@ -397,7 +397,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
} else if (info->timeout_id == 0)
info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
pixbuf = e_icon_factory_get_icon ("stock_mail-receive", 24);
pixbuf = e_icon_factory_get_icon ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR);
recv_icon = gtk_image_new_from_pixbuf (pixbuf);
gdk_pixbuf_unref (pixbuf);
@ -452,7 +452,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
} else if (info->timeout_id == 0)
info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
pixbuf = e_icon_factory_get_icon ("stock_mail-send", 24);
pixbuf = e_icon_factory_get_icon ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
send_icon = gtk_image_new_from_pixbuf (pixbuf);
gdk_pixbuf_unref (pixbuf);

5
mail/message-list.c
View File

@ -1227,9 +1227,8 @@ message_list_init_images (void)
if (states_pixmaps [0].pixbuf)
return;
for (i = 0; states_pixmaps [i].icon_name; i++){
states_pixmaps [i].pixbuf = e_icon_factory_get_icon (states_pixmaps [i].icon_name, 16);
}
for (i = 0; states_pixmaps[i].icon_name; i++)
states_pixmaps[i].pixbuf = e_icon_factory_get_icon (states_pixmaps[i].icon_name, E_ICON_SIZE_MENU);
}
static char *

2
mail/message-tag-followup.c
View File

@ -302,7 +302,7 @@ construct (MessageTagEditor *editor)
gtk_box_set_child_packing (GTK_BOX (GTK_DIALOG (editor)->vbox), widget, TRUE, TRUE, 6, GTK_PACK_START);
widget = glade_xml_get_widget (gui, "pixmap");
pixbuf = e_icon_factory_get_icon ("stock_mail-flag-for-followup", 48);
pixbuf = e_icon_factory_get_icon ("stock_mail-flag-for-followup", E_ICON_SIZE_DIALOG);
gtk_image_set_from_pixbuf ((GtkImage *)widget, pixbuf);
g_object_unref (pixbuf);