Collections changes

[geeqie.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 869754e..d7c02fc 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -34,6 +34,8 @@
 
 ConfOptions *init_options(ConfOptions *options)
 {
+       gint i;
+
        if (!options) options = g_new0(ConfOptions, 1);
 
        options->collections.rectangular_selection = FALSE;
@@ -59,6 +61,8 @@ ConfOptions *init_options(ConfOptions *options)
        options->save_window_positions = TRUE;
        options->use_saved_window_positions_for_new_windows = FALSE;
        options->tools_restore_state = TRUE;
+       options->save_dialog_window_positions = FALSE;
+       options->show_window_ids = FALSE;
 
        options->file_ops.confirm_delete = TRUE;
        options->file_ops.enable_delete_key = TRUE;
@@ -77,6 +81,10 @@ ConfOptions *init_options(ConfOptions *options)
        options->fullscreen.disable_saver = TRUE;
        options->fullscreen.screen = -1;
 
+       options->marks_save = TRUE;
+       options->with_rename = FALSE;
+       options->collections_on_top = FALSE;
+
        memset(&options->image.border_color, 0, sizeof(options->image.border_color));
        memset(&options->image.alpha_color_1, 0, sizeof(options->image.alpha_color_1));
        memset(&options->image.alpha_color_2, 0, sizeof(options->image.alpha_color_2));
@@ -147,6 +155,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->metadata.sidecar_extended_name = FALSE;
 
        options->show_icon_names = TRUE;
+       options->show_star_rating = FALSE;
 
        options->slideshow.delay = 50;
        options->slideshow.random = FALSE;
@@ -160,10 +169,13 @@ ConfOptions *init_options(ConfOptions *options)
        options->thumbnails.spec_standard = TRUE;
        options->thumbnails.use_xvpics = TRUE;
        options->thumbnails.use_exif = FALSE;
+       options->thumbnails.use_ft_metadata = TRUE;
+//     options->thumbnails.use_ft_metadata_small = TRUE;
 
        options->tree_descend_subdirs = FALSE;
        options->view_dir_list_single_click_enter = TRUE;
        options->update_on_time_change = TRUE;
+       options->clipboard_selection = PRIMARY;
 
        options->stereo.fixed_w = 1920;
        options->stereo.fixed_h = 1080;
@@ -177,6 +189,9 @@ ConfOptions *init_options(ConfOptions *options)
        options->log_window.paused = FALSE;
        options->log_window.timer_data = FALSE;
 
+       options->read_metadata_in_idle = FALSE;
+       options->star_rating.star = STAR_RATING_STAR;
+       options->star_rating.rejected = STAR_RATING_REJECTED;
        return options;
 }
 
@@ -206,6 +221,13 @@ void setup_default_options(ConfOptions *options)
 
        options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
        options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
+
+       for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+               {
+               options->marks_tooltips[i] = g_strdup_printf("%s%d", _("Mark "), i + 1);
+               }
+
+       options->help_search_engine = g_strdup(HELP_SEARCH_ENGINE);
 }
 
 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
@@ -259,7 +281,7 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        options->image_overlay.histogram_channel = HCHAN_RGB;
        options->image_overlay.histogram_mode = 1;
        options->image_overlay.state = OSD_SHOW_NOTHING;
-       options->animate = FALSE;
+       options->animate = TRUE;
        options->bars_state.hidden = FALSE;
        options->log_window.w = 520;
        options->log_window.h = 400;