# HG changeset patch # User zas_ # Date 1214734303 0 # Node ID 3dd2cb78d0f971b0a4ed6e6b72fca0d47be1823f # Parent 371a1c3d450426b4df081aaa8e14e2eb0542863a Make better matching between options types in options.h and the rest of the code. Most changes are from gint to gboolean pseudo type and between gint / guint. diff -r 371a1c3d4504 -r 3dd2cb78d0f9 src/options.c --- a/src/options.c Sat Jun 28 08:01:36 2008 +0000 +++ b/src/options.c Sun Jun 29 10:11:43 2008 +0000 @@ -64,7 +64,7 @@ options->histogram.last_log_mode = 1; memset(&options->image.border_color, 0, sizeof(options->image.border_color)); - options->image.dither_quality = (gint)GDK_RGB_DITHER_NORMAL; + options->image.dither_quality = GDK_RGB_DITHER_NORMAL; options->image.enable_read_ahead = TRUE; options->image.exif_rotate_enable = TRUE; options->image.fit_window_to_image = FALSE; @@ -81,10 +81,10 @@ 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_quality = GDK_INTERP_BILINEAR; options->image.zoom_to_fit_allow_expand = TRUE; - options->image_overlay.common.state = (guint)OSD_SHOW_NOTHING; + options->image_overlay.common.state = OSD_SHOW_NOTHING; options->image_overlay.common.show_at_startup = FALSE; options->image_overlay.common.template_string = NULL; options->image_overlay.common.x = 10; @@ -151,7 +151,7 @@ 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.quality = GDK_INTERP_TILES; options->thumbnails.spec_standard = TRUE; options->thumbnails.use_xvpics = TRUE; diff -r 371a1c3d4504 -r 3dd2cb78d0f9 src/options.h --- a/src/options.h Sat Jun 28 08:01:36 2008 +0000 +++ b/src/options.h Sun Jun 29 10:11:43 2008 +0000 @@ -16,28 +16,27 @@ struct _ConfOptions { - /* ui */ - gint progressive_key_scrolling; - gint place_dialogs_under_mouse; + gboolean progressive_key_scrolling; + gboolean place_dialogs_under_mouse; gboolean mousewheel_scrolls; - gint show_icon_names; - gint show_copy_path; + gboolean show_icon_names; + gboolean show_copy_path; /* various */ - gint enable_metadata_dirs; + gboolean enable_metadata_dirs; - gint tree_descend_subdirs; + gboolean tree_descend_subdirs; - gint lazy_image_sync; - gint update_on_time_change; + gboolean lazy_image_sync; + gboolean update_on_time_change; - gint duplicates_similarity_threshold; + guint duplicates_similarity_threshold; gint open_recent_list_maxsize; gint dnd_icon_size; - gint save_metadata_in_image_file; + gboolean save_metadata_in_image_file; struct { gboolean restore_path; @@ -47,11 +46,11 @@ /* file ops */ struct { - gint enable_in_place_rename; + gboolean enable_in_place_rename; - gint confirm_delete; - gint enable_delete_key; - gint safe_delete_enable; + gboolean confirm_delete; + gboolean enable_delete_key; + gboolean safe_delete_enable; gchar *safe_delete_path; gint safe_delete_folder_maxsize; } file_ops; @@ -68,13 +67,13 @@ gint tile_cache_max; /* in megabytes */ gint image_cache_max; /* in megabytes */ - gint dither_quality; + guint dither_quality; gboolean enable_read_ahead; gint zoom_mode; gboolean zoom_2pass; gboolean zoom_to_fit_allow_expand; - gint zoom_quality; + guint zoom_quality; gint zoom_increment; /* 10 is 1.0, 5 is 0.05, 20 is 2.0, etc. */ gint use_custom_border_color; @@ -88,24 +87,24 @@ struct { gint max_width; gint max_height; - gint enable_caching; - gint cache_into_dirs; - gint fast; - gint use_xvpics; - gint spec_standard; - gint quality; + gboolean enable_caching; + gboolean cache_into_dirs; + gboolean fast; + gboolean use_xvpics; + gboolean spec_standard; + guint quality; } thumbnails; /* file filtering */ struct { - gint show_hidden_files; - gint show_dot_directory; - gint disable; + gboolean show_hidden_files; + gboolean show_dot_directory; + gboolean disable; } file_filter; /* collections */ struct { - gint rectangular_selection; + gboolean rectangular_selection; } collections; /* editors */ @@ -120,23 +119,23 @@ /* file sorting */ struct { SortType method; - gint ascending; - gint case_sensitive; /* file sorting method (case) */ + gboolean ascending; + gboolean case_sensitive; /* file sorting method (case) */ } file_sort; /* slideshow */ struct { gint delay; /* in tenths of a second */ - gint random; - gint repeat; + gboolean random; + gboolean repeat; } slideshow; /* fullscreen */ struct { gint screen; - gint clean_flip; - gint disable_saver; - gint above; + gboolean clean_flip; + gboolean disable_saver; + gboolean above; } fullscreen; /* histogram */ @@ -149,7 +148,7 @@ struct { struct { guint state; - gint show_at_startup; + gboolean show_at_startup; gchar *template_string; gint x; gint y; @@ -164,8 +163,8 @@ DirViewType dir_view_type; FileViewType file_view_type; - gint show_thumbnails; - gint show_marks; + gboolean show_thumbnails; + gboolean show_marks; gboolean show_directory_date; struct { @@ -173,7 +172,7 @@ gint h; gint x; gint y; - gint maximized; + gboolean maximized; gint hdivider_pos; gint vdivider_pos; } main_window; @@ -191,30 +190,30 @@ gint h; } properties_window; - gint save_window_positions; + gboolean save_window_positions; - gint tools_float; - gint tools_hidden; - gint tools_restore_state; + gboolean tools_float; + gboolean tools_hidden; + gboolean tools_restore_state; - gint toolbar_hidden; + gboolean toolbar_hidden; } layout; /* panels */ struct { struct { - gint enabled; + gboolean enabled; gint width; } info; struct { - gint enabled; + gboolean enabled; gint width; } exif; struct { - gint enabled; + gboolean enabled; gint mode_state; gint action_state; gint selection_state; @@ -228,13 +227,13 @@ /* color profiles */ struct { - gint enabled; + gboolean enabled; gint input_type; gchar *input_file[COLOR_PROFILE_INPUTS]; gchar *input_name[COLOR_PROFILE_INPUTS]; gint screen_type; gchar *screen_file; - gint use_image; + gboolean use_image; } color_profile; diff -r 371a1c3d4504 -r 3dd2cb78d0f9 src/rcfile.c --- a/src/rcfile.c Sat Jun 28 08:01:36 2008 +0000 +++ b/src/rcfile.c Sun Jun 29 10:11:43 2008 +0000 @@ -354,7 +354,7 @@ WRITE_BOOL(enable_metadata_dirs); WRITE_BOOL(save_metadata_in_image_file); - WRITE_INT(duplicates_similarity_threshold); + WRITE_UINT(duplicates_similarity_threshold); WRITE_SEPARATOR(); WRITE_BOOL(mousewheel_scrolls); @@ -451,7 +451,7 @@ WRITE_SEPARATOR(); WRITE_BOOL(image.zoom_2pass); WRITE_BOOL(image.zoom_to_fit_allow_expand); - WRITE_INT(image.zoom_quality); + WRITE_UINT(image.zoom_quality); WRITE_INT(image.zoom_increment); WRITE_BOOL(image.fit_window_to_image); WRITE_BOOL(image.limit_window_size); @@ -461,7 +461,7 @@ WRITE_UINT(image.scroll_reset_method); WRITE_INT(image.tile_cache_max); WRITE_INT(image.image_cache_max); - WRITE_INT(image.dither_quality); + WRITE_UINT(image.dither_quality); WRITE_BOOL(image.enable_read_ahead); WRITE_BOOL(image.exif_rotate_enable); WRITE_BOOL(image.use_custom_border_color); @@ -478,7 +478,7 @@ WRITE_BOOL(thumbnails.fast); WRITE_BOOL(thumbnails.use_xvpics); WRITE_BOOL(thumbnails.spec_standard); - WRITE_INT(thumbnails.quality); + WRITE_UINT(thumbnails.quality); WRITE_SUBTITLE("File sorting Options"); @@ -726,7 +726,7 @@ READ_BOOL(lazy_image_sync); READ_BOOL(update_on_time_change); - READ_INT(duplicates_similarity_threshold); + READ_UINT_CLAMP(duplicates_similarity_threshold, 0, 100); READ_BOOL(progressive_key_scrolling); @@ -822,8 +822,8 @@ READ_UINT_CLAMP(image.scroll_reset_method, 0, PR_SCROLL_RESET_COUNT - 1); READ_INT(image.tile_cache_max); READ_INT(image.image_cache_max); - READ_INT_CLAMP(image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER); - READ_INT_CLAMP(image.dither_quality, GDK_RGB_DITHER_NONE, GDK_RGB_DITHER_MAX); + READ_UINT_CLAMP(image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER); + READ_UINT_CLAMP(image.dither_quality, GDK_RGB_DITHER_NONE, GDK_RGB_DITHER_MAX); READ_INT(image.zoom_increment); READ_BOOL(image.enable_read_ahead); READ_BOOL(image.exif_rotate_enable); @@ -842,7 +842,7 @@ READ_BOOL(thumbnails.fast); READ_BOOL(thumbnails.use_xvpics); READ_BOOL(thumbnails.spec_standard); - READ_INT_CLAMP(thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER); + READ_UINT_CLAMP(thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER); /* file sorting options */ READ_UINT(file_sort.method);