X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foptions.c;h=de092468e0c9c68546051b16d4b5022cca59321d;hb=45f1cb3fbaffa831d2e1d61a1e854c18e8b689e1;hp=ed88b7a96b91485d119390a81be25e4f233d67ab;hpb=dd431ef1f82d42b02899f1ca1c9f6ad4e172ede4;p=geeqie.git

diff --git a/src/options.c b/src/options.c
index ed88b7a9..de092468 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *
@@ -12,7 +12,17 @@
 #include "main.h"
 #include "options.h"
 
+#include "bar_exif.h"
+#include "editors.h"
+#include "filefilter.h"
 #include "histogram.h" /* HCHAN_RGB */
+#include "image-overlay.h" /* OSD_SHOW_NOTHING */
+#include "layout.h"
+#include "layout_image.h"
+#include "rcfile.h"
+#include "ui_bookmark.h"
+#include "ui_fileops.h"
+#include "window.h"
 
 ConfOptions *init_options(ConfOptions *options)
 {
@@ -20,20 +30,22 @@ ConfOptions *init_options(ConfOptions *options)
 
 	options->collections.rectangular_selection = FALSE;
 
-	options->color_profile.enabled = FALSE;
+	options->color_profile.enabled = TRUE;
 	options->color_profile.input_type = 0;
 	options->color_profile.screen_file = NULL;
-	options->color_profile.screen_type = 0;
 	options->color_profile.use_image = TRUE;
+	options->color_profile.use_x11_screen_profile = TRUE;
 
 	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;
 
+	options->save_window_positions = TRUE;
+	options->tools_restore_state = TRUE;
+
 	options->file_ops.confirm_delete = TRUE;
 	options->file_ops.enable_delete_key = TRUE;
 	options->file_ops.enable_in_place_rename = TRUE;
@@ -50,96 +62,204 @@ ConfOptions *init_options(ConfOptions *options)
 	options->fullscreen.disable_saver = TRUE;
 	options->fullscreen.screen = -1;
 
-	options->histogram.last_channel_mode = HCHAN_RGB;
-	options->histogram.last_log_mode = 1;
-	
 	memset(&options->image.border_color, 0, sizeof(options->image.border_color));
-	options->image.dither_quality = (gint)GDK_RGB_DITHER_NORMAL;
 	options->image.enable_read_ahead = TRUE;
 	options->image.exif_rotate_enable = TRUE;
+	options->image.exif_proof_rotate_enable = TRUE;
 	options->image.fit_window_to_image = FALSE;
-	options->image.idle_read_loop_count = IMAGE_LOADER_IDLE_READ_LOOP_COUNT_DEFAULT;
 	options->image.limit_autofit_size = FALSE;
-	options->image.limit_window_size = FALSE;
+	options->image.limit_window_size = TRUE;
 	options->image.max_autofit_size = 100;
-	options->image.max_window_size = 100;
-	options->image.read_buffer_size = IMAGE_LOADER_READ_BUFFER_SIZE_DEFAULT;
-	options->image.scroll_reset_method = SCROLL_RESET_TOPLEFT;
+	options->image.max_window_size = 90;
+	options->image.scroll_reset_method = SCROLL_RESET_NOCHANGE;
 	options->image.tile_cache_max = 10;
+	options->image.image_cache_max = 128; /* 4 x 10MPix */
 	options->image.use_custom_border_color = FALSE;
+	options->image.use_custom_border_color_in_fullscreen = TRUE;
 	options->image.zoom_2pass = TRUE;
 	options->image.zoom_increment = 5;
-	options->image.zoom_mode = ZOOM_RESET_ORIGINAL;
-	options->image.zoom_quality = (gint)GDK_INTERP_BILINEAR;
-	options->image.zoom_to_fit_allow_expand = TRUE;
-
-	options->image_overlay.common.enabled = FALSE;
-	options->image_overlay.common.show_at_startup = FALSE;
-	options->image_overlay.common.template_string = NULL;
-
-	options->layout.dir_view_type = DIRVIEW_LIST;
-	options->layout.file_view_type = FILEVIEW_LIST;
-	options->layout.float_window.h = 450;
-	options->layout.float_window.vdivider_pos = -1;
-	options->layout.float_window.w = 260;
-	options->layout.float_window.x = 0;
-	options->layout.float_window.y = 0;
-	options->layout.main_window.h = 400;
-	options->layout.main_window.hdivider_pos = -1;
-	options->layout.main_window.maximized = FALSE;
-	options->layout.main_window.vdivider_pos = 200;
-	options->layout.main_window.w = 500;
-	options->layout.main_window.x = 0;
-	options->layout.main_window.y = 0;
-	options->layout.order = NULL;
-	options->layout.save_window_positions = FALSE;
-	options->layout.show_marks = FALSE;
-	options->layout.show_thumbnails = FALSE;
-	options->layout.style = 0;
-	options->layout.toolbar_hidden = FALSE;
-	options->layout.tools_float = FALSE;
-	options->layout.tools_hidden = FALSE;
-	options->layout.tools_restore_state = FALSE;
+	options->image.zoom_mode = ZOOM_RESET_NONE;
+	options->image.zoom_quality = GDK_INTERP_BILINEAR;
+	options->image.zoom_to_fit_allow_expand = FALSE;
+
+	options->image_overlay.template_string = NULL;
+	options->image_overlay.x = 10;
+	options->image_overlay.y = -10;
 
 	options->lazy_image_sync = FALSE;
 	options->mousewheel_scrolls = FALSE;
 	options->open_recent_list_maxsize = 10;
 	options->place_dialogs_under_mouse = FALSE;
 
-	options->panels.exif.enabled = FALSE;
-	options->panels.exif.width = PANEL_DEFAULT_WIDTH;
-	options->panels.info.enabled = FALSE;
-	options->panels.info.width = PANEL_DEFAULT_WIDTH;
-	options->panels.sort.action_state = 0;
-	options->panels.sort.enabled = FALSE;
-	options->panels.sort.mode_state = 0;
-	options->panels.sort.selection_state = 0;
-
-	options->progressive_key_scrolling = FALSE;
+	options->progressive_key_scrolling = TRUE;
 	
-	options->save_metadata_in_image_file = FALSE;
+	options->metadata.enable_metadata_dirs = FALSE;
+	options->metadata.save_in_image_file = FALSE;
+	options->metadata.save_legacy_IPTC = FALSE;
+	options->metadata.warn_on_write_problems = TRUE;
+	options->metadata.save_legacy_format = FALSE;
+	options->metadata.sync_grouped_files = TRUE;
+	options->metadata.confirm_write = TRUE;
+	options->metadata.confirm_after_timeout = FALSE;
+	options->metadata.confirm_timeout = 10;
+	options->metadata.confirm_on_image_change = FALSE;
+	options->metadata.confirm_on_dir_change = TRUE;
+	options->metadata.keywords_case_sensitive = FALSE;
+	options->metadata.write_orientation = TRUE;
 	
-	options->show_copy_path = FALSE;
 	options->show_icon_names = TRUE;
 
-	options->slideshow.delay = 150;
+	options->slideshow.delay = 50;
 	options->slideshow.random = FALSE;
 	options->slideshow.repeat = FALSE;
 
-	options->startup_path_enable = FALSE;
-	options->startup_path = NULL;
-
 	options->thumbnails.cache_into_dirs = FALSE;
 	options->thumbnails.enable_caching = TRUE;
-	options->thumbnails.fast = TRUE;
 	options->thumbnails.max_height = DEFAULT_THUMB_HEIGHT;
 	options->thumbnails.max_width = DEFAULT_THUMB_WIDTH;
-	options->thumbnails.quality = (gint)GDK_INTERP_TILES;
+	options->thumbnails.quality = GDK_INTERP_TILES;
 	options->thumbnails.spec_standard = TRUE;
 	options->thumbnails.use_xvpics = TRUE;
+	options->thumbnails.use_exif = FALSE;
 
 	options->tree_descend_subdirs = FALSE;
 	options->update_on_time_change = TRUE;
+	
+	options->stereo.fixed_w = 1920;
+	options->stereo.fixed_h = 1080;
+	options->stereo.fixed_x1 = 0;
+	options->stereo.fixed_y1 = 0;
+	options->stereo.fixed_x2 = 0;
+	options->stereo.fixed_y2 = 1125;
+
+	return options;
+}
+
+void setup_default_options(ConfOptions *options)
+{
+	gchar *path;
+	gint i;
+
+	bookmark_add_default(_("Home"), homedir());
+	path = g_build_filename(homedir(), "Desktop", NULL);
+	bookmark_add_default(_("Desktop"), path);
+	g_free(path);
+	bookmark_add_default(_("Collections"), get_collections_dir());
+
+	g_free(options->file_ops.safe_delete_path);
+	options->file_ops.safe_delete_path = g_strdup(get_trash_dir());
+
+	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
+		{
+		options->color_profile.input_file[i] = NULL;
+		options->color_profile.input_name[i] = NULL;
+		}
+
+	set_default_image_overlay_template_string(&options->image_overlay.template_string);
+	options->sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp;%unknown");
+
+	options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
+	options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
+}
+
+void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
+{
+	free_layout_options_content(dest);
+	
+	*dest = *src;
+	dest->id = g_strdup(src->id);
+	dest->order = g_strdup(src->order);
+	dest->home_path = g_strdup(src->home_path);
+	dest->last_path = g_strdup(src->last_path);
+}
 
