applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
gnome-control-center/capplets/background/gnome-wp-item.c

386 lines
11 KiB
C
Raw Normal View History

Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
/*
* Authors: Rodney Dawes <dobey@ximian.com>
*
Update Copyright notice to include 2006 year 2006-01-14 Rodney Dawes <dobey@novell.com> * *.[ch]: Update Copyright notice to include 2006 year * gnome-background-properties.glade: Change the main dialog to use explicit apply with OK and Cancel buttons Remove the icons from the "Add Wallpaper" and "Remove" buttons * gnome-wp-capplet.c (gnome_wp_props_wp_set): Add a new retval boolean so that we can return whether or not we are trying to set the wallpaper to the same image filename as before Remove all the UI updating code from here Fix a potential leak of the GConfChangeSet object (gnome_wp_props_wp_selected): Update the UI whenever a different wallpaper is selected in the list Remove the timeout to update gconf, as we are using explicit apply now (gnome_wp_main_quit): Free the old_filename variable Update the indentation style to match the rest of the code (wallpaper_properties_clicked): Handle setting the gconf keys when the OK button is clicked, and fall through to the cancel/close code (gnome_wp_scale_type_changed, gnome_wp_shade_type_changed): Don't set the gconf strings from here, only update when OK is clicked (gnome_wp_color_changed): Don't update gconf strings here Don't generate miniature icon thumbnails for the drop-down menu (gnome_wp_remove_wallpaper): Don't need to remove the idle id any more (gnome_wp_load_stuffs): Set the old_filename variable to the current setting that is stored in gconf for the wallpaper filename (gnome_wp_delay_changed): Remove this unused method (gnome_wp_icon_theme_changed): Don't need to update the icons in the drop-down menu here, as they are being removed (set_accessible_name): Don't need this any longer, as the drop-down menu items are now standard label menu items, and don't have icons (wallpaper_properties_init): No longer need the key repeat delay Fix some style issues with the glade_xml_get_widget calls Replace the menu items in the option menus with standard label items * gnome-wp-capplet.h (_GnomeWPCapplet): Remove the no longer needed Widget variables for updating the drop-down menu icons Remove the no longer needed delay and idleid variables Add an old_filename variable to compare against when OK is clicked Also should fix #316697
2006-01-14 20:53:58 +00:00
* Copyright 2003-2006 Novell, Inc. (www.novell.com)
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License
* as published by the Free Software Foundation
*
* This program 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 Street #330, Boston, MA 02111-1307, USA.
*
*/
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
#include <config.h>
Mark message showing background image size and type for translation 2007-01-06 Gabor Kelemen <kelemeng@gnome.hu> * gnome-wp-item.c: Mark message showing background image size and type for translation Fixes #341899 svn path=/trunk/; revision=7052
2007-01-06 18:40:29 +00:00
#include <glib/gi18n.h>
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
#include <gconf/gconf-client.h>
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
#include <gnome.h>
As long as we're hard coding the path hard code it in only one place. 2004-01-12 Jody Goldberg <jody@gnome.org> * Makefile.am : As long as we're hard coding the path hard code it in only one place. Passing in datadir then adding the magic subdir in C then building in Makefile seems unnecessary. Use GNOMECC_CAPPLETS_*
2004-01-12 06:35:57 +00:00
#include <string.h>
Split out real image adding code into a separate call 2004-02-29 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_add_image): Split out real image adding code into a separate call (gnome_wp_add_images): (gnome_wp_file_open_dialog): (gnome_wp_properties_init): Add support for GtkFileChooser (#135317) (bg_properties_dragged_image): Fix re-addition of deleted images * gnome-wp-capplet.h: Store the filesel widget in GnomeWPCapplet * gnome-wp-item.c: Fix warning about gnome_vfs_mime_get_description Fixes #135317
2004-03-01 04:09:06 +00:00
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
#include "gnome-wp-item.h"
#include "gnome-wp-utils.h"
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
GnomeWPItem * gnome_wp_item_new (const gchar * filename,
GHashTable * wallpapers,
GnomeThumbnailFactory * thumbnails) {
GnomeWPItem * item = NULL;
GdkColor color1, color2;
GConfClient * client;
client = gconf_client_get_default ();
item = g_new0 (GnomeWPItem, 1);
Unescape the filename so that we can laod the thumbnail and set the gconf 2004-09-29 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_new): Unescape the filename so that we can laod the thumbnail and set the gconf key properly Fixes #154003
2004-09-29 18:12:08 +00:00
item->filename = gnome_vfs_unescape_string_for_display (filename);
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
item->fileinfo = gnome_wp_info_new (item->filename, thumbnails);
item->shade_type = gconf_client_get_string (client, WP_SHADING_KEY, NULL);
item->pri_color = gconf_client_get_string (client, WP_PCOLOR_KEY, NULL);
item->sec_color = gconf_client_get_string (client, WP_SCOLOR_KEY, NULL);
gdk_color_parse (item->pri_color, &color1);
gdk_color_parse (item->sec_color, &color2);
item->pcolor = gdk_color_copy (&color1);
item->scolor = gdk_color_copy (&color2);
Check that item->fileinfo is not NULL, before trying to use a string 2004-07-15 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_new): Check that item->fileinfo is not NULL, before trying to use a string variable inside the struct for a strncmp Fixes #147373
2004-07-15 13:58:51 +00:00
if (item->fileinfo != NULL &&
!strncmp (item->fileinfo->mime_type, "image/", strlen ("image/"))) {
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
if (item->name == NULL) {
Remove utf8 validate check (gnome_wp_props_wp_set): If the filename we 2005-10-01 Rodney Dawes <dobey@novell.com> * gnome-wp-capplet.c (gnome_wp_add_image): Remove utf8 validate check (gnome_wp_props_wp_set): If the filename we have for the image is not valid utf8, convert it to utf8 before setting the key in gconf (gnome_wp_load_stuffs, gnome_wp_file_changed): Make sure that the filename is valid utf8 and the file exists with utf8 encoding, or fall back to filename encoding as specified by the user with glib's environment variables * gnome-wpitem.c (gnome_wp_item_new): Make sure that the name field is always utf8 for displaying to the user with the tree view * gnome-wp-xml.c (gnome_wp_xml_load_xml): Make sure that the filename is valid utf8 and the file exists with utf8 encoding, or fall back to filename encoding as specified by the user with glib's environment variables (gnome_wp_xml_save_list): If the filename is not valid utf8, then convert to utf8 for storing in the XML file Fixes #168604
2005-10-01 21:29:39 +00:00
if (g_utf8_validate (item->fileinfo->name, -1, NULL))
item->name = g_strdup (item->fileinfo->name);
else
item->name = g_filename_to_utf8 (item->fileinfo->name, -1, NULL,
NULL, NULL);
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
}
item->options = gconf_client_get_string (client, WP_OPTIONS_KEY, NULL);
if (!strcmp (item->options, "none")) {
Add %F to Exec command line 2005-01-08 Rodney Dawes <dobey@novell.com> * background.desktop.in.in: Add %F to Exec command line * gnome-wp-capplet.[ch] (gnome_wp_remove_wp): Check that the tree path is not NULL before removing items from the list store (gnome_wp_load_stuffs): Don't duplicate the code from gnome_wp_add_image/gnome_wp_capplet_scroll_to_item here Load any images we were passed on the command line, and free the GSList that they were stored in after doing so (gnome_wp_file_changed): Clean up to just call gnome_wp_add_image and gnome_wp_capplet_scroll_to_item rather than duplicating the code (wallpaper_properties_init): Take a poptContext argument now Parse the poptContext into a GSList for loading the images from (main): Use a clearer variable name for the GnomeProgram object Get the poptContext from the GnomeProgram object and pass it through to wallpaper_properties_init Fixes #120720
2005-01-09 03:53:35 +00:00
item->options = g_strdup ("scaled");
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
}
gnome_wp_item_update_description (item);
plug leaks. Fixes bug #396069. 2007-03-04 Jens Granseuer <jensgr@gmx.net> * gnome-wp-capplet.c: (gnome_wp_add_images), (gnome_wp_file_open_dialog), (bg_properties_dragged_image), (gnome_wp_main_quit), (gnome_wp_scale_type_changed), (gnome_wp_shade_type_changed), (gnome_wp_load_stuffs), (gnome_wp_options_changed), (gnome_wp_shading_changed), (wallpaper_properties_init), (main): * gnome-wp-item.c: (gnome_wp_item_new), (gnome_wp_item_get_thumbnail): * gnome-wp-xml.c: (gnome_wp_load_legacy), (gnome_wp_xml_load_xml), (gnome_wp_list_flatten), (gnome_wp_xml_save_list): plug leaks. Fixes bug #396069. svn path=/trunk/; revision=7361
2007-03-04 20:42:33 +00:00
g_hash_table_insert (wallpapers, item->filename, item);
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
} else {
gnome_wp_item_free (item);
item = NULL;
}
Add %F to Exec command line 2005-01-08 Rodney Dawes <dobey@novell.com> * background.desktop.in.in: Add %F to Exec command line * gnome-wp-capplet.[ch] (gnome_wp_remove_wp): Check that the tree path is not NULL before removing items from the list store (gnome_wp_load_stuffs): Don't duplicate the code from gnome_wp_add_image/gnome_wp_capplet_scroll_to_item here Load any images we were passed on the command line, and free the GSList that they were stored in after doing so (gnome_wp_file_changed): Clean up to just call gnome_wp_add_image and gnome_wp_capplet_scroll_to_item rather than duplicating the code (wallpaper_properties_init): Take a poptContext argument now Parse the poptContext into a GSList for loading the images from (main): Use a clearer variable name for the GnomeProgram object Get the poptContext from the GnomeProgram object and pass it through to wallpaper_properties_init Fixes #120720
2005-01-09 03:53:35 +00:00
g_object_unref (client);
Update copyright info to have correct years (2003-2004) 2004-06-28 Rodney Dawes <dobey@novell.com> * *.[ch]: Update copyright info to have correct years (2003-2004) * gnome-wp-capplet.c (gnome_wp_capplet_scroll_to_item): Abstract this code out so that we don't have to duplicated it every time we want to scroll to a particular item in the list (gnome_wp_add_image): Update this to return the new item that we created, and don't scroll to or set as the wallpaper, every time we call this function Use the new gnome_wp_item_new () call to create items (gnome_wp_add_images): Change the API to not use the files argument any longer, as we don't need it without the GTK+ 2.2 compat code Add all the items to the list and select the last one when finished (gnome_wp_file_open_dialog): Update to not pass in the files argument to gnome_wp_add_images () and free the GSList of filenames (bg_add_multiple_files): merge this code into the normal callback for when images are dragged to the dialog (bg_properties_dragged_image): Don't check if the list is more than 1 or not here, and always call gnome_wp_add_images () with the full list that we are given Convert the GList of GnomeVFSURIs that we get from gnome-vfs to a GSList of char * uris to pass into gnome_wp_add_images () (gnome_wp_load_stuffs, gnome_wp_file_changed): Use the new gnome_wp_capplet_scroll_to_item () and gnome_wp_item_new () API calls instead of duplicating code * gnome-wp-capplet.h: Remove the GConf key path defines from here * gnome-wp-item.[ch]: Add the gnome_wp_item_new () call to create the GnomeWPItem structure for storing wallpapers in * gnome-wp-utils.h: Put the GConf key path defines in here * gnome-wp-xml.c (gnome_wp_load_legacy): Use the gnome_wp_item_new () call to create items from the old legacy (XD2 capplet) list file
2004-06-28 18:51:21 +00:00
return item;
}
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
void gnome_wp_item_free (GnomeWPItem * item) {
if (item == NULL) {
return;
}
g_free (item->name);
g_free (item->filename);
g_free (item->description);
g_free (item->imguri);
g_free (item->options);
g_free (item->shade_type);
g_free (item->pri_color);
g_free (item->sec_color);
Check that the colors aren't NULL before calling gdk_color_free 2004-09-22 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_free): Check that the colors aren't NULL before calling gdk_color_free * gnome-wp-xml.c (gnome_wp_xml_load_xml): Check that the item isn't already listed, before we try to add the wallpaper to the list (gnome_wp_xml_load_list): Load XML files from the correct directory
2004-09-22 15:07:01 +00:00
if (item->pcolor != NULL)
gdk_color_free (item->pcolor);
if (item->scolor != NULL)
gdk_color_free (item->scolor);
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
gnome_wp_info_free (item->fileinfo);
gnome_wp_info_free (item->uriinfo);
gtk_tree_row_reference_free (item->rowref);
item = NULL;
}
Add an Apply button 2006-01-26 Rodney Dawes <dobey@novell.com> * gnome-background-properties.glade: Add an Apply button * gnome-wp-capplet.[ch]: Replace old_filename with an old_item struct (gnome_wp_props_wp_set): Set the filename key to empty string when setting the background to "No Wallpaper" (gnome_wp_props_revert): New method to revert changes in the dialog when the Cancel button is clicked (gnome_wp_main_quit): Free the old_item structure (wallpaper_properties_clicked): Handle the Apply button Handle closing the dialog for OK separately from Cancel/delete_event Revert the settings when Cancel or wm "x" or ESC are clicked (gnome_wp_load_stuffs): Set the old_item to the currently selected background setting, whether it be an image or "No Wallpaper" * gnome-wp-info.c (gnome_wp_info_dup): If info is NULL, just return NULL rather than trying to access members of an empty struct * gnome-wp-item.[ch] (gnome_wp_item_dup): New method to create a duplicate and newly allocated GnomeWPItem structure Fixes #327335
2006-01-27 03:01:58 +00:00
GnomeWPItem * gnome_wp_item_dup (GnomeWPItem * item) {
GnomeWPItem * new_item;
GdkColor color1, color2;
if (item == NULL) {
return NULL;
}
new_item = g_new0 (GnomeWPItem, 1);
new_item->name = g_strdup (item->name);
new_item->filename = g_strdup (item->filename);
new_item->description = g_strdup (item->description);
new_item->imguri = g_strdup (item->imguri);
new_item->options = g_strdup (item->options);
new_item->shade_type = g_strdup (item->shade_type);
new_item->pri_color = g_strdup (item->pri_color);
new_item->sec_color = g_strdup (item->sec_color);
gdk_color_parse (item->pri_color, &color1);
gdk_color_parse (item->sec_color, &color2);
item->pcolor = gdk_color_copy (&color1);
item->scolor = gdk_color_copy (&color2);
new_item->fileinfo = gnome_wp_info_dup (item->fileinfo);
new_item->uriinfo = gnome_wp_info_dup (item->uriinfo);
new_item->rowref = gtk_tree_row_reference_copy (item->rowref);
new_item->deleted = item->deleted;
new_item->width = item->width;
new_item->height = item->height;
return new_item;
}
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
static void collect_save_options (GdkPixbuf * pixbuf,
gchar *** keys,
gchar *** vals,
gint width,
gint height) {
gchar ** options;
gint n, count;
count = 0;
options = g_object_get_qdata (G_OBJECT (pixbuf),
g_quark_from_static_string ("gdk_pixbuf_options"));
if (options) {
for (n = 0; options[2 * n]; n++) {
++count;
*keys = g_realloc (*keys, sizeof (gchar *) * (count + 1));
*vals = g_realloc (*vals, sizeof (gchar *) * (count + 1));
(*keys)[count - 1] = g_strdup (options[2 * n]);
(*vals)[count - 1] = g_strdup (options[2 * n + 1]);
(*keys)[count] = NULL;
(*vals)[count] = NULL;
}
}
++count;
*keys = g_realloc (*keys, sizeof (gchar *) * (count + 1));
*vals = g_realloc (*vals, sizeof (gchar *) * (count + 1));
(*keys)[count - 1] = g_strdup ("tEXt::Thumb::Image::Width");
(*vals)[count - 1] = g_strdup_printf ("%d", width);
(*keys)[count] = NULL;
(*vals)[count] = NULL;
++count;
*keys = g_realloc (*keys, sizeof (gchar *) * (count + 1));
*vals = g_realloc (*vals, sizeof (gchar *) * (count + 1));
(*keys)[count - 1] = g_strdup ("tEXt::Thumb::Image::Height");
(*vals)[count - 1] = g_strdup_printf ("%d", height);
(*keys)[count] = NULL;
(*vals)[count] = NULL;
}
#define LIST_IMAGE_WIDTH 64
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
GnomeThumbnailFactory * thumbs) {
GdkPixbuf * pixbuf, * bgpixbuf;
GdkPixbuf * scaled = NULL;
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
gint sw, sh, bw, bh, pw, ph, tw, th;
gdouble ratio;
sw = sh = bw = bh = pw = ph = tw = th = 0;
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
Add some explanatory comments to bits of the code Fix the ratio 2004-02-24 Rodney Dawes <dobey@ximian.com> * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Add some explanatory comments to bits of the code Fix the ratio calculation to handle images of all sizes (#134541) Don't force tiling of square images Don't do _save_thumbnail () for the custom thumbnails If pixbuf is NULL, copy away bgpixbuf and return that instead * gnome-wp-utils.c (gnome_wp_tile_pixbuf): (gnome_wp_center_pixbuf): Return copied pixbufs Fixes #134541
2004-02-24 19:32:05 +00:00
/*
Get the size of the screen and calculate our aspect ratio divisor
We do this, so that images are thumbnailed as they would look on
the screen in reality
*/
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
sw = gdk_screen_get_width (gdk_screen_get_default ());
sh = gdk_screen_get_height (gdk_screen_get_default ());
ratio = (gdouble) sw / (gdouble) LIST_IMAGE_WIDTH;
bw = sw / ratio;
bh = sh / ratio;
Add some explanatory comments to bits of the code Fix the ratio 2004-02-24 Rodney Dawes <dobey@ximian.com> * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Add some explanatory comments to bits of the code Fix the ratio calculation to handle images of all sizes (#134541) Don't force tiling of square images Don't do _save_thumbnail () for the custom thumbnails If pixbuf is NULL, copy away bgpixbuf and return that instead * gnome-wp-utils.c (gnome_wp_tile_pixbuf): (gnome_wp_center_pixbuf): Return copied pixbufs Fixes #134541
2004-02-24 19:32:05 +00:00
/*
Create the pixbuf for the background colors, which will show up for
oddly sized images, smaller images that are centered, or alpha images
*/
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
if (!strcmp (item->shade_type, "solid")) {
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
bgpixbuf = gnome_wp_pixbuf_new_solid (item->pcolor, bw, bh);
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
} else if (!strcmp (item->shade_type, "vertical-gradient")) {
bgpixbuf = gnome_wp_pixbuf_new_gradient (GTK_ORIENTATION_VERTICAL,
item->pcolor, item->scolor,
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
bw, bh);
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
} else {
bgpixbuf = gnome_wp_pixbuf_new_gradient (GTK_ORIENTATION_HORIZONTAL,
item->pcolor, item->scolor,
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
bw, bh);
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
}
Add some explanatory comments to bits of the code Fix the ratio 2004-02-24 Rodney Dawes <dobey@ximian.com> * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Add some explanatory comments to bits of the code Fix the ratio calculation to handle images of all sizes (#134541) Don't force tiling of square images Don't do _save_thumbnail () for the custom thumbnails If pixbuf is NULL, copy away bgpixbuf and return that instead * gnome-wp-utils.c (gnome_wp_tile_pixbuf): (gnome_wp_center_pixbuf): Return copied pixbufs Fixes #134541
2004-02-24 19:32:05 +00:00
/*
Load up the thumbnail image using the thumbnail spec
If the image doesn't exist, we create it
If we are creating the thumbnail for "No Wallpaper", then we just copy
the background colors pixbuf we created above, here
*/
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
pixbuf = NULL;
if (!strcmp (item->filename, "(none)")) {
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
return bgpixbuf;
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
} else {
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
gchar * escaped_path, * thumbnail_filename;
Fix some memory leaks by using a separate variable to store the escaped 2005-07-10 Rodney Dawes <dobey@novell.com> * gnome-wp-info.c (gnome_wp_info_new): Fix some memory leaks by using a separate variable to store the escaped path, and md5sum * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Fix a couple of memory leaks by using a separate variable to store the escaped path Don't unref the pixbuf from the thumbnail generation, and then try to load it again after saving
2005-07-10 15:58:14 +00:00
escaped_path = gnome_vfs_escape_path_string (item->filename);
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
thumbnail_filename = gnome_thumbnail_factory_lookup (thumbs,
escaped_path,
item->fileinfo->mtime);
Fix some memory leaks by using a separate variable to store the escaped 2005-07-10 Rodney Dawes <dobey@novell.com> * gnome-wp-info.c (gnome_wp_info_new): Fix some memory leaks by using a separate variable to store the escaped path, and md5sum * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Fix a couple of memory leaks by using a separate variable to store the escaped path Don't unref the pixbuf from the thumbnail generation, and then try to load it again after saving
2005-07-10 15:58:14 +00:00
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
if (thumbnail_filename == NULL) {
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbs,
Fix some memory leaks by using a separate variable to store the escaped 2005-07-10 Rodney Dawes <dobey@novell.com> * gnome-wp-info.c (gnome_wp_info_new): Fix some memory leaks by using a separate variable to store the escaped path, and md5sum * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Fix a couple of memory leaks by using a separate variable to store the escaped path Don't unref the pixbuf from the thumbnail generation, and then try to load it again after saving
2005-07-10 15:58:14 +00:00
escaped_path,
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
item->fileinfo->mime_type);
gnome_thumbnail_factory_save_thumbnail (thumbs, pixbuf,
Fix some memory leaks by using a separate variable to store the escaped 2005-07-10 Rodney Dawes <dobey@novell.com> * gnome-wp-info.c (gnome_wp_info_new): Fix some memory leaks by using a separate variable to store the escaped path, and md5sum * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Fix a couple of memory leaks by using a separate variable to store the escaped path Don't unref the pixbuf from the thumbnail generation, and then try to load it again after saving
2005-07-10 15:58:14 +00:00
escaped_path,
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
item->fileinfo->mtime);
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
g_object_unref (pixbuf);
pixbuf = NULL;
thumbnail_filename = gnome_thumbnail_factory_lookup (thumbs,
escaped_path,
item->fileinfo->mtime);
}
if (thumbnail_filename != NULL) {
pixbuf = gdk_pixbuf_new_from_file (thumbnail_filename, NULL);
if (pixbuf != NULL) {
plug leaks. Fixes bug #396069. 2007-03-04 Jens Granseuer <jensgr@gmx.net> * gnome-wp-capplet.c: (gnome_wp_add_images), (gnome_wp_file_open_dialog), (bg_properties_dragged_image), (gnome_wp_main_quit), (gnome_wp_scale_type_changed), (gnome_wp_shade_type_changed), (gnome_wp_load_stuffs), (gnome_wp_options_changed), (gnome_wp_shading_changed), (wallpaper_properties_init), (main): * gnome-wp-item.c: (gnome_wp_item_new), (gnome_wp_item_get_thumbnail): * gnome-wp-xml.c: (gnome_wp_load_legacy), (gnome_wp_xml_load_xml), (gnome_wp_list_flatten), (gnome_wp_xml_save_list): plug leaks. Fixes bug #396069. svn path=/trunk/; revision=7361
2007-03-04 20:42:33 +00:00
g_free (item->fileinfo->thumburi);
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
item->fileinfo->thumburi = thumbnail_filename;
thumbnail_filename = NULL;
}
plug leaks. Fixes bug #396069. 2007-03-04 Jens Granseuer <jensgr@gmx.net> * gnome-wp-capplet.c: (gnome_wp_add_images), (gnome_wp_file_open_dialog), (bg_properties_dragged_image), (gnome_wp_main_quit), (gnome_wp_scale_type_changed), (gnome_wp_shade_type_changed), (gnome_wp_load_stuffs), (gnome_wp_options_changed), (gnome_wp_shading_changed), (wallpaper_properties_init), (main): * gnome-wp-item.c: (gnome_wp_item_new), (gnome_wp_item_get_thumbnail): * gnome-wp-xml.c: (gnome_wp_load_legacy), (gnome_wp_xml_load_xml), (gnome_wp_list_flatten), (gnome_wp_xml_save_list): plug leaks. Fixes bug #396069. svn path=/trunk/; revision=7361
2007-03-04 20:42:33 +00:00
g_free (thumbnail_filename);
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
}
Fix some memory leaks by using a separate variable to store the escaped 2005-07-10 Rodney Dawes <dobey@novell.com> * gnome-wp-info.c (gnome_wp_info_new): Fix some memory leaks by using a separate variable to store the escaped path, and md5sum * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Fix a couple of memory leaks by using a separate variable to store the escaped path Don't unref the pixbuf from the thumbnail generation, and then try to load it again after saving
2005-07-10 15:58:14 +00:00
g_free (escaped_path);
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
}
if (pixbuf != NULL) {
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
const gchar * w_val, * h_val;
w_val = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
h_val = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
if (item->width <= 0 || item->height <= 0) {
if (w_val && h_val) {
item->width = atoi (w_val);
item->height = atoi (h_val);
} else {
gchar ** keys = NULL;
gchar ** vals = NULL;
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
gdk_pixbuf_get_file_info (item->filename,
&item->width, &item->height);
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
collect_save_options (pixbuf, &keys, &vals, item->width, item->height);
gdk_pixbuf_savev (pixbuf, item->fileinfo->thumburi, "png",
keys, vals, NULL);
g_strfreev (keys);
g_strfreev (vals);
}
}
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
pw = gdk_pixbuf_get_width (pixbuf);
ph = gdk_pixbuf_get_height (pixbuf);
if (item->width <= bw && item->height <= bh)
ratio = 1.0;
tw = item->width / ratio;
th = item->height / ratio;
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
if (!strcmp (item->options, "wallpaper")) {
scaled = gnome_wp_pixbuf_tile (pixbuf, bgpixbuf, tw, th);
Add some explanatory comments to bits of the code Fix the ratio 2004-02-24 Rodney Dawes <dobey@ximian.com> * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Add some explanatory comments to bits of the code Fix the ratio calculation to handle images of all sizes (#134541) Don't force tiling of square images Don't do _save_thumbnail () for the custom thumbnails If pixbuf is NULL, copy away bgpixbuf and return that instead * gnome-wp-utils.c (gnome_wp_tile_pixbuf): (gnome_wp_center_pixbuf): Return copied pixbufs Fixes #134541
2004-02-24 19:32:05 +00:00
} else if (!strcmp (item->options, "centered")) {
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, tw, th);
} else if (!strcmp (item->options, "stretched")) {
scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, bw, bh);
} else if (!strcmp (item->options, "scaled")) {
if ((gdouble) ph * (gdouble) bw > (gdouble) pw * (gdouble) bh) {
tw = 0.5 + (gdouble) pw * (gdouble) bh / (gdouble) ph;
th = bh;
} else {
th = 0.5 + (gdouble) ph * (gdouble) bw / (gdouble) pw;
tw = bw;
}
scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, tw, th);
Check for the scale type being zoom in the config, to set the option menu 2006-01-14 Alan Swanson <swanson@ukfsn.org> * gnome-wp-capplet.c (gnome_wp_option_menu_set): Check for the scale type being zoom in the config, to set the option menu (gnome_wp_scale_type_changed): Update the options for zoom type (gnome_wp_icon_theme_changed): Update the zoom icon in the menu (wallpaper_properties_init): Add an item for Zoom to the scaling menu * gnome-wp-capplet.h (_GnomeWPCapplet): Add a widget for the zoom item (GnomeWPScaleType): Add an enumeration for the zoom type * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Add the code to generate a proper thumbnail for the new zoom option Fixes #105231
2006-01-14 16:10:24 +00:00
} else if (!strcmp (item->options, "zoom")) {
if ((gdouble) ph * (gdouble) bw < (gdouble) pw * (gdouble) bh) {
tw = 0.5 + (gdouble) pw * (gdouble) bh / (gdouble) ph;
th = bh;
} else {
th = 0.5 + (gdouble) ph * (gdouble) bw / (gdouble) pw;
tw = bw;
}
scaled = gnome_wp_pixbuf_center (pixbuf, bgpixbuf, tw, th);
Add some explanatory comments to bits of the code Fix the ratio 2004-02-24 Rodney Dawes <dobey@ximian.com> * gnome-wp-item.c (gnome_wp_item_get_thumbnail): Add some explanatory comments to bits of the code Fix the ratio calculation to handle images of all sizes (#134541) Don't force tiling of square images Don't do _save_thumbnail () for the custom thumbnails If pixbuf is NULL, copy away bgpixbuf and return that instead * gnome-wp-utils.c (gnome_wp_tile_pixbuf): (gnome_wp_center_pixbuf): Return copied pixbufs Fixes #134541
2004-02-24 19:32:05 +00:00
}
Fixes #351991 2007-01-08 Ray Strode <rstrode@redhat.com> Fixes #351991 * gnome-wp-info.c (gnome_wp_info_new): don't try to pull from ~/.thumbnails directly without checking mtime. * gnome-wp-item.c (collect_save_options, gnome_wp_item_get_thumbnail): only generate thumbnails when a lookup shows there isn't already one. Never load a background just to find out its size. svn path=/trunk/; revision=7104
2007-01-08 18:26:31 +00:00
g_object_unref (pixbuf);
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
}
Regenerate the thumbnail in the list when we change scaling type now 2004-04-05 Rodney Dawes <dobey@ximian.com> * gnome-wp-capplet.c (gnome_wp_scale_type_changed): Regenerate the thumbnail in the list when we change scaling type now (wallpaper_properties_init): Add GtkFileFilter support (needs love) TreeView is buggy, so we need to not set the vertical-separator style property for it * gnome-wp-item.c: Include <config.h> and <gnome.h> here (collect_save_options): Add a function to set all of the pixbuf options for the thumbnail pixbuf properly, so we can save them back out (gnome_wp_item_get_thumbnail): Fix up the code to generate the thumbnails for the list a bit, so that we have sexy thumbnails that look exactly like how the image would, on-screen Initialize all of the width/height variables to 0 Add a new pixbuf variable for loading the original image to get the dimensions of it, so we can do thumbnailing more properly Use a LIST_IMAGE_WIDTH define, for the width of the images in the list Just return the bgpixbuf if we are creating the "No Wallpaper" thumb Save the thumbnail back out with the dimensions for the original image If our image is smaller than the list thumbnail, then just use 1.0 as the ratio for scaling the image for tiling/etc... Use the new API to do scaling inside the center/tile functions Reload the thumbnail pixbuf after generating it with the thumbnail system, so that we get all of the pixbuf options set correctly * gnome-wp-item.h (GnomeWPItem): store the original image's width and height in the item, so we can avoid reopening the original image every time we generate the thumbnail, on systems where the thumbnail doesn't contain the appropriate information * gnome-wp-utils.c (gnome_wp_pixbuf_tile): (gnome_wp_pixbuf_center): Add API to do the scaling inside these calls Fixes #136691
2004-04-05 21:32:02 +00:00
Update for new capplet Update Name/Comment/Exec entries 2004-01-12 Rodney Dawes <dobey@ximian.com> * Makefile.am: Update for new capplet * background.desktop.in: Update Name/Comment/Exec entries * gnome-wp-capplet.[ch]: * gnome-wp-info.[ch]: * gnome-wp-item.[ch]: * gnome-wp-utils.[ch]: * gnome-wp-xml.[ch]: Add new capplet code to CVS
2004-01-12 05:10:40 +00:00
g_object_unref (bgpixbuf);
return scaled;
}
Switch the binary name to gnome-background-properties, Based on patch from 2004-02-01 Rodney Dawes <dobey@ximian.com> * Makefile.am: Switch the binary name to gnome-background-properties, Based on patch from Seth Nickell * background.desktop.in: Use gnome-background-properties here also, based on patch from Seth Nickell * gnome-wp-capplet.c: Fix a bug where you can't re-add a wallpaper after you remove it Use the new gnome_wp_item_update_description () call Use a GConfChangeSet to change the gconf keys, based on a patch from Seth Nickell Select the first item in the list ("No Wallpaper") when the wallpaper is removed, based on a patch from Seth Nickell Do the rc string parsing before creating the window, and change some defaults so we can fix the spacing between widgets and the border Fix spacing between widgets and window border * gnome-wp-item.[ch]: Add update_description function to clean up code, based on patch from Seth Nickell Fix a crash when trying to thumbnail very wide images that are very short, while trying to maintain aspect ratio * gnome-wp-xml.c: Use backgrounds.xml instead of wp-list.xml, and migrate the old wp-list.xml over if backgrounds.xml doesn't exist yet, based on patch from Seth Nickell
2004-02-01 20:57:47 +00:00
void gnome_wp_item_update_description (GnomeWPItem * item) {
Apply patch from bug 335220 (mem leaks in gnome-wp-item) 2007-01-07 Thomas Wood <thos@gnome.org> * gnome-wp-item.c: (gnome_wp_item_get_thumbnail): * gnome-wp-xml.c: (gnome_wp_xml_load_list): Apply patch from bug 335220 (mem leaks in gnome-wp-item) svn path=/trunk/; revision=7077
2007-01-07 13:25:23 +00:00
g_free (item->description);
Add "W x H pixels" to description, and remove file size Mark the 2004-08-15 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Add "W x H pixels" to description, and remove file size Mark the description string for translation as well
2004-08-15 19:07:34 +00:00
Switch the binary name to gnome-background-properties, Based on patch from 2004-02-01 Rodney Dawes <dobey@ximian.com> * Makefile.am: Switch the binary name to gnome-background-properties, Based on patch from Seth Nickell * background.desktop.in: Use gnome-background-properties here also, based on patch from Seth Nickell * gnome-wp-capplet.c: Fix a bug where you can't re-add a wallpaper after you remove it Use the new gnome_wp_item_update_description () call Use a GConfChangeSet to change the gconf keys, based on a patch from Seth Nickell Select the first item in the list ("No Wallpaper") when the wallpaper is removed, based on a patch from Seth Nickell Do the rc string parsing before creating the window, and change some defaults so we can fix the spacing between widgets and the border Fix spacing between widgets and window border * gnome-wp-item.[ch]: Add update_description function to clean up code, based on patch from Seth Nickell Fix a crash when trying to thumbnail very wide images that are very short, while trying to maintain aspect ratio * gnome-wp-xml.c: Use backgrounds.xml instead of wp-list.xml, and migrate the old wp-list.xml over if backgrounds.xml doesn't exist yet, based on patch from Seth Nickell
2004-02-01 20:57:47 +00:00
if (!strcmp (item->filename, "(none)")) {
item->description = g_strdup_printf ("<b>%s</b>", item->name);
} else {
Add "W x H pixels" to description, and remove file size Mark the 2004-08-15 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Add "W x H pixels" to description, and remove file size Mark the description string for translation as well
2004-08-15 19:07:34 +00:00
gchar * info;
Mark message showing background image size and type for translation 2007-01-06 Gabor Kelemen <kelemeng@gnome.hu> * gnome-wp-item.c: Mark message showing background image size and type for translation Fixes #341899 svn path=/trunk/; revision=7052
2007-01-06 18:40:29 +00:00
/*
Translators: This message is used to render the type and size of the
background images in gnome-background-properites. The first "%s" will
be replaced by the image type, and the two "%d %s"s will be replaced
with the images' dimensions. For example, in US English, this may be
displayed as "JPEG Image, 1600 pixels x 1200 pixels".
Do not translate the "background size|" type. Remove it from the
translation.
*/
info = g_strdup_printf (Q_("background size|%s, %d %s x %d %s"),
Add "W x H pixels" to description, and remove file size Mark the 2004-08-15 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Add "W x H pixels" to description, and remove file size Mark the description string for translation as well
2004-08-15 19:07:34 +00:00
gnome_vfs_mime_get_description (item->fileinfo->mime_type),
Fix the ngettext calling bit to actually work, and move the %d into the 2004-12-11 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Fix the ngettext calling bit to actually work, and move the %d into the format string for g_strdup_print, so we don't say "%d pixels"
2004-12-11 20:31:40 +00:00
item->width,
ngettext ("pixel", "pixels", item->width),
item->height,
ngettext ("pixel", "pixels", item->height));
Add "W x H pixels" to description, and remove file size Mark the 2004-08-15 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Add "W x H pixels" to description, and remove file size Mark the description string for translation as well
2004-08-15 19:07:34 +00:00
Use g_markup_printf_escaped () to fill in the description 2004-10-14 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Use g_markup_printf_escaped () to fill in the description Fixes #155184
2004-10-14 14:55:24 +00:00
item->description = g_markup_printf_escaped ("<b>%s</b>\n"
"%s",
item->name,
info);
Add "W x H pixels" to description, and remove file size Mark the 2004-08-15 Rodney Dawes <dobey@novell.com> * gnome-wp-item.c (gnome_wp_item_update_description): Add "W x H pixels" to description, and remove file size Mark the description string for translation as well
2004-08-15 19:07:34 +00:00
g_free (info);
Switch the binary name to gnome-background-properties, Based on patch from 2004-02-01 Rodney Dawes <dobey@ximian.com> * Makefile.am: Switch the binary name to gnome-background-properties, Based on patch from Seth Nickell * background.desktop.in: Use gnome-background-properties here also, based on patch from Seth Nickell * gnome-wp-capplet.c: Fix a bug where you can't re-add a wallpaper after you remove it Use the new gnome_wp_item_update_description () call Use a GConfChangeSet to change the gconf keys, based on a patch from Seth Nickell Select the first item in the list ("No Wallpaper") when the wallpaper is removed, based on a patch from Seth Nickell Do the rc string parsing before creating the window, and change some defaults so we can fix the spacing between widgets and the border Fix spacing between widgets and window border * gnome-wp-item.[ch]: Add update_description function to clean up code, based on patch from Seth Nickell Fix a crash when trying to thumbnail very wide images that are very short, while trying to maintain aspect ratio * gnome-wp-xml.c: Use backgrounds.xml instead of wp-list.xml, and migrate the old wp-list.xml over if backgrounds.xml doesn't exist yet, based on patch from Seth Nickell
2004-02-01 20:57:47 +00:00
}
}
Reference in a new issue Copy permalink