Commit graph

13 commits

Author SHA1 Message Date
Rodney Dawes
a853fff02c Use preferences-desktop-wallpaper as the icon name per the Icon Naming
2006-08-18  Rodney Dawes  <dobey@novell.com>

	* background.desktop.in.in: Use preferences-desktop-wallpaper as the
	icon name per the Icon Naming Specification
	* gnome-background-properties.glade: Set the icon name for the window
	to be preferences-desktop-wallpaper as per the naming spec
	* gnome-wp-capplet.[ch]: Remove GtkIconTheme instance from structure
	(gnome_wp_icon_theme_changed): Don't need this method any longer
	(wallpaper_properties_init): Remove unused variables
	Don't need to get the icon_info to load a pixbuf and set an icon, from
	the theme any longer, as we can just specify the icon with one call
	Don't need the extra _ensure_style call here
2006-08-18 15:14:49 +00:00
Rodney Dawes
4622d5ed51 Replace the Apply/Cancel/OK buttons with a Finish button, using the stock
2006-02-09  Rodney Dawes  <dobey@novell.com>

	* gnome-background-properties.glade: Replace the Apply/Cancel/OK
	buttons with a Finish button, using the stock apply icon

	* gnome-wp-capplet.c (gnome_wp_props_wp_set): Don't need to check if
	we are the same image as we were before now
	(gnome_wp_props_revert): Remove this as it is no longer needed
	(gnome_wp_props_wp_selected): Call the set function here
	(gnome_wp_main_quit): Remove the freeing of capplet->old_item
	(wallpaper_properties_clicked): Only handle GTK_RESPONSE_OK as an
	action to close the dialog now, as we are instant apply again
	(gnome_wp_scale_type_changed, gnome_wp_shade_type_changed):
	(gnome_wp_color_changed): Set the appropriate gconf keys here
	(gnome_wp_load_stuffs): Remove references to capplet->old_item

	* gnome-wp-capplet.h (struct _GnomeWPCapplet): Remove old_item object

	Fixes #327335, #330587 and #329818
	Partially fixes #330168
2006-02-11 06:08:03 +00:00
Rodney Dawes
f69be2bd96 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
Rodney Dawes
569023b7b9 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
Alan Swanson
9c27b0926f 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
Rodney Dawes
e7819d9175 Update to use GtkIconTheme rather than GnomeIconTheme Based on patch from
2005-07-10  Rodney Dawes  <dobey@novell.com>

	* gnome-wp-capplet.[ch]:
	(gnome_wp_icon_theme_changed):
	(wallpaper_properties_init):
	Update to use GtkIconTheme rather than GnomeIconTheme
	Based on patch from Jan de Groot

	Fixes #171677
2005-07-10 20:45:00 +00:00
Rodney Dawes
05b1c2f1a3 Update Copyright to include current year
2005-02-26  Rodney Dawes  <dobey@novell.com>

	* *.[ch]: Update Copyright to include current year
2005-02-26 19:15:58 +00:00
Rodney Dawes
12c59c7f09 Add new callback routine for when the preview widget in the file chooser
2005-01-09  Rodney Dawes  <dobey@novell.com>

	* gnome-wp-capplet.[ch] (gnome_wp_update_preview): Add new callback
	routine for when the preview widget in the file chooser needs an update
	(wallpaper_properties_init): Set the preview widget in the file chooser
	to a GtkImage object and connect to the update-preview signal for when
	the selected file changes
	- Based on patch from Sebastien Bacher <seb128@debian.org>

	Fixes #139714
2005-01-09 23:57:36 +00:00
Rodney Dawes
bdd4d0142e 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
Rodney Dawes
4d87d80f3e 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
Rodney Dawes
e7928dbfa4 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
Rodney Dawes
035c34ab99 Convert the main dialog UI to glade
2004-02-04  Rodney Dawes  <dobey@ximian.com>

	* Makefile.am:
	* gnome-background-properties.glade:
	* gnome-wp-capplet.[ch]: Convert the main dialog UI to glade
2004-02-05 00:31:48 +00:00
Rodney Dawes
2e428e7746 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