+void free_layout_options_content(LayoutOptions *dest)
+{
+	g_free(dest->id);
+	g_free(dest->order);
+	g_free(dest->home_path);
+	g_free(dest->last_path);
+}
+
+LayoutOptions *init_layout_options(LayoutOptions *options)
+{
+	memset(options, 0, sizeof(LayoutOptions));
+
+	options->dir_view_type = DIRVIEW_LIST;
+	options->file_view_type = FILEVIEW_LIST;
+	options->float_window.h = 450;
+	options->float_window.vdivider_pos = -1;
+	options->float_window.w = 260;
+	options->float_window.x = 0;
+	options->float_window.y = 0;
+	options->home_path = NULL;
+	options->main_window.h = 540;
+	options->main_window.hdivider_pos = -1;
+	options->main_window.maximized = FALSE;
+	options->main_window.vdivider_pos = 200;
+	options->main_window.w = 720;
+	options->main_window.x = 0;
+	options->main_window.y = 0;
+	options->order = g_strdup("123");
+	options->show_directory_date = FALSE;
+	options->show_marks = FALSE;
+	options->show_thumbnails = FALSE;
+	options->style = 0;
+	options->show_info_pixel = FALSE;
+	options->toolbar_hidden = FALSE;
+	options->tools_float = FALSE;
+	options->tools_hidden = FALSE;
+	options->image_overlay.histogram_channel = HCHAN_RGB;
+	options->image_overlay.histogram_mode = 1;
+	options->image_overlay.state = OSD_SHOW_NOTHING;
 	return options;
 }
+
+static void sync_options_with_current_state(ConfOptions *options)
+{
+	LayoutWindow *lw = NULL;
+
+	if (layout_valid(&lw))
+		{
+		layout_sync_options_with_current_state(lw);
+		layout_sort_get(lw, &options->file_sort.method, &options->file_sort.ascending);
+
+		options->color_profile.enabled = layout_image_color_profile_get_use(lw);
+		layout_image_color_profile_get(lw,
+					       &options->color_profile.input_type,
+					       &options->color_profile.use_image);
+		}
+
+}
+
+void save_options(ConfOptions *options)
+{
+	gchar *rc_path;
+
+	sync_options_with_current_state(options);
+
+	rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
+	save_config_to_file(rc_path, options);
+	g_free(rc_path);
+}
+
+gboolean load_options(ConfOptions *options)
+{
+	gboolean success;
+	gchar *rc_path;
+
+	if (isdir(GQ_SYSTEM_WIDE_DIR))
+		{
+		rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL);
+		success = load_config_from_file(rc_path, TRUE);
+		DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
+		g_free(rc_path);
+		}
+	
+	rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
+	success = load_config_from_file(rc_path, TRUE);
+	DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
+	g_free(rc_path);
+	return(success);
+}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */