Mercurial > geeqie
changeset 330:57a4ced53618
Rename collection options.
| author | zas_ |
|---|---|
| date | Sat, 12 Apr 2008 08:40:02 +0000 |
| parents | a51242c032ea |
| children | d8e285551598 |
| files | src/collect-table.c src/globals.c src/preferences.c src/rcfile.c src/typedefs.h src/view_file_icon.c |
| diffstat | 6 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/collect-table.c Sat Apr 12 08:35:58 2008 +0000 +++ b/src/collect-table.c Sat Apr 12 08:40:02 2008 +0000 @@ -366,7 +366,7 @@ ct->prev_selection = end; - if (!options->collection_rectangular_selection) + if (!options->collections.rectangular_selection) { GList *work; CollectInfo *info; @@ -1100,7 +1100,7 @@ { if (event->state & GDK_SHIFT_MASK) { - if (!options->collection_rectangular_selection) + if (!options->collections.rectangular_selection) { collection_table_select_region_util(ct, old_info, new_info, FALSE); }
--- a/src/globals.c Sat Apr 12 08:35:58 2008 +0000 +++ b/src/globals.c Sat Apr 12 08:40:02 2008 +0000 @@ -84,7 +84,7 @@ options->recent_list_max = 10; - options->collection_rectangular_selection = FALSE; + options->collections.rectangular_selection = FALSE; options->tile_cache_max = 10; options->thumbnail_quality = (gint)GDK_INTERP_TILES;
--- a/src/preferences.c Sat Apr 12 08:35:58 2008 +0000 +++ b/src/preferences.c Sat Apr 12 08:40:02 2008 +0000 @@ -222,7 +222,7 @@ options->enable_in_place_rename = c_options->enable_in_place_rename; - options->collection_rectangular_selection = c_options->collection_rectangular_selection; + options->collections.rectangular_selection = c_options->collections.rectangular_selection; options->tile_cache_max = c_options->tile_cache_max; @@ -1350,7 +1350,7 @@ group = pref_group_new(vbox, FALSE, _("Behavior"), GTK_ORIENTATION_VERTICAL); pref_checkbox_new_int(group, _("Rectangular selection in icon view"), - options->collection_rectangular_selection, &c_options->collection_rectangular_selection); + options->collections.rectangular_selection, &c_options->collections.rectangular_selection); pref_checkbox_new_int(group, _("Descend folders in tree view"), options->tree_descend_subdirs, &c_options->tree_descend_subdirs);
--- a/src/rcfile.c Sat Apr 12 08:35:58 2008 +0000 +++ b/src/rcfile.c Sat Apr 12 08:40:02 2008 +0000 @@ -427,7 +427,7 @@ secure_fprintf(ssi, "\n##### Collection Options #####\n\n"); - write_bool_option(ssi, "rectangular_selections", options->collection_rectangular_selection); + write_bool_option(ssi, "collections.rectangular_selection", options->collections.rectangular_selection); secure_fprintf(ssi, "\n##### Window Positions #####\n\n"); @@ -754,8 +754,8 @@ /* colection options */ - options->collection_rectangular_selection = read_bool_option(f, option, - "rectangular_selections", value, options->collection_rectangular_selection); + options->collections.rectangular_selection = read_bool_option(f, option, + "collections.rectangular_selection", value, options->collections.rectangular_selection); /* window positions */
--- a/src/typedefs.h Sat Apr 12 08:35:58 2008 +0000 +++ b/src/typedefs.h Sat Apr 12 08:40:02 2008 +0000 @@ -818,7 +818,9 @@ gint file_filter_disable; /* collections */ - gint collection_rectangular_selection; + struct { + gint rectangular_selection; + } collections; /* editors */ gchar *editor_name[GQ_EDITOR_SLOTS];
--- a/src/view_file_icon.c Sat Apr 12 08:35:58 2008 +0000 +++ b/src/view_file_icon.c Sat Apr 12 08:40:02 2008 +0000 @@ -860,7 +860,7 @@ vfi->prev_selection = end; - if (!options->collection_rectangular_selection) + if (!options->collections.rectangular_selection) { GList *work; IconData *id; @@ -1382,7 +1382,7 @@ { if (event->state & GDK_SHIFT_MASK) { - if (!options->collection_rectangular_selection) + if (!options->collections.rectangular_selection) { vficon_select_region_util(vfi, old_id, new_id, FALSE); }