comparison src/options.c @ 2221:59b559f747a7 ke-lua

Merge branch 'master' into ke-lua * master: (185 commits) better fix for big-endian architectures Minor indentation fixes. Cleanup checker shader code. Fix exif orientation in clutter rendering mode. Silent 2 warnings using explicit type casting. Polish translation was updated, thanks to Grzegorz Gibas. Update pt_BR translation. Add *~, *.rej, *.orig files to git ignore list. Fix for support >=automake-1.11.4 Trim trailing white spaces on empty lines. Trim trailing white spaces. Add missing vim modeline. Fix indentation and few trailing white spaces. Clear few more warnings, unused variables mostly. Drop unused variable. Remove commented out code. Remove commented out code. Remove commented out code. Remove commented out code. Remove commented out code. ...
author Klaus Ethgen <Klaus@Ethgen.de>
date Tue, 02 Oct 2012 22:19:13 +0100
parents 6e91033c7fb3 c14a1d8e6aa4
children 15d51cf8ff3d
comparison
equal deleted inserted replaced
2220:fea4dd5c4359 2221:59b559f747a7
1 /* 1 /*
2 * Geeqie 2 * Geeqie
3 * Copyright (C) 2008 - 2010 The Geeqie Team 3 * Copyright (C) 2008 - 2012 The Geeqie Team
4 * 4 *
5 * Authors: Vladimir Nadvornik, Laurent Monin 5 * Authors: Vladimir Nadvornik, Laurent Monin
6 * 6 *
7 * This software is released under the GNU General Public License (GNU GPL). 7 * This software is released under the GNU General Public License (GNU GPL).
8 * Please read the included file COPYING for more information. 8 * Please read the included file COPYING for more information.
36 options->color_profile.use_image = TRUE; 36 options->color_profile.use_image = TRUE;
37 options->color_profile.use_x11_screen_profile = TRUE; 37 options->color_profile.use_x11_screen_profile = TRUE;
38 38
39 options->dnd_icon_size = 48; 39 options->dnd_icon_size = 48;
40 options->duplicates_similarity_threshold = 99; 40 options->duplicates_similarity_threshold = 99;
41 41
42 options->file_filter.disable = FALSE; 42 options->file_filter.disable = FALSE;
43 options->file_filter.show_dot_directory = FALSE; 43 options->file_filter.show_dot_directory = FALSE;
44 options->file_filter.show_hidden_files = FALSE; 44 options->file_filter.show_hidden_files = FALSE;
45 45
46 options->save_window_positions = TRUE; 46 options->save_window_positions = TRUE;
61 options->fullscreen.clean_flip = FALSE; 61 options->fullscreen.clean_flip = FALSE;
62 options->fullscreen.disable_saver = TRUE; 62 options->fullscreen.disable_saver = TRUE;
63 options->fullscreen.screen = -1; 63 options->fullscreen.screen = -1;
64 64
65 memset(&options->image.border_color, 0, sizeof(options->image.border_color)); 65 memset(&options->image.border_color, 0, sizeof(options->image.border_color));
66 options->image.dither_quality = GDK_RGB_DITHER_NORMAL;
67 options->image.enable_read_ahead = TRUE; 66 options->image.enable_read_ahead = TRUE;
68 options->image.exif_rotate_enable = TRUE; 67 options->image.exif_rotate_enable = TRUE;
69 options->image.exif_proof_rotate_enable = TRUE; 68 options->image.exif_proof_rotate_enable = TRUE;
70 options->image.fit_window_to_image = FALSE; 69 options->image.fit_window_to_image = FALSE;
71 options->image.limit_autofit_size = FALSE; 70 options->image.limit_autofit_size = FALSE;
91 options->mousewheel_scrolls = FALSE; 90 options->mousewheel_scrolls = FALSE;
92 options->open_recent_list_maxsize = 10; 91 options->open_recent_list_maxsize = 10;
93 options->place_dialogs_under_mouse = FALSE; 92 options->place_dialogs_under_mouse = FALSE;
94 93
95 options->progressive_key_scrolling = TRUE; 94 options->progressive_key_scrolling = TRUE;
96 95
97 options->metadata.enable_metadata_dirs = FALSE; 96 options->metadata.enable_metadata_dirs = FALSE;
98 options->metadata.save_in_image_file = FALSE; 97 options->metadata.save_in_image_file = FALSE;
99 options->metadata.save_legacy_IPTC = FALSE; 98 options->metadata.save_legacy_IPTC = FALSE;
100 options->metadata.warn_on_write_problems = TRUE; 99 options->metadata.warn_on_write_problems = TRUE;
101 options->metadata.save_legacy_format = FALSE; 100 options->metadata.save_legacy_format = FALSE;
105 options->metadata.confirm_timeout = 10; 104 options->metadata.confirm_timeout = 10;
106 options->metadata.confirm_on_image_change = FALSE; 105 options->metadata.confirm_on_image_change = FALSE;
107 options->metadata.confirm_on_dir_change = TRUE; 106 options->metadata.confirm_on_dir_change = TRUE;
108 options->metadata.keywords_case_sensitive = FALSE; 107 options->metadata.keywords_case_sensitive = FALSE;
109 options->metadata.write_orientation = TRUE; 108 options->metadata.write_orientation = TRUE;
110 109
111 options->show_icon_names = TRUE; 110 options->show_icon_names = TRUE;
112 111
113 options->slideshow.delay = 50; 112 options->slideshow.delay = 50;
114 options->slideshow.random = FALSE; 113 options->slideshow.random = FALSE;
115 options->slideshow.repeat = FALSE; 114 options->slideshow.repeat = FALSE;
123 options->thumbnails.use_xvpics = TRUE; 122 options->thumbnails.use_xvpics = TRUE;
124 options->thumbnails.use_exif = FALSE; 123 options->thumbnails.use_exif = FALSE;
125 124
126 options->tree_descend_subdirs = FALSE; 125 options->tree_descend_subdirs = FALSE;
127 options->update_on_time_change = TRUE; 126 options->update_on_time_change = TRUE;
128 127
129 options->stereo.fixed_w = 1920; 128 options->stereo.fixed_w = 1920;
130 options->stereo.fixed_h = 1080; 129 options->stereo.fixed_h = 1080;
131 options->stereo.fixed_x1 = 0; 130 options->stereo.fixed_x1 = 0;
132 options->stereo.fixed_y1 = 0; 131 options->stereo.fixed_y1 = 0;
133 options->stereo.fixed_x2 = 0; 132 options->stereo.fixed_x2 = 0;
159 set_default_image_overlay_template_string(&options->image_overlay.template_string); 158 set_default_image_overlay_template_string(&options->image_overlay.template_string);
160 options->sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp;%unknown"); 159 options->sidecar.ext = g_strdup(".jpg;%raw;.ufraw;.xmp;%unknown");
161 160
162 options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH); 161 options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
163 options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS); 162 options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
164
165 #if 0
166 for (i = 0; ExifUIList[i].key; i++)
167 ExifUIList[i].current = ExifUIList[i].default_value;
168 #endif
169 } 163 }
170 164
171 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src) 165 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
172 { 166 {
173 free_layout_options_content(dest); 167 free_layout_options_content(dest);
174 168
175 *dest = *src; 169 *dest = *src;
176 dest->id = g_strdup(src->id); 170 dest->id = g_strdup(src->id);
177 dest->order = g_strdup(src->order); 171 dest->order = g_strdup(src->order);
178 dest->home_path = g_strdup(src->home_path); 172 dest->home_path = g_strdup(src->home_path);
179 dest->last_path = g_strdup(src->last_path); 173 dest->last_path = g_strdup(src->last_path);
259 rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL); 253 rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME, NULL);
260 success = load_config_from_file(rc_path, TRUE); 254 success = load_config_from_file(rc_path, TRUE);
261 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed"); 255 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
262 g_free(rc_path); 256 g_free(rc_path);
263 } 257 }
264 258
265 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL); 259 rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
266 success = load_config_from_file(rc_path, TRUE); 260 success = load_config_from_file(rc_path, TRUE);
267 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed"); 261 DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" : "failed");
268 g_free(rc_path); 262 g_free(rc_path);
269 return(success); 263 return(success);