# HG changeset patch
# User zas_
# Date 1210077083 0
# Node ID 4cfce4ed35e0e04a779bfd0611a28738411b825e
# Parent  bb712693cad380596863a83060f42a07a7305465
Use a dedicated option to enable keywords and comment saving as XMP tags
in image's files.
This new option is named "save_metadata_in_image_file" in configuration file.
User can toggle it through Preferences > Advanced > Miscellaneous > Store keywords and comments as XMP tags in image files.
Description of enable_metadata_dirs was modified as an attempt to improve clarity.

diff -r bb712693cad3 -r 4cfce4ed35e0 src/bar_info.c
--- a/src/bar_info.c	Tue May 06 12:03:39 2008 +0000
+++ b/src/bar_info.c	Tue May 06 12:31:23 2008 +0000
@@ -333,7 +333,7 @@
 {
 	if (!fd) return FALSE;
 
-	if (options->enable_metadata_dirs && /* FIXME - use dedicated option */
+	if (options->save_metadata_in_image_file &&
 	    comment_xmp_write(fd, keywords, comment))
 		{
 		comment_delete_legacy(fd);
diff -r bb712693cad3 -r 4cfce4ed35e0 src/options.c
--- a/src/options.c	Tue May 06 12:03:39 2008 +0000
+++ b/src/options.c	Tue May 06 12:31:23 2008 +0000
@@ -27,7 +27,7 @@
 	options->dnd_icon_size = 48;
 	options->duplicates_similarity_threshold = 99;
 	options->enable_metadata_dirs = FALSE;
-
+	
 	options->file_filter.disable = FALSE;
 	options->file_filter.show_dot_directory = FALSE;
 	options->file_filter.show_hidden_files = FALSE;
@@ -111,6 +111,9 @@
 	options->panels.sort.selection_state = 0;
 
 	options->progressive_key_scrolling = FALSE;
+	
+	options->save_metadata_in_image_file = FALSE;
+	
 	options->show_copy_path = FALSE;
 	options->show_icon_names = TRUE;
 
diff -r bb712693cad3 -r 4cfce4ed35e0 src/options.h
--- a/src/options.h	Tue May 06 12:03:39 2008 +0000
+++ b/src/options.h	Tue May 06 12:31:23 2008 +0000
@@ -39,6 +39,8 @@
 	gint open_recent_list_maxsize;
 	gint dnd_icon_size;
 
+	gint save_metadata_in_image_file;
+
 	/* file ops */
 	struct {
 		gint enable_in_place_rename;
diff -r bb712693cad3 -r 4cfce4ed35e0 src/preferences.c
--- a/src/preferences.c	Tue May 06 12:03:39 2008 +0000
+++ b/src/preferences.c	Tue May 06 12:31:23 2008 +0000
@@ -279,6 +279,8 @@
 		layout_copy_path_update_all();
 		}
 
+	options->save_metadata_in_image_file = c_options->save_metadata_in_image_file;
+
 #ifdef DEBUG
 	set_debug_level(debug_c);
 #endif
@@ -1434,9 +1436,12 @@
 
 	group = pref_group_new(vbox, FALSE, _("Miscellaneous"), GTK_ORIENTATION_VERTICAL);
 
-	pref_checkbox_new_int(group, _("Store keywords and comments local to source images"),
+	pref_checkbox_new_int(group, _("Store metadata and cache files in source image's directory"),
 			      options->enable_metadata_dirs, &c_options->enable_metadata_dirs);
 
+	pref_checkbox_new_int(group, _("Store keywords and comments as XMP tags in image files"),
+			      options->save_metadata_in_image_file, &c_options->save_metadata_in_image_file);
+
 	pref_spin_new_int(group, _("Custom similarity threshold:"), NULL,
 			  0, 100, 1, options->duplicates_similarity_threshold, &c_options->duplicates_similarity_threshold);
 
diff -r bb712693cad3 -r 4cfce4ed35e0 src/rcfile.c
--- a/src/rcfile.c	Tue May 06 12:03:39 2008 +0000
+++ b/src/rcfile.c	Tue May 06 12:31:23 2008 +0000
@@ -314,6 +314,7 @@
 
 	WRITE_BOOL(progressive_key_scrolling);
 	WRITE_BOOL(enable_metadata_dirs);
+	WRITE_BOOL(save_metadata_in_image_file);
 
 	WRITE_INT(duplicates_similarity_threshold);
 	WRITE_SEPARATOR();
@@ -625,6 +626,7 @@
 		READ_BOOL(progressive_key_scrolling);
 
 		READ_BOOL(enable_metadata_dirs);
+		READ_BOOL(save_metadata_in_image_file);
 
 		READ_BOOL(mousewheel_scrolls);