diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2005-08-17 09:40:07 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2005-08-17 09:40:07 +0000 |
commit | 96ff4b3d68ce3a6a58d5184f817ccd54bb24edab (patch) | |
tree | 3acdc59d22be30fdc2a36a51a4bf3c4a3b3840cf /apps | |
parent | a387805071b1200956535390f3c82497bfab333d (diff) | |
download | rockbox-96ff4b3d68ce3a6a58d5184f817ccd54bb24edab.tar.gz rockbox-96ff4b3d68ce3a6a58d5184f817ccd54bb24edab.zip |
Don't show dirs when browsing WPS files, .cfg files, fonts, languages and firmwares
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7337 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetree.c | 3 | ||||
-rw-r--r-- | apps/tree.c | 3 | ||||
-rw-r--r-- | apps/tree.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index c7a2dbf071..e6ba08b96e 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -218,7 +218,8 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
218 | (((len == 1) && | 218 | (((len == 1) && |
219 | (!strncmp(entry->d_name, ".", 1))) || | 219 | (!strncmp(entry->d_name, ".", 1))) || |
220 | ((len == 2) && | 220 | ((len == 2) && |
221 | (!strncmp(entry->d_name, "..", 2))))) { | 221 | (!strncmp(entry->d_name, "..", 2))) || |
222 | c->hidedirs)) { | ||
222 | i--; | 223 | i--; |
223 | continue; | 224 | continue; |
224 | } | 225 | } |
diff --git a/apps/tree.c b/apps/tree.c index 8e1afb8b67..1a7f1045f7 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -1447,7 +1447,7 @@ bool create_playlist(void) | |||
1447 | return true; | 1447 | return true; |
1448 | } | 1448 | } |
1449 | 1449 | ||
1450 | bool rockbox_browse(const char *root, int dirfilter) | 1450 | bool rockbox_browse(const char *root, int dirfilter, bool hidedirs) |
1451 | { | 1451 | { |
1452 | static struct tree_context backup; | 1452 | static struct tree_context backup; |
1453 | 1453 | ||
@@ -1456,6 +1456,7 @@ bool rockbox_browse(const char *root, int dirfilter) | |||
1456 | memcpy(tc.currdir, root, sizeof(tc.currdir)); | 1456 | memcpy(tc.currdir, root, sizeof(tc.currdir)); |
1457 | start_wps = false; | 1457 | start_wps = false; |
1458 | tc.dirfilter = &dirfilter; | 1458 | tc.dirfilter = &dirfilter; |
1459 | tc.hidedirs = hidedirs; | ||
1459 | 1460 | ||
1460 | dirbrowse(); | 1461 | dirbrowse(); |
1461 | 1462 | ||
diff --git a/apps/tree.h b/apps/tree.h index 41ef0e527f..2e6b21dd3a 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -150,6 +150,7 @@ struct tree_context { | |||
150 | int cursorpos[MAX_DIR_LEVELS]; | 150 | int cursorpos[MAX_DIR_LEVELS]; |
151 | char currdir[MAX_PATH]; /* file use */ | 151 | char currdir[MAX_PATH]; /* file use */ |
152 | int *dirfilter; /* file use */ | 152 | int *dirfilter; /* file use */ |
153 | bool hidedirs; | ||
153 | int filesindir; | 154 | int filesindir; |
154 | int dirsindir; /* file use */ | 155 | int dirsindir; /* file use */ |
155 | int dirlength; /* total number of entries in dir, incl. those not loaded */ | 156 | int dirlength; /* total number of entries in dir, incl. those not loaded */ |
@@ -186,7 +187,7 @@ void tree_get_filetypes(const struct filetype**, int*); | |||
186 | void tree_init(void); | 187 | void tree_init(void); |
187 | void browse_root(void); | 188 | void browse_root(void); |
188 | void set_current_file(char *path); | 189 | void set_current_file(char *path); |
189 | bool rockbox_browse(const char *root, int dirfilter); | 190 | bool rockbox_browse(const char *root, int dirfilter, bool hidedirs); |
190 | bool create_playlist(void); | 191 | bool create_playlist(void); |
191 | void resume_directory(const char *dir); | 192 | void resume_directory(const char *dir); |
192 | char *getcwd(char *buf, int size); | 193 | char *getcwd(char *buf, int size); |