Rename collection options.

diff --git a/src/collect-table.c b/src/collect-table.c
index 0e9bed4..9fe7f8a 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -366,7 +366,7 @@ static void collection_table_select_region_util(CollectTable *ct, CollectInfo *s
 
        ct->prev_selection = end;
 
-       if (!options->collection_rectangular_selection)
+       if (!options->collections.rectangular_selection)
                {
                GList *work;
                CollectInfo *info;
@@ -1100,7 +1100,7 @@ static gint collection_table_press_key_cb(GtkWidget *widget, GdkEventKey *event,
                        {
                        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);
                                        }

diff --git a/src/globals.c b/src/globals.c
index e2eada5..57fd98a 100644 (file)
--- a/src/globals.c
+++ b/src/globals.c
@@ -84,7 +84,7 @@ ConfOptions *init_options(ConfOptions *options)
        
        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;

diff --git a/src/preferences.c b/src/preferences.c
index 76630b3..fd688a1 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -222,7 +222,7 @@ static void config_window_apply(void)
 
        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 @@ static void config_tab_advanced(GtkWidget *notebook)
        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);

diff --git a/src/rcfile.c b/src/rcfile.c
index 4ba22d1..c6c57c3 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -427,7 +427,7 @@ void save_options(void)
 
        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 @@ void load_options(void)
 
                /* 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 */
 

diff --git a/src/typedefs.h b/src/typedefs.h
index 20380f2..5f691ec 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -818,7 +818,9 @@ struct _ConfOptions
        gint file_filter_disable;
 
        /* collections */
-       gint collection_rectangular_selection;
+       struct {
+               gint rectangular_selection;
+       } collections;
 
        /* editors */
        gchar *editor_name[GQ_EDITOR_SLOTS];

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index 5b7ed5f..32b2c6a 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -860,7 +860,7 @@ static void vficon_select_region_util(ViewFileIcon *vfi, IconData *start, IconDa
 
        vfi->prev_selection = end;
 
-       if (!options->collection_rectangular_selection)
+       if (!options->collections.rectangular_selection)
                {
                GList *work;
                IconData *id;
@@ -1382,7 +1382,7 @@ static gint vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer
                        {
                        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);
                                        }