X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foptions.c;h=817969df132b40d305fd796ea0df1d9fc9a677ee;hb=12a4fe18405a9132efc3ef19570bf0c59dd6b427;hp=de092468e0c9c68546051b16d4b5022cca59321d;hpb=45f1cb3fbaffa831d2e1d61a1e854c18e8b689e1;p=geeqie.git diff --git a/src/options.c b/src/options.c index de092468..817969df 100644 --- a/src/options.c +++ b/src/options.c @@ -1,13 +1,21 @@ /* - * Geeqie - * Copyright (C) 2008 - 2012 The Geeqie Team + * Copyright (C) 2008, 2016 The Geeqie Team - * * Authors: Vladimir Nadvornik, Laurent Monin * - * This software is released under the GNU General Public License (GNU GPL). - * Please read the included file COPYING for more information. - * This software comes with no warranty of any kind, use at your own risk! - */ + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "main.h" #include "options.h" @@ -35,15 +43,21 @@ ConfOptions *init_options(ConfOptions *options) options->color_profile.screen_file = NULL; options->color_profile.use_image = TRUE; options->color_profile.use_x11_screen_profile = TRUE; + options->color_profile.render_intent = 0; options->dnd_icon_size = 48; options->duplicates_similarity_threshold = 99; - + options->rot_invariant_sim = TRUE; + options->sort_totals = FALSE; + options->file_filter.disable = FALSE; options->file_filter.show_dot_directory = FALSE; options->file_filter.show_hidden_files = FALSE; + options->file_filter.show_parent_directory = TRUE; + options->file_filter.disable_file_extension_checks = FALSE; options->save_window_positions = TRUE; + options->use_saved_window_positions_for_new_windows = FALSE; options->tools_restore_state = TRUE; options->file_ops.confirm_delete = TRUE; @@ -56,6 +70,7 @@ ConfOptions *init_options(ConfOptions *options) options->file_sort.ascending = TRUE; options->file_sort.case_sensitive = FALSE; options->file_sort.method = SORT_NAME; + options->file_sort.natural = FALSE; options->fullscreen.above = FALSE; options->fullscreen.clean_flip = FALSE; @@ -63,6 +78,15 @@ ConfOptions *init_options(ConfOptions *options) options->fullscreen.screen = -1; 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)); +/* alpha channel checkerboard background (same as gimp) */ + options->image.alpha_color_1.red = 0x009999; + options->image.alpha_color_1.green = 0x009999; + options->image.alpha_color_1.blue = 0x009999; + options->image.alpha_color_2.red = 0x006666; + options->image.alpha_color_2.green = 0x006666; + options->image.alpha_color_2.blue = 0x006666; options->image.enable_read_ahead = TRUE; options->image.exif_rotate_enable = TRUE; options->image.exif_proof_rotate_enable = TRUE; @@ -70,6 +94,7 @@ ConfOptions *init_options(ConfOptions *options) options->image.limit_autofit_size = FALSE; options->image.limit_window_size = TRUE; options->image.max_autofit_size = 100; + options->image.max_enlargement_size = 900; options->image.max_window_size = 90; options->image.scroll_reset_method = SCROLL_RESET_NOCHANGE; options->image.tile_cache_max = 10; @@ -85,14 +110,25 @@ ConfOptions *init_options(ConfOptions *options) options->image_overlay.template_string = NULL; options->image_overlay.x = 10; options->image_overlay.y = -10; + options->image_overlay.font = NULL; + options->image_overlay.text_red = 0; + options->image_overlay.text_green = 0; + options->image_overlay.text_blue = 0; + options->image_overlay.text_alpha = 255; + options->image_overlay.background_red = 240; + options->image_overlay.background_green = 240; + options->image_overlay.background_blue = 240; + options->image_overlay.background_alpha = 210; options->lazy_image_sync = FALSE; options->mousewheel_scrolls = FALSE; + options->image_lm_click_nav = TRUE; options->open_recent_list_maxsize = 10; options->place_dialogs_under_mouse = FALSE; options->progressive_key_scrolling = TRUE; - + options->keyboard_scroll_step = 1; + options->metadata.enable_metadata_dirs = FALSE; options->metadata.save_in_image_file = FALSE; options->metadata.save_legacy_IPTC = FALSE; @@ -106,7 +142,8 @@ ConfOptions *init_options(ConfOptions *options) options->metadata.confirm_on_dir_change = TRUE; options->metadata.keywords_case_sensitive = FALSE; options->metadata.write_orientation = TRUE; - + options->metadata.sidecar_extended_name = FALSE; + options->show_icon_names = TRUE; options->slideshow.delay = 50; @@ -123,8 +160,9 @@ ConfOptions *init_options(ConfOptions *options) options->thumbnails.use_exif = FALSE; options->tree_descend_subdirs = FALSE; + options->view_dir_list_single_click_enter = TRUE; options->update_on_time_change = TRUE; - + options->stereo.fixed_w = 1920; options->stereo.fixed_h = 1080; options->stereo.fixed_x1 = 0; @@ -132,6 +170,8 @@ ConfOptions *init_options(ConfOptions *options) options->stereo.fixed_x2 = 0; options->stereo.fixed_y2 = 1125; + options->log_window_lines = 1000; + return options; } @@ -140,6 +180,7 @@ void setup_default_options(ConfOptions *options) gchar *path; gint i; + bookmark_add_default(".", get_current_dir()); bookmark_add_default(_("Home"), homedir()); path = g_build_filename(homedir(), "Desktop", NULL); bookmark_add_default(_("Desktop"), path); @@ -165,7 +206,7 @@ void setup_default_options(ConfOptions *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); @@ -200,6 +241,7 @@ LayoutOptions *init_layout_options(LayoutOptions *options) options->main_window.w = 720; options->main_window.x = 0; options->main_window.y = 0; + options->folder_window.vdivider_pos = 100; options->order = g_strdup("123"); options->show_directory_date = FALSE; options->show_marks = FALSE; @@ -212,6 +254,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; return options; } @@ -255,7 +298,7 @@ gboolean load_options(ConfOptions *options) 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");