[PATCH] fix spinner sizing
- From: Christian Persch <chpe gnome org>
- To: nautilus-list gnome org
- Subject: [PATCH] fix spinner sizing
- Date: Tue, 17 Oct 2006 23:10:56 +0200
Hi,
attached patch fixes the spinner sizing bug with the new
gnome-icon-theme icons
[http://bugzilla.gnome.org/show_bug.cgi?id=330417] by using the spinner
code from Epiphany which was already fixed and which is also used by
Gedit and Baobab.
Regards,
Christian
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/src/Makefile.am,v
retrieving revision 1.164
diff -p -u -B -r1.164 Makefile.am
--- src/Makefile.am 16 Jun 2006 15:40:18 -0000 1.164
+++ src/Makefile.am 17 Oct 2006 21:07:09 -0000
@@ -52,6 +52,8 @@ nautilus_shell_interface_idl_sources =
nautilus_SOURCES = \
$(nautilus_shell_interface_idl_sources) \
+ ephy-spinner.h \
+ ephy-spinner.c \
nautilus-actions.h \
nautilus-application.c \
nautilus-application.h \
Index: src/ephy-spinner.c
===================================================================
RCS file: src/ephy-spinner.c
diff -N src/ephy-spinner.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ephy-spinner.c 17 Oct 2006 21:07:09 -0000
@@ -0,0 +1,1007 @@
+/*
+ * Copyright © 2000 Eazel, Inc.
+ * Copyright © 2002-2004 Marco Pesenti Gritti
+ * Copyright © 2004, 2006 Christian Persch
+ *
+ * Nautilus is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Nautilus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Andy Hertzfeld <andy eazel com>
+ *
+ * Ephy port by Marco Pesenti Gritti <marco it gnome org>
+ *
+ * $Id: ephy-spinner.c,v 1.46 2006/10/17 20:32:46 chpe Exp $
+ */
+
+#include "config.h"
+
+#include "ephy-spinner.h"
+
+/* #include "ephy-debug.h" */
+#define LOG(msg, args...)
+#define START_PROFILER(name)
+#define STOP_PROFILER(name)
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtkicontheme.h>
+#include <gtk/gtkiconfactory.h>
+#include <gtk/gtksettings.h>
+
+/* Spinner cache implementation */
+
+#define EPHY_TYPE_SPINNER_CACHE (ephy_spinner_cache_get_type())
+#define EPHY_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EPHY_TYPE_SPINNER_CACHE, EphySpinnerCache))
+#define EPHY_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EPHY_TYPE_SPINNER_CACHE, EphySpinnerCacheClass))
+#define EPHY_IS_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EPHY_TYPE_SPINNER_CACHE))
+#define EPHY_IS_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EPHY_TYPE_SPINNER_CACHE))
+#define EPHY_SPINNER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_SPINNER_CACHE, EphySpinnerCacheClass))
+
+typedef struct _EphySpinnerCache EphySpinnerCache;
+typedef struct _EphySpinnerCacheClass EphySpinnerCacheClass;
+typedef struct _EphySpinnerCachePrivate EphySpinnerCachePrivate;
+
+struct _EphySpinnerCacheClass
+{
+ GObjectClass parent_class;
+};
+
+struct _EphySpinnerCache
+{
+ GObject parent_object;
+
+ /*< private >*/
+ EphySpinnerCachePrivate *priv;
+};
+
+#define EPHY_SPINNER_CACHE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SPINNER_CACHE, EphySpinnerCachePrivate))
+
+struct _EphySpinnerCachePrivate
+{
+ /* Hash table of GdkScreen -> EphySpinnerCacheData */
+ GHashTable *hash;
+};
+
+typedef struct
+{
+ guint ref_count;
+ GtkIconSize size;
+ int width;
+ int height;
+ GdkPixbuf *quiescent_pixbuf;
+ GdkPixbuf **animation_pixbufs;
+ guint n_animation_pixbufs;
+} EphySpinnerImages;
+
+#define LAST_ICON_SIZE GTK_ICON_SIZE_DIALOG + 1
+#define SPINNER_ICON_NAME "gnome-spinner"
+#define SPINNER_REST_ICON_NAME "gnome-spinner-rest"
+#define EPHY_SPINNER_IMAGES_INVALID ((EphySpinnerImages *) 0x1)
+
+typedef struct
+{
+ GdkScreen *screen;
+ GtkIconTheme *icon_theme;
+ EphySpinnerImages *images[LAST_ICON_SIZE];
+} EphySpinnerCacheData;
+
+static void ephy_spinner_cache_class_init (EphySpinnerCacheClass *klass);
+static void ephy_spinner_cache_init (EphySpinnerCache *cache);
+
+static GObjectClass *ephy_spinner_cache_parent_class;
+
+static GType
+ephy_spinner_cache_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ {
+ const GTypeInfo our_info =
+ {
+ sizeof (EphySpinnerCacheClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) ephy_spinner_cache_class_init,
+ NULL,
+ NULL,
+ sizeof (EphySpinnerCache),
+ 0,
+ (GInstanceInitFunc) ephy_spinner_cache_init
+ };
+
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "EphySpinnerCache",
+ &our_info, 0);
+ }
+
+ return type;
+}
+
+static EphySpinnerImages *
+ephy_spinner_images_ref (EphySpinnerImages *images)
+{
+ g_return_val_if_fail (images != NULL, NULL);
+
+ images->ref_count++;
+
+ return images;
+}
+
+static void
+ephy_spinner_images_unref (EphySpinnerImages *images)
+{
+ g_return_if_fail (images != NULL);
+
+ images->ref_count--;
+ if (images->ref_count == 0)
+ {
+ guint i;
+
+ LOG ("Freeing spinner images %p for size %d", images, images->size);
+
+ for (i = 0; i < images->n_animation_pixbufs; ++i)
+ {
+ g_object_unref (images->animation_pixbufs[i]);
+ }
+ g_free (images->animation_pixbufs);
+
+ g_object_unref (images->quiescent_pixbuf);
+
+ g_free (images);
+ }
+}
+
+static void
+ephy_spinner_cache_data_unload (EphySpinnerCacheData *data)
+{
+ GtkIconSize size;
+ EphySpinnerImages *images;
+
+ g_return_if_fail (data != NULL);
+
+ LOG ("EphySpinnerDataCache unload for screen %p", data->screen);
+
+ for (size = GTK_ICON_SIZE_INVALID; size < LAST_ICON_SIZE; ++size)
+ {
+ images = data->images[size];
+ data->images[size] = NULL;
+
+ if (images != NULL && images != EPHY_SPINNER_IMAGES_INVALID)
+ {
+ ephy_spinner_images_unref (images);
+ }
+ }
+}
+
+static GdkPixbuf *
+extract_frame (GdkPixbuf *grid_pixbuf,
+ int x,
+ int y,
+ int size)
+{
+ GdkPixbuf *pixbuf;
+
+ if (x + size > gdk_pixbuf_get_width (grid_pixbuf) ||
+ y + size > gdk_pixbuf_get_height (grid_pixbuf))
+ {
+ return NULL;
+ }
+
+ pixbuf = gdk_pixbuf_new_subpixbuf (grid_pixbuf,
+ x, y,
+ size, size);
+ g_return_val_if_fail (pixbuf != NULL, NULL);
+
+ return pixbuf;
+}
+
+static GdkPixbuf *
+scale_to_size (GdkPixbuf *pixbuf,
+ int dw,
+ int dh)
+{
+ GdkPixbuf *result;
+ int pw, ph;
+
+ g_return_val_if_fail (pixbuf != NULL, NULL);
+
+ pw = gdk_pixbuf_get_width (pixbuf);
+ ph = gdk_pixbuf_get_height (pixbuf);
+
+ if (pw != dw || ph != dh)
+ {
+ result = gdk_pixbuf_scale_simple (pixbuf, dw, dh,
+ GDK_INTERP_BILINEAR);
+ g_object_unref (pixbuf);
+ return result;
+ }
+
+ return pixbuf;
+}
+
+static EphySpinnerImages *
+ephy_spinner_images_load (GdkScreen *screen,
+ GtkIconTheme *icon_theme,
+ GtkIconSize icon_size)
+{
+ EphySpinnerImages *images;
+ GdkPixbuf *rest_pixbuf = NULL;
+ GdkPixbuf *icon_pixbuf, *pixbuf;
+ GtkIconInfo *icon_info = NULL;
+ int grid_width, grid_height, x, y, requested_size, size, isw, ish, n;
+ const char *icon;
+ GSList *list = NULL, *l;
+
+ LOG ("EphySpinnerCacheData loading for screen %p at size %d", screen, icon_size);
+
+ START_PROFILER ("loading spinner animation")
+
+ if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
+ icon_size, &isw, &ish)) goto loser;
+
+ requested_size = MAX (ish, isw);
+
+ /* Load the rest icon */
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+ SPINNER_REST_ICON_NAME,
+ requested_size, 0);
+ if (icon_info == NULL)
+ {
+ g_warning ("Throbber rest icon not found");
+ goto loser;
+ }
+
+ size = gtk_icon_info_get_base_size (icon_info);
+ icon = gtk_icon_info_get_filename (icon_info);
+ if (icon == NULL) goto loser;
+
+ rest_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
+ gtk_icon_info_free (icon_info);
+ icon_info = NULL;
+
+ if (rest_pixbuf == NULL)
+ {
+ g_warning ("Could not load spinner rest icon");
+ goto loser;
+ }
+
+ if (size > requested_size)
+ {
+ rest_pixbuf = scale_to_size (rest_pixbuf, isw, ish);
+ }
+
+ /* Load the animation */
+ icon_info = gtk_icon_theme_lookup_icon (icon_theme,
+ SPINNER_ICON_NAME,
+ requested_size, 0);
+ if (icon_info == NULL)
+ {
+ g_warning ("Throbber animation not found");
+ goto loser;
+ }
+
+ size = gtk_icon_info_get_base_size (icon_info);
+ icon = gtk_icon_info_get_filename (icon_info);
+ if (icon == NULL) goto loser;
+
+ icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
+ gtk_icon_info_free (icon_info);
+ icon_info = NULL;
+
+ if (icon_pixbuf == NULL)
+ {
+ g_warning ("Could not load the spinner file");
+ goto loser;
+ }
+
+ grid_width = gdk_pixbuf_get_width (icon_pixbuf);
+ grid_height = gdk_pixbuf_get_height (icon_pixbuf);
+
+ n = 0;
+ for (y = 0; y < grid_height; y += size)
+ {
+ for (x = 0; x < grid_width ; x += size)
+ {
+ pixbuf = extract_frame (icon_pixbuf, x, y, size);
+
+ if (pixbuf)
+ {
+ list = g_slist_prepend (list, pixbuf);
+ ++n;
+ }
+ else
+ {
+ g_warning ("Cannot extract frame (%d, %d) from the grid\n", x, y);
+ }
+ }
+ }
+
+ g_object_unref (icon_pixbuf);
+
+ if (list == NULL) goto loser;
+ g_assert (n > 0);
+
+ if (size > requested_size)
+ {
+ for (l = list; l != NULL; l = l->next)
+ {
+ l->data = scale_to_size (l->data, isw, ish);
+ }
+ }
+
+ /* Now we've successfully got all the data */
+ images = g_new (EphySpinnerImages, 1);
+ images->ref_count = 1;
+
+ images->size = icon_size;
+ images->width = images->height = requested_size;
+ images->quiescent_pixbuf = rest_pixbuf;
+
+ images->n_animation_pixbufs = n;
+ images->animation_pixbufs = g_new (GdkPixbuf *, n);
+
+ for (l = list; l != NULL; l = l->next)
+ {
+ images->animation_pixbufs[--n] = l->data;
+ }
+ g_assert (n == 0);
+
+ g_slist_free (list);
+
+ STOP_PROFILER ("loading spinner animation")
+
+ return images;
+
+loser:
+ if (icon_info)
+ {
+ gtk_icon_info_free (icon_info);
+ }
+ if (rest_pixbuf)
+ {
+ g_object_unref (rest_pixbuf);
+ }
+ g_slist_foreach (list, (GFunc) g_object_unref, NULL);
+
+ STOP_PROFILER ("loading spinner animation")
+
+ return NULL;
+}
+
+static EphySpinnerCacheData *
+ephy_spinner_cache_data_new (GdkScreen *screen)
+{
+ EphySpinnerCacheData *data;
+
+ data = g_new0 (EphySpinnerCacheData, 1);
+
+ data->screen = screen;
+ data->icon_theme = gtk_icon_theme_get_for_screen (screen);
+ g_signal_connect_swapped (data->icon_theme, "changed",
+ G_CALLBACK (ephy_spinner_cache_data_unload),
+ data);
+
+ return data;
+}
+
+static void
+ephy_spinner_cache_data_free (EphySpinnerCacheData *data)
+{
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (data->icon_theme != NULL);
+
+ g_signal_handlers_disconnect_by_func
+ (data->icon_theme,
+ G_CALLBACK (ephy_spinner_cache_data_unload), data);
+
+ ephy_spinner_cache_data_unload (data);
+
+ g_free (data);
+}
+
+static EphySpinnerImages *
+ephy_spinner_cache_get_images (EphySpinnerCache *cache,
+ GdkScreen *screen,
+ GtkIconSize icon_size)
+{
+ EphySpinnerCachePrivate *priv = cache->priv;
+ EphySpinnerCacheData *data;
+ EphySpinnerImages *images;
+
+ LOG ("Getting animation images for screen %p at size %d", screen, icon_size);
+
+ g_return_val_if_fail (icon_size >= 0 && icon_size < LAST_ICON_SIZE, NULL);
+
+ /* Backward compat: "invalid" meant "native" size which doesn't exist anymore */
+ if (icon_size == GTK_ICON_SIZE_INVALID)
+ {
+ icon_size = GTK_ICON_SIZE_DIALOG;
+ }
+
+ data = g_hash_table_lookup (priv->hash, screen);
+ if (data == NULL)
+ {
+ data = ephy_spinner_cache_data_new (screen);
+ /* FIXME: think about what happens when the screen's display is closed later on */
+ g_hash_table_insert (priv->hash, screen, data);
+ }
+
+ images = data->images[icon_size];
+ if (images == EPHY_SPINNER_IMAGES_INVALID)
+ {
+ /* Load failed, but don't try endlessly again! */
+ return NULL;
+ }
+
+ if (images != NULL)
+ {
+ /* Return cached data */
+ return ephy_spinner_images_ref (images);
+ }
+
+ images = ephy_spinner_images_load (screen, data->icon_theme, icon_size);
+
+ if (images == NULL)
+ {
+ /* Mark as failed-to-load */
+ data->images[icon_size] = EPHY_SPINNER_IMAGES_INVALID;
+
+ return NULL;
+ }
+
+ data->images[icon_size] = images;
+
+ return ephy_spinner_images_ref (images);
+}
+
+static void
+ephy_spinner_cache_init (EphySpinnerCache *cache)
+{
+ EphySpinnerCachePrivate *priv;
+
+ priv = cache->priv = EPHY_SPINNER_CACHE_GET_PRIVATE (cache);
+
+ LOG ("EphySpinnerCache initialising");
+
+ priv->hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+ NULL,
+ (GDestroyNotify) ephy_spinner_cache_data_free);
+}
+
+static void
+ephy_spinner_cache_finalize (GObject *object)
+{
+ EphySpinnerCache *cache = EPHY_SPINNER_CACHE (object);
+ EphySpinnerCachePrivate *priv = cache->priv;
+
+ g_hash_table_destroy (priv->hash);
+
+ LOG ("EphySpinnerCache finalised");
+
+ G_OBJECT_CLASS (ephy_spinner_cache_parent_class)->finalize (object);
+}
+
+static void
+ephy_spinner_cache_class_init (EphySpinnerCacheClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ ephy_spinner_cache_parent_class = g_type_class_peek_parent (klass);
+
+ object_class->finalize = ephy_spinner_cache_finalize;
+
+ g_type_class_add_private (object_class, sizeof (EphySpinnerCachePrivate));
+}
+
+static EphySpinnerCache *spinner_cache = NULL;
+
+static EphySpinnerCache *
+ephy_spinner_cache_ref (void)
+{
+ if (spinner_cache == NULL)
+ {
+ EphySpinnerCache **cache_ptr;
+
+ spinner_cache = g_object_new (EPHY_TYPE_SPINNER_CACHE, NULL);
+ cache_ptr = &spinner_cache;
+ g_object_add_weak_pointer (G_OBJECT (spinner_cache),
+ (gpointer *) cache_ptr);
+
+ return spinner_cache;
+ }
+
+ return g_object_ref (spinner_cache);
+}
+
+/* Spinner implementation */
+
+#define SPINNER_TIMEOUT 125 /* ms */
+
+#define EPHY_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SPINNER, EphySpinnerDetails))
+
+struct _EphySpinnerDetails
+{
+ GtkIconTheme *icon_theme;
+ EphySpinnerCache *cache;
+ GtkIconSize size;
+ EphySpinnerImages *images;
+ guint current_image;
+ guint timeout;
+ guint timer_task;
+ guint spinning : 1;
+ guint need_load : 1;
+};
+
+static void ephy_spinner_class_init (EphySpinnerClass *class);
+static void ephy_spinner_init (EphySpinner *spinner);
+
+static GObjectClass *parent_class;
+
+GType
+ephy_spinner_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ {
+ const GTypeInfo our_info =
+ {
+ sizeof (EphySpinnerClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) ephy_spinner_class_init,
+ NULL,
+ NULL, /* class_data */
+ sizeof (EphySpinner),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) ephy_spinner_init
+ };
+
+ type = g_type_register_static (GTK_TYPE_WIDGET,
+ "EphySpinner",
+ &our_info, 0);
+ }
+
+ return type;
+}
+
+static gboolean
+ephy_spinner_load_images (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ if (details->need_load)
+ {
+ START_PROFILER ("ephy_spinner_load_images")
+
+ details->images =
+ ephy_spinner_cache_get_images
+ (details->cache,
+ gtk_widget_get_screen (GTK_WIDGET (spinner)),
+ details->size);
+
+ STOP_PROFILER ("ephy_spinner_load_images")
+
+ details->current_image = 0;
+ details->need_load = FALSE;
+ }
+
+ return details->images != NULL;
+}
+
+static void
+ephy_spinner_unload_images (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ if (details->images != NULL)
+ {
+ ephy_spinner_images_unref (details->images);
+ details->images = NULL;
+ }
+
+ details->current_image = 0;
+ details->need_load = TRUE;
+}
+
+static void
+icon_theme_changed_cb (GtkIconTheme *icon_theme,
+ EphySpinner *spinner)
+{
+ ephy_spinner_unload_images (spinner);
+ gtk_widget_queue_resize (GTK_WIDGET (spinner));
+}
+
+static void
+ephy_spinner_init (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details;
+
+ details = spinner->details = EPHY_SPINNER_GET_PRIVATE (spinner);
+
+ GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW);
+
+ details->cache = ephy_spinner_cache_ref ();
+ details->size = GTK_ICON_SIZE_DIALOG;
+ details->spinning = FALSE;
+ details->timeout = SPINNER_TIMEOUT;
+ details->need_load = TRUE;
+}
+
+static int
+ephy_spinner_expose (GtkWidget *widget,
+ GdkEventExpose *event)
+{
+ EphySpinner *spinner = EPHY_SPINNER (widget);
+ EphySpinnerDetails *details = spinner->details;
+ EphySpinnerImages *images;
+ GdkPixbuf *pixbuf;
+ GdkGC *gc;
+ int x_offset, y_offset, width, height;
+ GdkRectangle pix_area, dest;
+
+ if (!GTK_WIDGET_DRAWABLE (spinner))
+ {
+ return FALSE;
+ }
+
+ if (details->need_load &&
+ !ephy_spinner_load_images (spinner))
+ {
+ return FALSE;
+ }
+
+ images = details->images;
+ if (images == NULL)
+ {
+ return FALSE;
+ }
+
+ if (details->spinning &&
+ images->n_animation_pixbufs > 0)
+ {
+ g_assert (details->current_image >= 0 &&
+ details->current_image < images->n_animation_pixbufs);
+
+ pixbuf = images->animation_pixbufs[details->current_image];
+ }
+ else
+ {
+ pixbuf = images->quiescent_pixbuf;
+ }
+
+ if (pixbuf == NULL)
+ {
+ return FALSE;
+ }
+
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+
+ /* Compute the offsets for the image centered on our allocation */
+ x_offset = (widget->allocation.width - width) / 2;
+ y_offset = (widget->allocation.height - height) / 2;
+
+ pix_area.x = x_offset + widget->allocation.x;
+ pix_area.y = y_offset + widget->allocation.y;
+ pix_area.width = width;
+ pix_area.height = height;
+
+ if (!gdk_rectangle_intersect (&event->area, &pix_area, &dest))
+ {
+ return FALSE;
+ }
+
+ gc = gdk_gc_new (widget->window);
+ gdk_draw_pixbuf (widget->window, gc, pixbuf,
+ dest.x - x_offset - widget->allocation.x,
+ dest.y - y_offset - widget->allocation.y,
+ dest.x, dest.y,
+ dest.width, dest.height,
+ GDK_RGB_DITHER_MAX, 0, 0);
+ g_object_unref (gc);
+
+ return FALSE;
+}
+
+static gboolean
+bump_spinner_frame_cb (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ /* This can happen when we've unloaded the images on a theme
+ * change, but haven't been in the queued size request yet.
+ * Just skip this update.
+ */
+ if (details->images == NULL) return TRUE;
+
+ details->current_image++;
+ if (details->current_image >= details->images->n_animation_pixbufs)
+ {
+ details->current_image = 0;
+ }
+
+ gtk_widget_queue_draw (GTK_WIDGET (spinner));
+
+ /* run again */
+ return TRUE;
+}
+
+/**
+ * ephy_spinner_start:
+ * @spinner: a #EphySpinner
+ *
+ * Start the spinner animation.
+ **/
+void
+ephy_spinner_start (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ details->spinning = TRUE;
+
+ if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)) &&
+ details->timer_task == 0 &&
+ ephy_spinner_load_images (spinner))
+ {
+ details->current_image = 0;
+
+ details->timer_task =
+ g_timeout_add (details->timeout,
+ (GSourceFunc) bump_spinner_frame_cb,
+ spinner);
+ }
+}
+
+static void
+ephy_spinner_remove_update_callback (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ if (details->timer_task != 0)
+ {
+ g_source_remove (details->timer_task);
+ details->timer_task = 0;
+ }
+}
+
+/**
+ * ephy_spinner_stop:
+ * @spinner: a #EphySpinner
+ *
+ * Stop the spinner animation.
+ **/
+void
+ephy_spinner_stop (EphySpinner *spinner)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ details->spinning = FALSE;
+
+ if (details->timer_task != 0)
+ {
+ ephy_spinner_remove_update_callback (spinner);
+
+ if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)))
+ {
+ gtk_widget_queue_draw (GTK_WIDGET (spinner));
+ }
+ }
+}
+
+/*
+ * ephy_spinner_set_size:
+ * @spinner: a #EphySpinner
+ * @size: the size of type %GtkIconSize
+ *
+ * Set the size of the spinner.
+ **/
+void
+ephy_spinner_set_size (EphySpinner *spinner,
+ GtkIconSize size)
+{
+ if (size == GTK_ICON_SIZE_INVALID)
+ {
+ size = GTK_ICON_SIZE_DIALOG;
+ }
+
+ if (size != spinner->details->size)
+ {
+ ephy_spinner_unload_images (spinner);
+
+ spinner->details->size = size;
+
+ gtk_widget_queue_resize (GTK_WIDGET (spinner));
+ }
+}
+
+#if 0
+/*
+ * ephy_spinner_set_timeout:
+ * @spinner: a #EphySpinner
+ * @timeout: time delay between updates to the spinner.
+ *
+ * Sets the timeout delay for spinner updates.
+ **/
+void
+ephy_spinner_set_timeout (EphySpinner *spinner,
+ guint timeout)
+{
+ EphySpinnerDetails *details = spinner->details;
+
+ if (timeout != details->timeout)
+ {
+ ephy_spinner_stop (spinner);
+
+ details->timeout = timeout;
+
+ if (details->spinning)
+ {
+ ephy_spinner_start (spinner);
+ }
+ }
+}
+#endif
+
+static void
+ephy_spinner_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
+{
+ EphySpinner *spinner = EPHY_SPINNER (widget);
+ EphySpinnerDetails *details = spinner->details;
+
+ if ((details->need_load &&
+ !ephy_spinner_load_images (spinner)) ||
+ details->images == NULL)
+ {
+ requisition->width = requisition->height = 0;
+ gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
+ details->size,
+ &requisition->width,
+ &requisition->height);
+ return;
+ }
+
+ requisition->width = details->images->width;
+ requisition->height = details->images->height;
+
+ /* FIXME fix this hack */
+ /* allocate some extra margin so we don't butt up against toolbar edges */
+ if (details->size != GTK_ICON_SIZE_MENU)
+ {
+ requisition->width += 2;
+ requisition->height += 2;
+ }
+}
+
+static void
+ephy_spinner_map (GtkWidget *widget)
+{
+ EphySpinner *spinner = EPHY_SPINNER (widget);
+ EphySpinnerDetails *details = spinner->details;
+
+ GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+ if (details->spinning)
+ {
+ ephy_spinner_start (spinner);
+ }
+}
+
+static void
+ephy_spinner_unmap (GtkWidget *widget)
+{
+ EphySpinner *spinner = EPHY_SPINNER (widget);
+
+ ephy_spinner_remove_update_callback (spinner);
+
+ GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+ephy_spinner_dispose (GObject *object)
+{
+ EphySpinner *spinner = EPHY_SPINNER (object);
+
+ g_signal_handlers_disconnect_by_func
+ (spinner->details->icon_theme,
+ G_CALLBACK (icon_theme_changed_cb), spinner);
+
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+ephy_spinner_finalize (GObject *object)
+{
+ EphySpinner *spinner = EPHY_SPINNER (object);
+
+ ephy_spinner_remove_update_callback (spinner);
+ ephy_spinner_unload_images (spinner);
+
+ g_object_unref (spinner->details->cache);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+ephy_spinner_screen_changed (GtkWidget *widget,
+ GdkScreen *old_screen)
+{
+ EphySpinner *spinner = EPHY_SPINNER (widget);
+ EphySpinnerDetails *details = spinner->details;
+ GdkScreen *screen;
+
+ if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
+ {
+ GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, old_screen);
+ }
+
+ screen = gtk_widget_get_screen (widget);
+
+ /* FIXME: this seems to be happening when then spinner is destroyed!? */
+ if (old_screen == screen) return;
+
+ /* We'll get mapped again on the new screen, but not unmapped from
+ * the old screen, so remove timeout here.
+ */
+ ephy_spinner_remove_update_callback (spinner);
+
+ ephy_spinner_unload_images (spinner);
+
+ if (old_screen != NULL)
+ {
+ g_signal_handlers_disconnect_by_func
+ (gtk_icon_theme_get_for_screen (old_screen),
+ G_CALLBACK (icon_theme_changed_cb), spinner);
+ }
+
+ details->icon_theme = gtk_icon_theme_get_for_screen (screen);
+ g_signal_connect (details->icon_theme, "changed",
+ G_CALLBACK (icon_theme_changed_cb), spinner);
+}
+
+static void
+ephy_spinner_class_init (EphySpinnerClass *class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class->dispose = ephy_spinner_dispose;
+ object_class->finalize = ephy_spinner_finalize;
+
+ widget_class->expose_event = ephy_spinner_expose;
+ widget_class->size_request = ephy_spinner_size_request;
+ widget_class->map = ephy_spinner_map;
+ widget_class->unmap = ephy_spinner_unmap;
+ widget_class->screen_changed = ephy_spinner_screen_changed;
+
+ g_type_class_add_private (object_class, sizeof (EphySpinnerDetails));
+}
+
+/*
+ * ephy_spinner_new:
+ *
+ * Create a new #EphySpinner. The spinner is a widget
+ * that gives the user feedback about network status with
+ * an animated image.
+ *
+ * Return Value: the spinner #GtkWidget
+ **/
+GtkWidget *
+ephy_spinner_new (void)
+{
+ return GTK_WIDGET (g_object_new (EPHY_TYPE_SPINNER, NULL));
+}
Index: src/ephy-spinner.h
===================================================================
RCS file: src/ephy-spinner.h
diff -N src/ephy-spinner.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/ephy-spinner.h 17 Oct 2006 21:07:09 -0000
@@ -0,0 +1,70 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Copyright © 2000 Eazel, Inc.
+ * Copyright © 2004, 2006 Christian Persch
+ *
+ * Nautilus is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Nautilus is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Andy Hertzfeld <andy eazel com>
+ *
+ * $Id: ephy-spinner.h,v 1.12 2006/10/17 20:32:46 chpe Exp $
+ */
+
+#ifndef EPHY_SPINNER_H
+#define EPHY_SPINNER_H
+
+#include <gtk/gtkwidget.h>
+#include <gtk/gtkenums.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_SPINNER (ephy_spinner_get_type ())
+#define EPHY_SPINNER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SPINNER, EphySpinner))
+#define EPHY_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SPINNER, EphySpinnerClass))
+#define EPHY_IS_SPINNER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SPINNER))
+#define EPHY_IS_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SPINNER))
+#define EPHY_SPINNER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SPINNER, EphySpinnerClass))
+
+typedef struct _EphySpinner EphySpinner;
+typedef struct _EphySpinnerClass EphySpinnerClass;
+typedef struct _EphySpinnerDetails EphySpinnerDetails;
+
+struct _EphySpinner
+{
+ GtkWidget parent;
+
+ /*< private >*/
+ EphySpinnerDetails *details;
+};
+
+struct _EphySpinnerClass
+{
+ GtkWidgetClass parent_class;
+};
+
+GType ephy_spinner_get_type (void);
+
+GtkWidget *ephy_spinner_new (void);
+
+void ephy_spinner_start (EphySpinner *throbber);
+
+void ephy_spinner_stop (EphySpinner *throbber);
+
+void ephy_spinner_set_size (EphySpinner *spinner,
+ GtkIconSize size);
+
+G_END_DECLS
+
+#endif /* EPHY_SPINNER_H */
Index: src/nautilus-throbber.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-throbber.c,v
retrieving revision 1.18
diff -p -u -B -r1.18 nautilus-throbber.c
--- src/nautilus-throbber.c 18 Mar 2006 07:13:52 -0000 1.18
+++ src/nautilus-throbber.c 17 Oct 2006 21:07:09 -0000
@@ -4,6 +4,7 @@
* Nautilus
*
* Copyright (C) 2000 Eazel, Inc.
+ * Copyright (C) 2006 Christian Persch
*
* Nautilus is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,7 +27,6 @@
*/
#include <config.h>
-#include <math.h>
#include "nautilus-throbber.h"
@@ -34,460 +34,33 @@
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-accessibility.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtksignal.h>
#include <glib/gi18n.h>
-#include <libgnome/gnome-macros.h>
-#include <libgnome/gnome-util.h>
-#include <gtk/gtkicontheme.h>
-
-#define THROBBER_DEFAULT_TIMEOUT 100 /* Milliseconds Per Frame */
-
-struct NautilusThrobberDetails {
- GList *image_list;
-
- GdkPixbuf *quiescent_pixbuf;
-
- int max_frame;
- int delay;
- int current_frame;
- guint timer_task;
-
- gboolean ready;
- gboolean small_mode;
-
- guint icon_theme_changed_tag;
-};
-
-
-static void nautilus_throbber_load_images (NautilusThrobber *throbber);
-static void nautilus_throbber_unload_images (NautilusThrobber *throbber);
-static void nautilus_throbber_theme_changed (GtkIconTheme *icon_theme,
- NautilusThrobber *throbber);
-static void nautilus_throbber_remove_update_callback (NautilusThrobber *throbber);
-static AtkObject *nautilus_throbber_get_accessible (GtkWidget *widget);
-
-GNOME_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber,
- GtkEventBox, GTK_TYPE_EVENT_BOX)
-
-
-
-static gboolean
-is_throbbing (NautilusThrobber *throbber)
-{
- return throbber->details->timer_task != 0;
-}
-
-/* loop through all the images taking their union to compute the width and height of the throbber */
-static void
-get_throbber_dimensions (NautilusThrobber *throbber, int *throbber_width, int* throbber_height)
-{
- int current_width, current_height;
- int pixbuf_width, pixbuf_height;
- GList *image_list;
- GdkPixbuf *pixbuf;
-
- current_width = 0;
- current_height = 0;
-
- if (throbber->details->quiescent_pixbuf != NULL) {
- /* start with the quiescent image */
- current_width = gdk_pixbuf_get_width (throbber->details->quiescent_pixbuf);
- current_height = gdk_pixbuf_get_height (throbber->details->quiescent_pixbuf);
- }
-
- /* union with the animation image */
- image_list = throbber->details->image_list;
- if (image_list != NULL) {
- pixbuf = GDK_PIXBUF (image_list->data);
- pixbuf_width = gdk_pixbuf_get_width (pixbuf);
- pixbuf_height = gdk_pixbuf_get_height (pixbuf);
-
- if (pixbuf_width > current_width) {
- current_width = pixbuf_width;
- }
-
- if (pixbuf_height > current_height) {
- current_height = pixbuf_height;
- }
- }
-
- /* return the result */
- *throbber_width = current_width;
- *throbber_height = current_height;
-}
-
-static void
-nautilus_throbber_instance_init (NautilusThrobber *throbber)
-{
- GtkWidget *widget = GTK_WIDGET (throbber);
-
-
- GTK_WIDGET_UNSET_FLAGS (throbber, GTK_NO_WINDOW);
-
- gtk_widget_set_events (widget,
- gtk_widget_get_events (widget)
- | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-
- throbber->details = g_new0 (NautilusThrobberDetails, 1);
-
- throbber->details->delay = THROBBER_DEFAULT_TIMEOUT;
-
- throbber->details->icon_theme_changed_tag =
- g_signal_connect (gtk_icon_theme_get_default (),
- "changed",
- G_CALLBACK (nautilus_throbber_theme_changed),
- throbber);
-
-
- nautilus_throbber_load_images (throbber);
- gtk_widget_show (widget);
-}
-
-/* handler for handling theme changes */
-static void
-nautilus_throbber_theme_changed (GtkIconTheme *icon_theme, NautilusThrobber *throbber)
-{
- gtk_widget_hide (GTK_WIDGET (throbber));
- nautilus_throbber_load_images (throbber);
- gtk_widget_show (GTK_WIDGET (throbber));
- gtk_widget_queue_resize ( GTK_WIDGET (throbber));
-}
-
-/* here's the routine that selects the image to draw, based on the throbber's state */
-
-static GdkPixbuf *
-select_throbber_image (NautilusThrobber *throbber)
-{
- GList *element;
-
- if (throbber->details->timer_task == 0) {
- if (throbber->details->quiescent_pixbuf == NULL) {
- return NULL;
- } else {
- return g_object_ref (throbber->details->quiescent_pixbuf);
- }
- }
-
- if (throbber->details->image_list == NULL) {
- return NULL;
- }
-
- element = g_list_nth (throbber->details->image_list, throbber->details->current_frame);
-
- return g_object_ref (element->data);
-}
-/* handle expose events */
-
-static int
-nautilus_throbber_expose (GtkWidget *widget, GdkEventExpose *event)
-{
- NautilusThrobber *throbber;
- GdkPixbuf *pixbuf;
- int x_offset, y_offset, width, height;
- GdkRectangle pix_area, dest;
-
- g_return_val_if_fail (NAUTILUS_IS_THROBBER (widget), FALSE);
-
- throbber = NAUTILUS_THROBBER (widget);
- if (!throbber->details->ready) {
- return FALSE;
- }
-
- pixbuf = select_throbber_image (throbber);
- if (pixbuf == NULL) {
- return FALSE;
- }
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
-
- /* Compute the offsets for the image centered on our allocation */
- x_offset = (widget->allocation.width - width) / 2;
- y_offset = (widget->allocation.height - height) / 2;
-
- pix_area.x = x_offset;
- pix_area.y = y_offset;
- pix_area.width = width;
- pix_area.height = height;
-
- if (!gdk_rectangle_intersect (&event->area, &pix_area, &dest)) {
- g_object_unref (pixbuf);
- return FALSE;
- }
-
- gdk_draw_pixbuf (widget->window, NULL, pixbuf,
- dest.x - x_offset, dest.y - y_offset,
- dest.x, dest.y,
- dest.width, dest.height,
- GDK_RGB_DITHER_MAX, 0, 0);
-
- g_object_unref (pixbuf);
+static AtkObject *nautilus_throbber_get_accessible (GtkWidget *widget);
- return FALSE;
-}
+G_DEFINE_TYPE (NautilusThrobber, nautilus_throbber, EPHY_TYPE_SPINNER)
static void
-nautilus_throbber_map (GtkWidget *widget)
-{
- NautilusThrobber *throbber;
-
- throbber = NAUTILUS_THROBBER (widget);
-
- GNOME_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
- throbber->details->ready = TRUE;
-}
-
-/* here's the actual timeout task to bump the frame and schedule a redraw */
-
-static gboolean
-bump_throbber_frame (gpointer callback_data)
+nautilus_throbber_init (NautilusThrobber *throbber)
{
- NautilusThrobber *throbber;
-
- throbber = NAUTILUS_THROBBER (callback_data);
- if (!throbber->details->ready) {
- return TRUE;
- }
-
- throbber->details->current_frame += 1;
- if (throbber->details->current_frame > throbber->details->max_frame - 1) {
- throbber->details->current_frame = 0;
- }
-
- gtk_widget_draw (GTK_WIDGET (throbber), NULL);
- return TRUE;
-}
-
-
-/* routines to start and stop the throbber */
+}
void
nautilus_throbber_start (NautilusThrobber *throbber)
{
- if (is_throbbing (throbber)) {
- return;
- }
-
- if (throbber->details->timer_task != 0) {
- g_source_remove (throbber->details->timer_task);
- }
-
- /* reset the frame count */
- throbber->details->current_frame = 0;
- throbber->details->timer_task = g_timeout_add_full (G_PRIORITY_HIGH,
- throbber->details->delay,
- bump_throbber_frame,
- throbber,
- NULL);
-}
-
-static void
-nautilus_throbber_remove_update_callback (NautilusThrobber *throbber)
-{
- if (throbber->details->timer_task != 0) {
- g_source_remove (throbber->details->timer_task);
- }
-
- throbber->details->timer_task = 0;
+ ephy_spinner_start (EPHY_SPINNER (throbber));
}
void
nautilus_throbber_stop (NautilusThrobber *throbber)
{
- if (!is_throbbing (throbber)) {
- return;
- }
-
- nautilus_throbber_remove_update_callback (throbber);
- gtk_widget_queue_draw (GTK_WIDGET (throbber));
-
-}
-
-/* routines to load the images used to draw the throbber */
-
-/* unload all the images, and the list itself */
-
-static void
-nautilus_throbber_unload_images (NautilusThrobber *throbber)
-{
- GList *current_entry;
-
- if (throbber->details->quiescent_pixbuf != NULL) {
- g_object_unref (throbber->details->quiescent_pixbuf);
- throbber->details->quiescent_pixbuf = NULL;
- }
-
- /* unref all the images in the list, and then let go of the list itself */
- current_entry = throbber->details->image_list;
- while (current_entry != NULL) {
- g_object_unref (current_entry->data);
- current_entry = current_entry->next;
- }
-
- g_list_free (throbber->details->image_list);
- throbber->details->image_list = NULL;
-}
-
-static GdkPixbuf *
-scale_to_real_size (NautilusThrobber *throbber, GdkPixbuf *pixbuf)
-{
- GdkPixbuf *result;
- int size;
-
- size = gdk_pixbuf_get_height (pixbuf);
-
- if (throbber->details->small_mode) {
- result = gdk_pixbuf_scale_simple (pixbuf,
- size * 2 / 3,
- size * 2 / 3,
- GDK_INTERP_BILINEAR);
- } else {
- result = g_object_ref (pixbuf);
- }
-
- return result;
-}
-
-static GdkPixbuf *
-extract_frame (NautilusThrobber *throbber, GdkPixbuf *grid_pixbuf, int x, int y, int size)
-{
- GdkPixbuf *pixbuf, *result;
-
- if (x + size > gdk_pixbuf_get_width (grid_pixbuf) ||
- y + size > gdk_pixbuf_get_height (grid_pixbuf)) {
- return NULL;
- }
-
- pixbuf = gdk_pixbuf_new_subpixbuf (grid_pixbuf,
- x, y,
- size, size);
- g_return_val_if_fail (pixbuf != NULL, NULL);
-
- result = scale_to_real_size (throbber, pixbuf);
- g_object_unref (pixbuf);
-
- return result;
-}
-
-/* load all of the images of the throbber sequentially */
-static void
-nautilus_throbber_load_images (NautilusThrobber *throbber)
-{
- int grid_width, grid_height, x, y, size;
- GtkIconInfo *icon_info;
- const char *icon;
- GdkPixbuf *icon_pixbuf, *pixbuf;
- GList *image_list;
-
- nautilus_throbber_unload_images (throbber);
-
- /* Load the animation */
- icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
- "gnome-spinner", -1, 0);
- if (icon_info == NULL) {
- g_warning ("Throbber animation not found");
- return;
- }
-
- size = gtk_icon_info_get_base_size (icon_info);
- icon = gtk_icon_info_get_filename (icon_info);
- g_return_if_fail (icon != NULL);
-
- icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
- if (icon_pixbuf == NULL) {
- g_warning ("Could not load the spinner file\n");
- gtk_icon_info_free (icon_info);
- return;
- }
-
- grid_width = gdk_pixbuf_get_width (icon_pixbuf);
- grid_height = gdk_pixbuf_get_height (icon_pixbuf);
-
- image_list = NULL;
- for (y = 0; y < grid_height; y += size) {
- for (x = 0; x < grid_width ; x += size) {
- pixbuf = extract_frame (throbber, icon_pixbuf, x, y, size);
-
- if (pixbuf) {
- image_list = g_list_prepend (image_list, pixbuf);
- } else {
- g_warning ("Cannot extract frame from the grid");
- }
- }
- }
- throbber->details->image_list = g_list_reverse (image_list);
- throbber->details->max_frame = g_list_length (throbber->details->image_list);
-
- gtk_icon_info_free (icon_info);
- g_object_unref (icon_pixbuf);
-
- /* Load the rest icon */
- icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
- "gnome-spinner-rest", -1, 0);
- if (icon_info == NULL) {
- g_warning ("Throbber rest icon not found\n");
- return;
- }
-
- size = gtk_icon_info_get_base_size (icon_info);
- icon = gtk_icon_info_get_filename (icon_info);
- g_return_if_fail (icon != NULL);
-
- icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL);
- throbber->details->quiescent_pixbuf = scale_to_real_size (throbber, icon_pixbuf);
-
- g_object_unref (icon_pixbuf);
- gtk_icon_info_free (icon_info);
+ ephy_spinner_stop (EPHY_SPINNER (throbber));
}
void
-nautilus_throbber_set_small_mode (NautilusThrobber *throbber, gboolean new_mode)
-{
- if (new_mode != throbber->details->small_mode) {
- throbber->details->small_mode = new_mode;
- nautilus_throbber_load_images (throbber);
-
- gtk_widget_queue_resize (GTK_WIDGET (throbber));
- }
-}
-
-/* handle setting the size */
-
-static void
-nautilus_throbber_size_request (GtkWidget *widget, GtkRequisition *requisition)
+nautilus_throbber_set_size (NautilusThrobber *throbber, GtkIconSize size)
{
- int throbber_width, throbber_height;
- NautilusThrobber *throbber = NAUTILUS_THROBBER (widget);
-
- get_throbber_dimensions (throbber, &throbber_width, &throbber_height);
-
- /* allocate some extra margin so we don't butt up against toolbar edges */
- requisition->width = throbber_width + 8;
- requisition->height = throbber_height;
-}
-
-static void
-nautilus_throbber_finalize (GObject *object)
-{
- NautilusThrobber *throbber;
-
- throbber = NAUTILUS_THROBBER (object);
-
- nautilus_throbber_remove_update_callback (throbber);
- nautilus_throbber_unload_images (throbber);
-
- if (throbber->details->icon_theme_changed_tag != 0) {
- g_signal_handler_disconnect (gtk_icon_theme_get_default (),
- throbber->details->icon_theme_changed_tag);
- throbber->details->icon_theme_changed_tag = 0;
- }
-
- g_free (throbber->details);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ ephy_spinner_set_size (EPHY_SPINNER (throbber), size);
}
static void
@@ -496,12 +69,7 @@ nautilus_throbber_class_init (NautilusTh
GtkWidgetClass *widget_class;
widget_class = GTK_WIDGET_CLASS (class);
-
- G_OBJECT_CLASS (class)->finalize = nautilus_throbber_finalize;
- widget_class->expose_event = nautilus_throbber_expose;
- widget_class->size_request = nautilus_throbber_size_request;
- widget_class->map = nautilus_throbber_map;
widget_class->get_accessible = nautilus_throbber_get_accessible;
}
@@ -554,8 +122,8 @@ nautilus_throbber_accessible_get_type (v
/* Action interface
Name etc. ... */
- if (!type) {
- static const GInterfaceInfo atk_image_info = {
+ if (G_UNLIKELY (type == 0)) {
+ const GInterfaceInfo atk_image_info = {
(GInterfaceInitFunc) nautilus_throbber_accessible_image_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
Index: src/nautilus-throbber.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-throbber.h,v
retrieving revision 1.5
diff -p -u -B -r1.5 nautilus-throbber.h
--- src/nautilus-throbber.h 22 Nov 2004 15:24:37 -0000 1.5
+++ src/nautilus-throbber.h 17 Oct 2006 21:07:09 -0000
@@ -28,7 +28,7 @@
#ifndef NAUTILUS_THROBBER_H
#define NAUTILUS_THROBBER_H
-#include <gtk/gtkeventbox.h>
+#include "ephy-spinner.h"
G_BEGIN_DECLS
@@ -38,29 +38,14 @@ G_BEGIN_DECLS
#define NAUTILUS_IS_THROBBER(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_THROBBER))
#define NAUTILUS_IS_THROBBER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_THROBBER))
-typedef struct NautilusThrobber NautilusThrobber;
-typedef struct NautilusThrobberClass NautilusThrobberClass;
-typedef struct NautilusThrobberDetails NautilusThrobberDetails;
-
-struct NautilusThrobber {
- GtkEventBox parent;
- NautilusThrobberDetails *details;
-};
-
-struct NautilusThrobberClass {
- GtkEventBoxClass parent_class;
-
- /* signals */
- void (* location_changed) (NautilusThrobber *throbber,
- const char *location);
-};
+typedef EphySpinner NautilusThrobber;
+typedef EphySpinnerClass NautilusThrobberClass;
GType nautilus_throbber_get_type (void);
GtkWidget *nautilus_throbber_new (void);
void nautilus_throbber_start (NautilusThrobber *throbber);
void nautilus_throbber_stop (NautilusThrobber *throbber);
-void nautilus_throbber_set_small_mode (NautilusThrobber *throbber,
- gboolean new_mode);
+void nautilus_throbber_set_size (NautilusThrobber *throbber, GtkIconSize size);
G_END_DECLS
Index: src/nautilus-window-toolbars.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-toolbars.c,v
retrieving revision 1.113
diff -p -u -B -r1.113 nautilus-window-toolbars.c
--- src/nautilus-window-toolbars.c 18 Mar 2006 07:13:52 -0000 1.113
+++ src/nautilus-window-toolbars.c 17 Oct 2006 21:07:09 -0000
@@ -74,6 +74,27 @@ nautilus_navigation_window_set_throbber_
}
}
+static void
+toolbar_reconfigured_cb (GtkToolItem *item,
+ NautilusThrobber *throbber)
+{
+ GtkToolbarStyle style;
+ GtkIconSize size;
+
+ style = gtk_tool_item_get_toolbar_style (item);
+
+ if (style == GTK_TOOLBAR_BOTH)
+ {
+ size = GTK_ICON_SIZE_DIALOG;
+ }
+ else
+ {
+ size = GTK_ICON_SIZE_LARGE_TOOLBAR;
+ }
+
+ nautilus_throbber_set_size (throbber, size);
+}
+
void
nautilus_navigation_window_activate_throbber (NautilusNavigationWindow *window)
{
@@ -89,10 +110,10 @@ nautilus_navigation_window_activate_thro
gtk_tool_item_set_expand (item, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
item, -1);
-
+
throbber = nautilus_throbber_new ();
gtk_widget_show (GTK_WIDGET (throbber));
-
+
item = gtk_tool_item_new ();
gtk_container_add (GTK_CONTAINER (item), throbber);
gtk_widget_show (GTK_WIDGET (item));
@@ -100,6 +121,9 @@ nautilus_navigation_window_activate_thro
gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
item, -1);
+ g_signal_connect (item, "toolbar-reconfigured",
+ G_CALLBACK (toolbar_reconfigured_cb), throbber);
+
window->details->throbber = throbber;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
