Addl fix #521: zoom increment is not multiplicative

[geeqie.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index b3e0ced..875a65b 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -32,6 +32,9 @@
 #include "ui_fileops.h"
 #include "window.h"
 
+ConfOptions *options;
+CommandLine *command_line;
+
 ConfOptions *init_options(ConfOptions *options)
 {
        gint i;
@@ -48,6 +51,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->color_profile.render_intent = 0;
 
        options->dnd_icon_size = 48;
+       options->dnd_default_action = DND_ACTION_ASK;
        options->duplicates_similarity_threshold = 99;
        options->rot_invariant_sim = TRUE;
        options->sort_totals = FALSE;
@@ -60,16 +64,20 @@ ConfOptions *init_options(ConfOptions *options)
 
        options->save_window_positions = TRUE;
        options->use_saved_window_positions_for_new_windows = FALSE;
+       options->save_window_workspace = 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.confirm_move_to_trash = TRUE;
        options->file_ops.enable_delete_key = TRUE;
+       options->file_ops.use_system_trash = TRUE;
        options->file_ops.enable_in_place_rename = TRUE;
-       options->file_ops.safe_delete_enable = FALSE;
+       options->file_ops.safe_delete_enable = TRUE;
        options->file_ops.safe_delete_folder_maxsize = 128;
        options->file_ops.safe_delete_path = NULL;
+       options->file_ops.no_trash = FALSE;
 
        options->file_sort.ascending = TRUE;
        options->file_sort.case_sensitive = FALSE;
@@ -83,6 +91,8 @@ ConfOptions *init_options(ConfOptions *options)
 
        options->marks_save = TRUE;
        options->with_rename = FALSE;
+       options->collections_on_top = FALSE;
+       options->hide_window_in_fullscreen = TRUE;
 
        memset(&options->image.border_color, 0, sizeof(options->image.border_color));
        memset(&options->image.alpha_color_1, 0, sizeof(options->image.alpha_color_1));
@@ -113,6 +123,8 @@ ConfOptions *init_options(ConfOptions *options)
        options->image.zoom_mode = ZOOM_RESET_NONE;
        options->image.zoom_quality = GDK_INTERP_BILINEAR;
        options->image.zoom_to_fit_allow_expand = FALSE;
+       options->image.zoom_style = ZOOM_GEOMETRIC;
+       options->image.tile_size = 128;
 
        options->image_overlay.template_string = NULL;
        options->image_overlay.x = 10;
@@ -130,6 +142,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->lazy_image_sync = FALSE;
        options->mousewheel_scrolls = FALSE;
        options->image_lm_click_nav = TRUE;
+       options->image_l_click_archive = FALSE;
        options->image_l_click_video = FALSE;
        options->image_l_click_video_editor = NULL;
        options->open_recent_list_maxsize = 10;
@@ -155,6 +168,8 @@ ConfOptions *init_options(ConfOptions *options)
 
        options->show_icon_names = TRUE;
        options->show_star_rating = FALSE;
+       options->show_predefined_keyword_tree = TRUE;
+       options->expand_menu_toolbar = FALSE;
 
        options->slideshow.delay = 50;
        options->slideshow.random = FALSE;
@@ -168,13 +183,16 @@ ConfOptions *init_options(ConfOptions *options)
        options->thumbnails.spec_standard = TRUE;
        options->thumbnails.use_xvpics = TRUE;
        options->thumbnails.use_exif = FALSE;
+       options->thumbnails.use_color_management = FALSE;
        options->thumbnails.use_ft_metadata = TRUE;
 //     options->thumbnails.use_ft_metadata_small = TRUE;
+       options->thumbnails.collection_preview = 20;
 
        options->tree_descend_subdirs = FALSE;
        options->view_dir_list_single_click_enter = TRUE;
+       options->circular_selection_lists = TRUE;
        options->update_on_time_change = TRUE;
-       options->clipboard_selection = PRIMARY;
+       options->clipboard_selection = CLIPBOARD_BOTH;
 
        options->stereo.fixed_w = 1920;
        options->stereo.fixed_h = 1080;
@@ -184,13 +202,35 @@ ConfOptions *init_options(ConfOptions *options)
        options->stereo.fixed_y2 = 1125;
 
        options->log_window_lines = 1000;
-       options->log_window.line_wrap = TRUE;
+       options->log_window.line_wrap = FALSE;
        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;
+
+       options->printer.template_string = NULL;
+       options->printer.image_font = g_strdup("Serif 10");
+       options->printer.page_font = g_strdup("Serif 10");
+       options->printer.page_text = NULL;
+       options->printer.image_text_position = 1;
+       options->printer.page_text_position = 3;
+
+       options->threads.duplicates = -1;
+
+       options->disabled_plugins = NULL;
+
+       options->mouse_button_8 = g_strdup("Back");
+       options->mouse_button_9 = g_strdup("Forward");
+
+       options->disable_gpu = FALSE;
+       options->override_disable_gpu = FALSE;
+
+       for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+               {
+               options->class_filter[i] = TRUE;
+               }
        return options;
 }
 
@@ -253,6 +293,8 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        memset(options, 0, sizeof(LayoutOptions));
 
        options->dir_view_type = DIRVIEW_LIST;
+       options->dir_view_list_sort.ascend = TRUE;
+       options->dir_view_list_sort.method = SORT_NAME;
        options->file_view_type = FILEVIEW_LIST;
        options->float_window.h = 450;
        options->float_window.vdivider_pos = -1;
@@ -267,10 +309,23 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        options->main_window.w = 720;
        options->main_window.x = 0;
        options->main_window.y = 0;
+       options->dupe_window.w = 800;
+       options->dupe_window.h = 400;
+       options->dupe_window.x = 100;
+       options->dupe_window.y = 100;
+       options->search_window.w = 700;
+       options->search_window.h = 650;
+       options->search_window.x = 100;
+       options->search_window.y = 100;
+       options->advanced_exif_window.w = 900;
+       options->advanced_exif_window.h = 600;
+       options->advanced_exif_window.x = 0;
+       options->advanced_exif_window.y = 0;
        options->folder_window.vdivider_pos = 100;
        options->order = g_strdup("123");
        options->show_directory_date = FALSE;
        options->show_marks = FALSE;
+       options->show_file_filter = FALSE;
        options->show_thumbnails = FALSE;
        options->style = 0;
        options->show_info_pixel = FALSE;
@@ -284,6 +339,10 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        options->bars_state.hidden = FALSE;
        options->log_window.w = 520;
        options->log_window.h = 400;
+       options->preferences_window.w = 700;
+       options->preferences_window.h = 600;
+       options->split_pane_sync = FALSE;
+       options->workspace = -1;
        return options;
 }
 
@@ -311,7 +370,7 @@ void save_options(ConfOptions *options)
        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);
+       save_config_to_file(rc_path, options, NULL);
        g_free(rc_path);
 }