From 2393a5d17e92435cb3d7726b04ff6f4a5c27c8db Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 May 2009 11:54:43 -0400 Subject: Eliminate redundant E_ICON_SIZE_* enumeration. --- e-util/e-icon-factory.c | 81 +++++++++---------------------------------------- e-util/e-icon-factory.h | 35 ++++++--------------- 2 files changed, 24 insertions(+), 92 deletions(-) (limited to 'e-util') diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 7e9cf4cad7..299dfff6f5 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -166,27 +166,6 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) return icon_new (icon_key, pixbuf); } -static GtkIconSize -e_icon_size_to_gtk_icon_size (guint size) -{ - switch (size) { - case E_ICON_SIZE_MENU: - return GTK_ICON_SIZE_MENU; - case E_ICON_SIZE_BUTTON: - return GTK_ICON_SIZE_BUTTON; - case E_ICON_SIZE_SMALL_TOOLBAR: - return GTK_ICON_SIZE_SMALL_TOOLBAR; - case E_ICON_SIZE_LARGE_TOOLBAR: - return GTK_ICON_SIZE_LARGE_TOOLBAR; - case E_ICON_SIZE_DND: - return GTK_ICON_SIZE_DND; - case E_ICON_SIZE_DIALOG: - return GTK_ICON_SIZE_DIALOG; - default: - g_assert_not_reached (); - } -} - static void icon_theme_changed_cb (GtkIconTheme *icon_theme, gpointer user_data) { @@ -250,48 +229,35 @@ e_icon_factory_shutdown (void) /** * e_icon_factory_get_icon_filename: * @icon_name: name of the icon - * @size: MENU/SMALL_TOOLBAR/etc + * @size: size of the icon * * Looks up the icon to use based on name and size. * * Returns the requested icon pixbuf. **/ -char * -e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) +gchar * +e_icon_factory_get_icon_filename (const gchar *icon_name, + GtkIconSize icon_size) { + GtkIconTheme *icon_theme; GtkIconInfo *icon_info; - char *filename; + gchar *filename = NULL; gint width, height; g_return_val_if_fail (icon_name != NULL, NULL); - g_return_val_if_fail (strcmp (icon_name, ""), NULL); - - if (icon_size >= E_ICON_NUM_SIZES) { - g_critical ( - "calling %s with unknown icon_size value (%d)", - G_STRFUNC, icon_size); - /* if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1)*/ - return NULL; - } - if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), - e_icon_size_to_gtk_icon_size (icon_size), - &width, &height)) - return NULL; + icon_theme = gtk_icon_theme_get_default (); - d(g_message ("Size is %d", icon_size)); - d(g_message ("looking up %s at %dx%d", icon_name, width, height)); + if (!gtk_icon_size_lookup (icon_size, &width, &height)) + return NULL; - g_static_mutex_lock (&mutex); icon_info = gtk_icon_theme_lookup_icon ( icon_theme, icon_name, height, 0); if (icon_info != NULL) { filename = g_strdup ( gtk_icon_info_get_filename (icon_info)); gtk_icon_info_free (icon_info); - } else - filename = NULL; - g_static_mutex_unlock (&mutex); + } return filename; } @@ -300,7 +266,7 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) /** * e_icon_factory_get_icon: * @icon_name: name of the icon - * @icon_size: size of the icon (one of the E_ICON_SIZE_* enum values) + * @icon_size: size of the icon * * Returns the specified icon of the requested size (may perform * scaling to achieve this). If @icon_name is a full path, that file @@ -311,38 +277,21 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) * requested icon, then a "broken-image" icon is returned. **/ GdkPixbuf * -e_icon_factory_get_icon (const char *icon_name, int icon_size) +e_icon_factory_get_icon (const gchar *icon_name, + GtkIconSize icon_size) { GdkPixbuf *pixbuf; char *icon_key; Icon *icon; int size, width, height; - if (icon_size >= E_ICON_NUM_SIZES) { - g_critical ( - "calling %s with unknown icon_size value (%d)", - G_STRFUNC, icon_size); - /*if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1) */ - return NULL; - } + g_return_val_if_fail (icon_name != NULL, NULL); - if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), - e_icon_size_to_gtk_icon_size (icon_size), - &width, &height)) + if (!gtk_icon_size_lookup (icon_size, &width, &height)) return NULL; - d(g_message ("Size is %d", icon_size)); - d(g_message ("looking up %s at %dx%d", icon_name, width, height)); - size = height; - if (icon_name == NULL || !strcmp (icon_name, "")) { - if (size >= 24) - return gdk_pixbuf_scale_simple (broken24_pixbuf, size, size, GDK_INTERP_NEAREST); - else - return gdk_pixbuf_scale_simple (broken16_pixbuf, size, size, GDK_INTERP_NEAREST); - } - icon_key = g_alloca (strlen (icon_name) + 7); sprintf (icon_key, "%dx%d/%s", size, size, icon_name); diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index f8d1fc2fc7..c864b1be8e 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -26,31 +26,14 @@ #include -enum { - E_ICON_SIZE_MENU, - E_ICON_SIZE_BUTTON, - E_ICON_SIZE_SMALL_TOOLBAR, - E_ICON_SIZE_LARGE_TOOLBAR, - E_ICON_SIZE_DND, - E_ICON_SIZE_DIALOG, - E_ICON_NUM_SIZES -}; - -/* standard size for list/tree widgets (16x16) */ -#define E_ICON_SIZE_LIST E_ICON_SIZE_MENU - -/* standard size for status bar icons (16x16) */ -#define E_ICON_SIZE_STATUS E_ICON_SIZE_MENU - - - -void e_icon_factory_init (void); -void e_icon_factory_shutdown (void); - -char *e_icon_factory_get_icon_filename (const char *icon_name, int icon_size); - -GdkPixbuf *e_icon_factory_get_icon (const char *icon_name, int icon_size); - -GdkPixbuf *e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, int width, int height); +void e_icon_factory_init (void); +void e_icon_factory_shutdown (void); +gchar * e_icon_factory_get_icon_filename(const gchar *icon_name, + GtkIconSize icon_size); +GdkPixbuf * e_icon_factory_get_icon (const gchar *icon_name, + GtkIconSize icon_size); +GdkPixbuf * e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, + gint width, + gint height); #endif /* _E_ICON_FACTORY_H_ */ -- cgit