Remove commented out code.

[geeqie.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index a6c72df..de09246 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik, Laurent Monin
  *
@@ -33,8 +33,8 @@ ConfOptions *init_options(ConfOptions *options)
        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;
@@ -63,9 +63,9 @@ ConfOptions *init_options(ConfOptions *options)
        options->fullscreen.screen = -1;
 
        memset(&options->image.border_color, 0, sizeof(options->image.border_color));
-       options->image.dither_quality = 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.limit_autofit_size = FALSE;
        options->image.limit_window_size = TRUE;
@@ -75,6 +75,7 @@ ConfOptions *init_options(ConfOptions *options)
        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_NONE;
@@ -103,6 +104,8 @@ ConfOptions *init_options(ConfOptions *options)
        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_icon_names = TRUE;
 
@@ -121,6 +124,13 @@ ConfOptions *init_options(ConfOptions *options)
 
        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;
 }
@@ -146,15 +156,10 @@ void setup_default_options(ConfOptions *options)
                }
 
        set_default_image_overlay_template_string(&options->image_overlay.template_string);
-       options->sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp");
+       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);
-
-#if 0  
-       for (i = 0; ExifUIList[i].key; i++)
-               ExifUIList[i].current = ExifUIList[i].default_value;
-#endif
 }
 
 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
@@ -200,7 +205,7 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        options->show_marks = FALSE;
        options->show_thumbnails = FALSE;
        options->style = 0;
-       options->info_pixel_hidden = TRUE;
+       options->show_info_pixel = FALSE;
        options->toolbar_hidden = FALSE;
        options->tools_float = FALSE;
        options->tools_hidden = FALSE;
@@ -222,7 +227,6 @@ static void sync_options_with_current_state(ConfOptions *options)
                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.screen_type,
                                               &options->color_profile.use_image);
                }