Use E_ICON_SIZE_MENU

2004-05-17  Jeffrey Stedfast  <fejj@novell.com>

	* gui/tasks-component.c (add_popup_menu_item): Use
	E_ICON_SIZE_MENU

	* gui/e-timezone-entry.c (e_timezone_entry_init): Use
	E_ICON_SIZE_BUTTON

	* gui/e-itip-control.c (write_error_html): Use E_ICON_SIZE enums.
	(write_html): Same.

	* gui/e-calendar-view.c (e_calendar_view_set_status_message): Use
	E_ICON_SIZE_STATUS
	(setup_popup_icons): Use E_ICON_SIZE_MENU

	* gui/e-calendar-table.c (e_calendar_table_init): Use
	E_ICON_SIZE_LIST rather than a hard-coded value of 16 pixels.
	(e_calendar_table_set_status_message): Use E_ICON_SIZE_STATUS

	* gui/calendar-component.c (add_popup_menu_item): Use
	E_ICON_SIZE_MENU rather than hard-coding the pixel size.

svn path=/trunk/; revision=25934

7 files changed, 36 insertions, 14 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b6ef6d9689..3756c32256 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,25 @@
+2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
+
+	* gui/tasks-component.c (add_popup_menu_item): Use
+	E_ICON_SIZE_MENU
+
+	* gui/e-timezone-entry.c (e_timezone_entry_init): Use
+	E_ICON_SIZE_BUTTON
+
+	* gui/e-itip-control.c (write_error_html): Use E_ICON_SIZE enums.
+	(write_html): Same.
+
+	* gui/e-calendar-view.c (e_calendar_view_set_status_message): Use
+	E_ICON_SIZE_STATUS
+	(setup_popup_icons): Use E_ICON_SIZE_MENU
+
+	* gui/e-calendar-table.c (e_calendar_table_init): Use
+	E_ICON_SIZE_LIST rather than a hard-coded value of 16 pixels.
+	(e_calendar_table_set_status_message): Use E_ICON_SIZE_STATUS
+
+	* gui/calendar-component.c (add_popup_menu_item): Use
+	E_ICON_SIZE_MENU rather than hard-coding the pixel size.
+
 2004-05-17    <jpr@ximian.com>
 
 	Fixes #56373
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 74cd196560..61f0aae690 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -318,7 +318,7 @@ add_popup_menu_item (GtkMenu *menu, const char *label, const char *icon_name,
 		item = gtk_image_menu_item_new_with_label (label);
 
 		/* load the image */
-		pixbuf = e_icon_factory_get_icon (icon_name, 16);
+		pixbuf = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_MENU);
 		image = gtk_image_new_from_pixbuf (pixbuf);
 
 		if (image) {
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 9da8ae43c0..f6622c4de5 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -470,7 +470,7 @@ e_calendar_table_init (ECalendarTable *cal_table)
 
 	if (!icon_pixbufs[0])
 		for (i = 0; i < E_CALENDAR_MODEL_NUM_ICONS; i++) {
-			icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], 16);
+			icon_pixbufs[i] = e_icon_factory_get_icon (icon_names[i], E_ICON_SIZE_LIST);
 		}
 
 	cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs);
@@ -480,7 +480,7 @@ e_calendar_table_init (ECalendarTable *cal_table)
 	e_table_extras_add_cell(extras, "icon", cell);
 	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);
 
-	pixbuf = e_icon_factory_get_icon ("stock_check-filled", 16);
+	pixbuf = e_icon_factory_get_icon ("stock_check-filled", E_ICON_SIZE_LIST);
 	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
 	gdk_pixbuf_unref(pixbuf);
 
@@ -1382,9 +1382,9 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes
 		}
         } else if (cal_table->activity_id == 0) {
                 char *client_id = g_strdup_printf ("%p", cal_table);
-                                 
+		
                 if (progress_icon == NULL)
-                        progress_icon = e_icon_factory_get_icon (EVOLUTION_TASKS_PROGRESS_IMAGE, 16);
+                        progress_icon = e_icon_factory_get_icon (EVOLUTION_TASKS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
 
                 cal_table->activity_id = e_activity_handler_operation_started (cal_table->activity_handler, client_id,
 									       progress_icon, message, TRUE);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 9a752bc910..ecf9924d7e 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -563,7 +563,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag
 		char *client_id = g_strdup_printf ("%p", cal_view);
 
 		if (progress_icon == NULL)
-			progress_icon = e_icon_factory_get_icon (EVOLUTION_CALENDAR_PROGRESS_IMAGE, 16);
+			progress_icon = e_icon_factory_get_icon (EVOLUTION_CALENDAR_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
 
 		priv->activity_id = e_activity_handler_operation_started (priv->activity_handler, client_id, progress_icon, message, TRUE);
 
@@ -1348,22 +1348,22 @@ setup_popup_icons (EPopupMenu *context_menu)
 		else if (!strcmp (context_menu[i].name, _("_Go to Date...")))
 			pixmap_widget = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_MENU);
 		else if (!strcmp (context_menu[i].name, _("New _Appointment..."))) {
-			pixbuf = e_icon_factory_get_icon ("stock_new-appointment", 16);
+			pixbuf = e_icon_factory_get_icon ("stock_new-appointment", E_ICON_SIZE_MENU);
 			pixmap_widget = gtk_image_new_from_pixbuf (pixbuf);
 			gdk_pixbuf_unref (pixbuf);
 		}
 		else if (!strcmp (context_menu[i].name, _("New All Day _Event"))) {
-			pixbuf = e_icon_factory_get_icon ("stock_new-24h-appointment", 16);
+			pixbuf = e_icon_factory_get_icon ("stock_new-24h-appointment", E_ICON_SIZE_MENU);
 			pixmap_widget = gtk_image_new_from_pixbuf (pixbuf);
 			gdk_pixbuf_unref (pixbuf);
 		}
 		else if (!strcmp (context_menu[i].name, _("New Meeting"))) {
-			pixbuf = e_icon_factory_get_icon ("stock_new-meeting", 16);
+			pixbuf = e_icon_factory_get_icon ("stock_new-meeting", E_ICON_SIZE_MENU);
 			pixmap_widget = gtk_image_new_from_pixbuf (pixbuf);
 			gdk_pixbuf_unref (pixbuf);
 		}
 		else if (!strcmp (context_menu[i].name, _("New Task"))) {
-			pixbuf = e_icon_factory_get_icon ("stock_task", 16);
+			pixbuf = e_icon_factory_get_icon ("stock_task", E_ICON_SIZE_MENU);
 			pixmap_widget = gtk_image_new_from_pixbuf (pixbuf);
 			gdk_pixbuf_unref (pixbuf);
 		}
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 13bce78ec9..53dd7fbec6 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -778,7 +778,7 @@ write_error_html (EItipControl *itip, const gchar *itip_err)
 	/* The column for the image */
 	gtk_html_stream_printf (html_stream, "<tr><td width=48 align=\"center\" valign=\"top\" rowspan=\"8\">");
 	/* The image */
-	filename = e_icon_factory_get_icon_filename ("stock_new-meeting", 48);
+	filename = e_icon_factory_get_icon_filename ("stock_new-meeting", E_ICON_SIZE_DIALOG);
 	gtk_html_stream_printf (html_stream, "<img src=\"%s\"></td>", filename);
 	g_free (filename);
 
@@ -837,7 +837,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 	gtk_html_write (GTK_HTML (priv->html), html_stream, const_html, strlen(const_html));
 
 	/* The image */
-	filename = e_icon_factory_get_icon_filename ("stock_new-meeting", 48);
+	filename = e_icon_factory_get_icon_filename ("stock_new-meeting", E_ICON_SIZE_DIALOG);
 	gtk_html_stream_printf (html_stream, "<img src=\"%s\"></td>", filename);
 	g_free (filename);
 
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 78f1c8dd3e..fc95d83a74 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -133,7 +133,7 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 6);
 	gtk_widget_show (priv->button);
 
-	gdk_pixbuf = e_icon_factory_get_icon ("stock_timezone", 16);
+	gdk_pixbuf = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_BUTTON);
 	gtk_image = gtk_image_new_from_pixbuf (gdk_pixbuf);
 	gtk_container_add (GTK_CONTAINER (priv->button), gtk_image);
 	gtk_widget_show (gtk_image);
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 60559f825a..054ed3fe62 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -251,7 +251,7 @@ add_popup_menu_item (GtkMenu *menu, const char *label, const char *icon_name,
 		item = gtk_image_menu_item_new_with_label (label);
 
 		/* load the image */
-		pixbuf = e_icon_factory_get_icon (icon_name, 16);
+		pixbuf = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_MENU);
 		image = gtk_image_new_from_pixbuf (pixbuf);
 
 		if (image) {