applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve the behaviour of the capplet when using large images (scale the

Browse source 
2005-07-05  Diego Gonzalez  <diego@pemas.net>

    * gnome-about-me.c (about_me_update_photo): Improve the behaviour
      of the capplet when using large images (scale the image down to
      a resonable size before storing it in EDS).
    * e-image-chooser.c: remove debug output.
This commit is contained in:
Diego Gonzalez 2005-07-05 15:29:33 +00:00 • committed by Diego González
parent f0ff8f7cc3
commit d4629ab2d8
3 changed files with 62 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
capplets/about-me/ChangeLog
View file

@ -1,4 +1,11 @@
2005-07-05 Diego Gonzalez <diego@pemas.net
2005-07-05 Diego Gonzalez <diego@pemas.net>
* gnome-about-me.c (about_me_update_photo): Improve the behaviour
of the capplet when using large images (scale the image down to
a resonable size before storing it in EDS).
* e-image-chooser.c: remove debug output
2005-07-05 Diego Gonzalez <diego@pemas.net>
Patch by Jaap A. Haitsma <jaap@haitsma.org>

2
capplets/about-me/e-image-chooser.c
View file

@ -256,7 +256,6 @@ set_image_from_data (EImageChooser *chooser,
else if (chooser->priv->image_height < new_height
|| chooser->priv->image_width < new_width) {
/* we need to scale down */
g_print ("we need to scale down\n");
if (new_height > new_width)
scale = (float)chooser->priv->image_height / new_height;
else
@ -264,7 +263,6 @@ set_image_from_data (EImageChooser *chooser,
}
else {
/* we need to scale up */
g_print ("we need to scale up\n");
if (new_height > new_width)
scale = (float)new_height / chooser->priv->image_height;
else

64
capplets/about-me/gnome-about-me.c
View file

@ -412,27 +412,71 @@ about_me_update_photo (GnomeAboutMe *me)
gchar *file;
FILE *fp;
char *data;
int length;
dialog = me->dialog;
if (me->image_changed && me->have_image) {
GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
GdkPixbuf *pixbuf, *scaled;
int height, width;
gboolean do_scale = FALSE;
float scale;
widget = WID ("image-chooser");
e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), &data, &length);
/* Before updating the image in EDS scale it to a reasonable size
so that the user doesn't get an application that does not respond
or that takes 100% CPU */
gdk_pixbuf_loader_write (loader, data, length, NULL);
pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
if (pixbuf)
gdk_pixbuf_ref (pixbuf);
gdk_pixbuf_loader_close (loader, NULL);
g_object_unref (loader);
height = gdk_pixbuf_get_height (pixbuf);
width = gdk_pixbuf_get_width (pixbuf);
if (height > width && height > 200) {
scale = (float)200/height;
do_scale = TRUE;
} else if (width > height && width > 200) {
scale = (float)200/width;
do_scale = TRUE;
}
if (do_scale) {
char *scaled_data = NULL;
int scaled_length;
scaled = gdk_pixbuf_scale_simple (pixbuf, width*scale, height*scale, GDK_INTERP_BILINEAR);
gdk_pixbuf_save_to_buffer (scaled, &scaled_data, &scaled_length, "png", NULL, NULL);
g_free (data);
data = scaled_data;
length = scaled_length;
}
photo = g_new0 (EContactPhoto, 1);
e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), &photo->data, &photo->length);
photo->data = data;
photo->length = length;
e_contact_set (me->contact, E_CONTACT_PHOTO, photo);
/* Save the image for GDM */
/* FIXME: I would have to read the default used by the gdmgreeter program */
file = g_strdup_printf ("%s/.face", g_get_home_dir ());
fp = fopen (file, "wb");
fwrite (photo->data, 1, photo->length, fp);
fclose (fp);
/* Update GDM configuration */
/*
gnome_config_set_string ("/gdmphotosetup/last/picture", file);
gnome_config_set_string ("/gdm/face/picture", file);
gnome_config_sync ();
*/
g_free (file);
e_contact_photo_free (photo);
@ -473,9 +517,9 @@ about_me_load_info (GnomeAboutMe *me)
}
GtkWidget *
eab_create_image_chooser_widget(gchar *name,
gchar *string1, gchar *string2,
gint int1, gint int2)
eab_create_image_chooser_widget (gchar *name,
gchar *string1, gchar *string2,
gint int1, gint int2)
{
GtkWidget *w = NULL;