diff src/globals.c @ 431:d7272434b8c2

Sort options.

--- a/src/globals.c	Sat Apr 19 21:10:18 2008 +0000
+++ b/src/globals.c	Sat Apr 19 21:18:24 2008 +0000
@@ -21,124 +21,107 @@
 {
 	if (!options) options = g_new0(ConfOptions, 1);
 
-	options->layout.main_window.w = 500;
-	options->layout.main_window.h = 400;
-	options->layout.main_window.x = 0;
-	options->layout.main_window.y = 0;
-	options->layout.main_window.maximized = FALSE;
+	options->collections.rectangular_selection = FALSE;
 	
-	options->layout.float_window.w = 260;
-	options->layout.float_window.h = 450;
-	options->layout.float_window.x = 0;
-	options->layout.float_window.y = 0;
-	options->layout.float_window.vdivider_pos = -1;
+	options->color_profile.enabled = FALSE;
+	options->color_profile.input_type = 0;
+	options->color_profile.screen_file = NULL;
+	options->color_profile.screen_type = 0;
+	options->color_profile.use_image = TRUE;
 	
-	options->layout.main_window.hdivider_pos = -1;
-	options->layout.main_window.vdivider_pos = 200;
+	options->duplicates_similarity_threshold = 99;
+	options->enable_metadata_dirs = FALSE;
 	
-	options->layout.save_window_positions = FALSE;
-	options->layout.tools_float = FALSE;
-	options->layout.tools_hidden = FALSE;
-	options->layout.toolbar_hidden = FALSE;
-	options->progressive_key_scrolling = FALSE;
+	options->file_filter.disable = FALSE;
+	options->file_filter.show_dot_directory = FALSE;
+	options->file_filter.show_hidden_files = FALSE;
 	
-	options->startup_path_enable = FALSE;
-	options->startup_path = NULL;
 	options->file_ops.confirm_delete = TRUE;
 	options->file_ops.enable_delete_key = TRUE;
+	options->file_ops.enable_in_place_rename = TRUE;
 	options->file_ops.safe_delete_enable = FALSE;
-	options->file_ops.safe_delete_path = NULL;
 	options->file_ops.safe_delete_folder_maxsize = 128;
-	options->layout.tools_restore_state = FALSE;
-
-	options->image.zoom_mode = ZOOM_RESET_ORIGINAL;
-	options->image.zoom_2pass = TRUE;
-	options->image.scroll_reset_method = SCROLL_RESET_TOPLEFT;
+	options->file_ops.safe_delete_path = NULL;
+	
+	options->file_sort.ascending = TRUE;
+	options->file_sort.case_sensitive = FALSE;
+	options->file_sort.method = SORT_NAME;
+	
+	options->fullscreen.above = FALSE;
+	options->fullscreen.clean_flip = FALSE;
+	options->fullscreen.disable_saver = TRUE;
+	options->fullscreen.info = NULL;
+	options->fullscreen.screen = -1;
+	options->fullscreen.show_info = TRUE;
+	
+	memset(&options->image.border_color, 0, sizeof(options->image.border_color));
+	options->image.dither_quality = (gint)GDK_RGB_DITHER_NORMAL;
+	options->image.enable_read_ahead = TRUE;
+	options->image.exif_rotate_enable = TRUE;
 	options->image.fit_window_to_image = FALSE;
-	options->image.limit_window_size = FALSE;
-	options->image.zoom_to_fit_allow_expand = TRUE;
-	options->image.max_window_size = 100;
+	options->image.idle_read_loop_count = IMAGE_LOADER_IDLE_READ_LOOP_COUNT_DEFAULT;
 	options->image.limit_autofit_size = FALSE;
+	options->image.limit_window_size = FALSE;
 	options->image.max_autofit_size = 100;
-	
+	options->image.max_window_size = 100;
 	options->image.read_buffer_size = IMAGE_LOADER_READ_BUFFER_SIZE_DEFAULT;
-	options->image.idle_read_loop_count = IMAGE_LOADER_IDLE_READ_LOOP_COUNT_DEFAULT;
+	options->image.scroll_reset_method = SCROLL_RESET_TOPLEFT;
+	options->image.tile_cache_max = 10;
+	options->image.use_custom_border_color = FALSE;
+	options->image.zoom_2pass = TRUE;
+	options->image.zoom_increment = 5;
+	options->image.zoom_mode = ZOOM_RESET_ORIGINAL;
+	options->image.zoom_quality = (gint)GDK_INTERP_BILINEAR;
+	options->image.zoom_to_fit_allow_expand = TRUE;
 
-	options->thumbnails.max_width = DEFAULT_THUMB_WIDTH;
-	options->thumbnails.max_height = DEFAULT_THUMB_HEIGHT;
-	options->thumbnails.enable_caching = TRUE;
-	options->thumbnails.cache_into_dirs = FALSE;
-	options->thumbnails.use_xvpics = TRUE;
-	options->thumbnails.fast = TRUE;
-	options->thumbnails.spec_standard = TRUE;
-	options->enable_metadata_dirs = FALSE;
-
-	options->file_filter.show_hidden_files = FALSE;
-	options->file_filter.show_dot_directory = FALSE;
-	options->file_filter.disable = FALSE;
+	options->layout.dir_view_type = DIRVIEW_LIST;
+	options->layout.float_window.h = 450;
+	options->layout.float_window.vdivider_pos = -1;
+	options->layout.float_window.w = 260;
+	options->layout.float_window.x = 0;
+	options->layout.float_window.y = 0;
+	options->layout.main_window.h = 400;
+	options->layout.main_window.hdivider_pos = -1;
+	options->layout.main_window.maximized = FALSE;
+	options->layout.main_window.vdivider_pos = 200;
+	options->layout.main_window.w = 500;
+	options->layout.main_window.x = 0;
+	options->layout.main_window.y = 0;
+	options->layout.order = NULL;
+	options->layout.save_window_positions = FALSE;
+	options->layout.show_thumbnails = FALSE;
+	options->layout.style = 0;
+	options->layout.toolbar_hidden = FALSE;
+	options->layout.tools_float = FALSE;
+	options->layout.tools_hidden = FALSE;
+	options->layout.tools_restore_state = FALSE;
+	options->layout.view_as_icons = FALSE;
 	
-	
-	options->layout.show_thumbnails = FALSE;
-	options->file_sort.method = SORT_NAME;
-	options->file_sort.ascending = TRUE;
+	options->lazy_image_sync = FALSE;
+	options->mousewheel_scrolls = FALSE;
+	options->open_recent_list_maxsize = 10;
+	options->place_dialogs_under_mouse = FALSE;
+	options->progressive_key_scrolling = FALSE;
+	options->show_icon_names = TRUE;
 	
 	options->slideshow.delay = 150;
 	options->slideshow.random = FALSE;
 	options->slideshow.repeat = FALSE;
 	
-	options->mousewheel_scrolls = FALSE;
-	options->file_ops.enable_in_place_rename = TRUE;
-	
-	options->open_recent_list_maxsize = 10;
-	
-	options->collections.rectangular_selection = FALSE;
-	
-	options->image.tile_cache_max = 10;
-	options->thumbnails.quality = (gint)GDK_INTERP_TILES;
-	options->image.zoom_quality = (gint)GDK_INTERP_BILINEAR;
-	options->image.dither_quality = (gint)GDK_RGB_DITHER_NORMAL;
-	
-	options->image.zoom_increment = 5;
-	
-	options->image.enable_read_ahead = TRUE;
-	
-	options->place_dialogs_under_mouse = FALSE;
-	
-	options->image.use_custom_border_color = FALSE;
-	memset(&options->image.border_color, 0, sizeof(options->image.border_color));
+	options->startup_path_enable = FALSE;
+	options->startup_path = NULL;
 	
-	options->fullscreen.screen = -1;
-	options->fullscreen.clean_flip = FALSE;
-	options->fullscreen.disable_saver = TRUE;
-	options->fullscreen.above = FALSE;
-	options->fullscreen.show_info = TRUE;
-	options->fullscreen.info = NULL;
+	options->thumbnails.cache_into_dirs = FALSE;
+	options->thumbnails.enable_caching = TRUE;
+	options->thumbnails.fast = TRUE;
+	options->thumbnails.max_height = DEFAULT_THUMB_HEIGHT;
+	options->thumbnails.max_width = DEFAULT_THUMB_WIDTH;
+	options->thumbnails.quality = (gint)GDK_INTERP_TILES;
+	options->thumbnails.spec_standard = TRUE;
+	options->thumbnails.use_xvpics = TRUE;
 	
-	options->duplicates_similarity_threshold = 99;
-
-	options->file_sort.case_sensitive = FALSE;
-
-	/* layout */
-	options->layout.order = NULL;
-	options->layout.style = 0;
-
-	options->layout.view_as_icons = FALSE;
-	options->layout.dir_view_type = DIRVIEW_LIST;
-
-	options->show_icon_names = TRUE;
-
 	options->tree_descend_subdirs = FALSE;
-
-	options->lazy_image_sync = FALSE;
 	options->update_on_time_change = TRUE;
-	options->image.exif_rotate_enable = TRUE;
-
-	/* color profiles */
-	options->color_profile.enabled = FALSE;
-	options->color_profile.input_type = 0;
-	options->color_profile.screen_type = 0;
-	options->color_profile.screen_file = NULL;
-	options->color_profile.use_image = TRUE;
 
 	return options;
 }