Fix #702: Menubar takes too much space

[geeqie.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 4502d68..f5441fc 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;
@@ -72,6 +76,7 @@ ConfOptions *init_options(ConfOptions *options)
        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;
@@ -159,6 +164,7 @@ 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;
@@ -206,6 +212,13 @@ ConfOptions *init_options(ConfOptions *options)
 
        options->disabled_plugins = NULL;
 
+       options->mouse_button_8 = g_strdup("Back");
+       options->mouse_button_9 = g_strdup("Forward");
+
+       for (i = 0; i < FILE_FORMAT_CLASSES; i++)
+               {
+               options->class_filter[i] = TRUE;
+               }
        return options;
 }
 
@@ -268,6 +281,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;
@@ -282,6 +297,14 @@ 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->folder_window.vdivider_pos = 100;
        options->order = g_strdup("123");
        options->show_directory_date = FALSE;
@@ -300,6 +323,7 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        options->bars_state.hidden = FALSE;
        options->log_window.w = 520;
        options->log_window.h = 400;
+       options->split_pane_sync = FALSE;
        return options;
 }
 
@@ -327,7 +351,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);
 }