Rename show_dot_files to show_hidden_files.

There is no need to expose the underlying method to hide
files.

diff --git a/src/filelist.c b/src/filelist.c
index 9d725ee..3fcc1fd 100644 (file)
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -423,7 +423,7 @@ GList *path_list_filter(GList *list, gint is_dir_list)
 {
        GList *work;
 
-       if (!is_dir_list && options->file_filter.disable && options->file_filter.show_dot_files) return list;
+       if (!is_dir_list && options->file_filter.disable && options->file_filter.show_hidden_files) return list;
 
        work = list;
        while (work)
@@ -433,7 +433,7 @@ GList *path_list_filter(GList *list, gint is_dir_list)
 
                base = filename_from_path(name);
 
-               if ((!options->file_filter.show_dot_files && ishidden(base)) ||
+               if ((!options->file_filter.show_hidden_files && ishidden(base)) ||
                    (!is_dir_list && !filter_name_exists(base)) ||
                    (is_dir_list && base[0] == '.' && (strcmp(base, GQ_CACHE_LOCAL_THUMB) == 0 ||
                                                       strcmp(base, GQ_CACHE_LOCAL_METADATA) == 0)) )
@@ -1220,7 +1220,7 @@ static gint filelist_read_real(const gchar *path, GList **files, GList **dirs, g
        while ((dir = readdir(dp)) != NULL)
                {
                gchar *name = dir->d_name;
-               if (options->file_filter.show_dot_files || !ishidden(name))
+               if (options->file_filter.show_hidden_files || !ishidden(name))
                        {
                        gchar *filepath = g_strconcat(pathl, "/", name, NULL);
                        if ((follow_symlinks ? 
@@ -1349,7 +1349,7 @@ GList *filelist_filter(GList *list, gint is_dir_list)
 {
        GList *work;
 
-       if (!is_dir_list && options->file_filter.disable && options->file_filter.show_dot_files) return list;
+       if (!is_dir_list && options->file_filter.disable && options->file_filter.show_hidden_files) return list;
 
        work = list;
        while (work)
@@ -1357,7 +1357,7 @@ GList *filelist_filter(GList *list, gint is_dir_list)
                FileData *fd = (FileData *)(work->data);
                const gchar *name = fd->name;
 
-               if ((!options->file_filter.show_dot_files && ishidden(name)) ||
+               if ((!options->file_filter.show_hidden_files && ishidden(name)) ||
                    (!is_dir_list && !filter_name_exists(name)) ||
                    (is_dir_list && name[0] == '.' && (strcmp(name, GQ_CACHE_LOCAL_THUMB) == 0 ||
                                                       strcmp(name, GQ_CACHE_LOCAL_METADATA) == 0)) )

diff --git a/src/globals.c b/src/globals.c
index 8fc0ea1..e0aa112 100644 (file)
--- a/src/globals.c
+++ b/src/globals.c
@@ -67,7 +67,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->thumbnails.fast = TRUE;
        options->thumbnails.spec_standard = TRUE;
        options->enable_metadata_dirs = FALSE;
-       options->file_filter.show_dot_files = FALSE;
+       options->file_filter.show_hidden_files = FALSE;
        options->file_filter.disable = FALSE;
        
        

diff --git a/src/preferences.c b/src/preferences.c
index a2ca6dc..c90a01c 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -178,7 +178,7 @@ static void config_window_apply(void)
        buf = gtk_entry_get_text(GTK_ENTRY(safe_delete_path_entry));
        if (buf && strlen(buf) > 0) options->file_ops.safe_delete_path = remove_trailing_slash(buf);
 
-       if (options->file_filter.show_dot_files != c_options->file_filter.show_dot_files) refresh = TRUE;
+       if (options->file_filter.show_hidden_files != c_options->file_filter.show_hidden_files) refresh = TRUE;
        if (options->file_sort.case_sensitive != c_options->file_sort.case_sensitive) refresh = TRUE;
        if (options->file_filter.disable != c_options->file_filter.disable) refresh = TRUE;
 
@@ -208,7 +208,7 @@ static void config_window_apply(void)
 #endif
        options->thumbnails.spec_standard = c_options->thumbnails.spec_standard;
        options->enable_metadata_dirs = c_options->enable_metadata_dirs;
-       options->file_filter.show_dot_files = c_options->file_filter.show_dot_files;
+       options->file_filter.show_hidden_files = c_options->file_filter.show_hidden_files;
        options->file_sort.case_sensitive = c_options->file_sort.case_sensitive;
        options->file_filter.disable = c_options->file_filter.disable;
 
@@ -1029,8 +1029,8 @@ static void config_tab_filtering(GtkWidget *notebook)
 
        group = pref_box_new(vbox, FALSE, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
 
-       pref_checkbox_new_int(group, _("Show entries that begin with a dot"),
-                             options->file_filter.show_dot_files, &c_options->file_filter.show_dot_files);
+       pref_checkbox_new_int(group, _("Show hidden files or folders"),
+                             options->file_filter.show_hidden_files, &c_options->file_filter.show_hidden_files);
        pref_checkbox_new_int(group, _("Case sensitive sort"),
                              options->file_sort.case_sensitive, &c_options->file_sort.case_sensitive);
 

diff --git a/src/rcfile.c b/src/rcfile.c
index c97faac..baba9a0 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -423,7 +423,7 @@ void save_options(void)
 
        secure_fprintf(ssi, "\n##### Filtering Options #####\n\n");
 
-       write_bool_option(ssi, "file_filter.show_dot_files", options->file_filter.show_dot_files);
+       write_bool_option(ssi, "file_filter.show_hidden_files", options->file_filter.show_hidden_files);
        write_bool_option(ssi, "file_filter.disable", options->file_filter.disable);
        secure_fputc(ssi, '\n');
 
@@ -690,7 +690,7 @@ void load_options(void)
 
                /* filtering options */
 
-               READ_BOOL(file_filter.show_dot_files);
+               READ_BOOL(file_filter.show_hidden_files);
                READ_BOOL(file_filter.disable);
 
                if (strcasecmp(option, "file_filter.ext") == 0)

diff --git a/src/typedefs.h b/src/typedefs.h
index 11c003f..8ab0180 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -801,7 +801,7 @@ struct _ConfOptions
 
        /* file filtering */
        struct {
-               gint show_dot_files;
+               gint show_hidden_files;
                gint disable;
        } file_filter;
 

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index 3ec92f5..d5a9426 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -371,11 +371,11 @@ static void vdlist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
        if (vdl->layout) layout_refresh(vdl->layout);
 }
 
-static void vdlist_toggle_show_dot_files_cb(GtkWidget *widget, gpointer data)
+static void vdlist_toggle_show_hidden_files_cb(GtkWidget *widget, gpointer data)
 {
        ViewDirList *vdl = data;
 
-       options->file_filter.show_dot_files = !options->file_filter.show_dot_files;
+       options->file_filter.show_hidden_files = !options->file_filter.show_hidden_files;
        if (vdl->layout) layout_refresh(vdl->layout);
 }
 
@@ -426,8 +426,8 @@ static GtkWidget *vdlist_pop_menu(ViewDirList *vdl, FileData *fd)
        menu_item_add_divider(menu);
        menu_item_add_check(menu, _("View as _tree"), FALSE,
                            G_CALLBACK(vdlist_pop_menu_tree_cb), vdl);
-       menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_dot_files,
-                           G_CALLBACK(vdlist_toggle_show_dot_files_cb), vdl);
+       menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_hidden_files,
+                           G_CALLBACK(vdlist_toggle_show_hidden_files_cb), vdl);
 
        menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH,
                            G_CALLBACK(vdlist_pop_menu_refresh_cb), vdl);

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index 03b41a4..e3ef76c 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -462,11 +462,11 @@ static void vdtree_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
        if (vdt->layout) layout_refresh(vdt->layout);
 }
 
-static void vdtree_toggle_show_dot_files_cb(GtkWidget *widget, gpointer data)
+static void vdtree_toggle_show_hidden_files_cb(GtkWidget *widget, gpointer data)
 {
        ViewDirTree *vdt = data;
 
-       options->file_filter.show_dot_files = !options->file_filter.show_dot_files;
+       options->file_filter.show_hidden_files = !options->file_filter.show_hidden_files;
        if (vdt->layout) layout_refresh(vdt->layout);
 }
 
@@ -521,8 +521,8 @@ static GtkWidget *vdtree_pop_menu(ViewDirTree *vdt, FileData *fd)
        menu_item_add_divider(menu);
        menu_item_add_check(menu, _("View as _tree"), TRUE,
                            G_CALLBACK(vdtree_pop_menu_tree_cb), vdt);
-       menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_dot_files,
-                           G_CALLBACK(vdtree_toggle_show_dot_files_cb), vdt);
+       menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_hidden_files,
+                           G_CALLBACK(vdtree_toggle_show_hidden_files_cb), vdt);
 
        menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH,
                            G_CALLBACK(vdtree_pop_menu_refresh_cb), vdt);
@@ -1073,7 +1073,7 @@ static gint vdtree_populate_path_by_iter(ViewDirTree *vdt, GtkTreeIter *iter, gi
        /* when hidden files are not enabled, and the user enters a hidden path,
         * allow the tree to display that path by specifically inserting the hidden entries
         */
-       if (!options->file_filter.show_dot_files &&
+       if (!options->file_filter.show_hidden_files &&
            target_path &&
            strncmp(nd->fd->path, target_path, strlen(nd->fd->path)) == 0)
                {