Mercurial > geeqie.yaz

comparison src/options.c @ 1336:4179d41d1149

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed overlay configuration split overlay options between global and layout window
author nadvornik
date Sat, 28 Feb 2009 14:40:22 +0000
parents 1fc356f629fe
children 77c3d9dcd6bc
comparison
equal deleted inserted replaced
1335:588d96cda850 1336:4179d41d1149
57 options->fullscreen.above = FALSE; 57 options->fullscreen.above = FALSE;
58 options->fullscreen.clean_flip = FALSE; 58 options->fullscreen.clean_flip = FALSE;
59 options->fullscreen.disable_saver = TRUE; 59 options->fullscreen.disable_saver = TRUE;
60 options->fullscreen.screen = -1; 60 options->fullscreen.screen = -1;
61 61
62 options->image_overlay.common.histogram_channel = HCHAN_RGB;
63 options->image_overlay.common.histogram_mode = 1;
64
65 memset(&options->image.border_color, 0, sizeof(options->image.border_color)); 62 memset(&options->image.border_color, 0, sizeof(options->image.border_color));
66 options->image.dither_quality = GDK_RGB_DITHER_NORMAL; 63 options->image.dither_quality = GDK_RGB_DITHER_NORMAL;
67 options->image.enable_read_ahead = TRUE; 64 options->image.enable_read_ahead = TRUE;
68 options->image.exif_rotate_enable = TRUE; 65 options->image.exif_rotate_enable = TRUE;
69 options->image.fit_window_to_image = FALSE; 66 options->image.fit_window_to_image = FALSE;
81 options->image.zoom_increment = 5; 78 options->image.zoom_increment = 5;
82 options->image.zoom_mode = ZOOM_RESET_NONE; 79 options->image.zoom_mode = ZOOM_RESET_NONE;
83 options->image.zoom_quality = GDK_INTERP_BILINEAR; 80 options->image.zoom_quality = GDK_INTERP_BILINEAR;
84 options->image.zoom_to_fit_allow_expand = FALSE; 81 options->image.zoom_to_fit_allow_expand = FALSE;
85 82
86 options->image_overlay.common.state = OSD_SHOW_NOTHING; 83 options->image_overlay.template_string = NULL;
87 options->image_overlay.common.show_at_startup = FALSE; 84 options->image_overlay.x = 10;
88 options->image_overlay.common.template_string = NULL; 85 options->image_overlay.y = -10;
89 options->image_overlay.common.x = 10;
90 options->image_overlay.common.y = -10;
91 86
92 options->layout.dir_view_type = DIRVIEW_LIST; 87 options->layout.dir_view_type = DIRVIEW_LIST;
93 options->layout.file_view_type = FILEVIEW_LIST; 88 options->layout.file_view_type = FILEVIEW_LIST;
94 options->layout.float_window.h = 450; 89 options->layout.float_window.h = 450;
95 options->layout.float_window.vdivider_pos = -1; 90 options->layout.float_window.vdivider_pos = -1;
112 options->layout.style = 0; 107 options->layout.style = 0;
113 options->layout.toolbar_hidden = FALSE; 108 options->layout.toolbar_hidden = FALSE;
114 options->layout.tools_float = FALSE; 109 options->layout.tools_float = FALSE;
115 options->layout.tools_hidden = FALSE; 110 options->layout.tools_hidden = FALSE;
116 options->layout.tools_restore_state = TRUE; 111 options->layout.tools_restore_state = TRUE;
117 112 options->layout.image_overlay.histogram_channel = HCHAN_RGB;
113 options->layout.image_overlay.histogram_mode = 1;
114 options->layout.image_overlay.state = OSD_SHOW_NOTHING;
115
118 options->lazy_image_sync = FALSE; 116 options->lazy_image_sync = FALSE;
119 options->mousewheel_scrolls = FALSE; 117 options->mousewheel_scrolls = FALSE;
120 options->open_recent_list_maxsize = 10; 118 options->open_recent_list_maxsize = 10;
121 options->place_dialogs_under_mouse = FALSE; 119 options->place_dialogs_under_mouse = FALSE;
122 120
179 { 177 {
180 options->color_profile.input_file[i] = NULL; 178 options->color_profile.input_file[i] = NULL;
181 options->color_profile.input_name[i] = NULL; 179 options->color_profile.input_name[i] = NULL;
182 } 180 }
183 181
184 set_default_image_overlay_template_string(&options->image_overlay.common.template_string); 182 set_default_image_overlay_template_string(&options->image_overlay.template_string);
185 options->sidecar.ext = g_strdup(".jpg;%raw;.xmp"); 183 options->sidecar.ext = g_strdup(".jpg;%raw;.xmp");
186 options->layout.order = g_strdup("123"); 184 options->layout.order = g_strdup("123");
187 185
188 options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH); 186 options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
189 options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS); 187 options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
213 211
214 if (layout_valid(&lw)) 212 if (layout_valid(&lw))
215 { 213 {
216 layout_sync_options_with_current_state(lw); 214 layout_sync_options_with_current_state(lw);
217 copy_layout_options(&options->layout, &lw->options); 215 copy_layout_options(&options->layout, &lw->options);
218 options->image_overlay.common.state = image_osd_get(lw->image);
219 layout_sort_get(lw, &options->file_sort.method, &options->file_sort.ascending); 216 layout_sort_get(lw, &options->file_sort.method, &options->file_sort.ascending);
220 217
221 218
222 219
223 options->color_profile.enabled = layout_image_color_profile_get_use(lw); 220 options->color_profile.enabled = layout_image_color_profile_get_use(lw);