summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2017-09-07 12:27:54 +0200
committerWilliam Wilgus <me.theuser@yahoo.com>2018-06-05 16:35:17 +0200
commit0c06e5fe9063db11049d1b1ecf41825d2a803cd5 (patch)
treee8bafd7b6466e45c71ca43d577099578a4fb2790
parent641e033e33bbb918c7324e9626b4a4e36aa13b8d (diff)
downloadrockbox-0c06e5fe9063db11049d1b1ecf41825d2a803cd5.tar.gz
rockbox-0c06e5fe9063db11049d1b1ecf41825d2a803cd5.zip
Add file view menu to file browser
Allows changing file sort options directly through context menu in the file browser rather than having to exit the browser and go through General Settings>File_View Change-Id: Iec124d512dcb934bd261b2144a699c23f536c165
-rw-r--r--apps/onplay.c3
-rw-r--r--apps/tree.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/onplay.c b/apps/onplay.c
index 091680e949..f44d339246 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -69,6 +69,7 @@ static int context;
69static const char *selected_file = NULL; 69static const char *selected_file = NULL;
70static int selected_file_attr = 0; 70static int selected_file_attr = 0;
71static int onplay_result = ONPLAY_OK; 71static int onplay_result = ONPLAY_OK;
72extern struct menu_item_ex file_menu; /* settings_menu.c */
72 73
73/* redefine MAKE_MENU so the MENU_EXITAFTERTHISMENU flag can be added easily */ 74/* redefine MAKE_MENU so the MENU_EXITAFTERTHISMENU flag can be added easily */
74#define MAKE_ONPLAYMENU( name, str, callback, icon, ... ) \ 75#define MAKE_ONPLAYMENU( name, str, callback, icon, ... ) \
@@ -1397,7 +1398,7 @@ MAKE_ONPLAYMENU( tree_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
1397#ifdef HAVE_RECORDING 1398#ifdef HAVE_RECORDING
1398 &set_recdir_item, 1399 &set_recdir_item,
1399#endif 1400#endif
1400 &set_startdir_item, &add_to_faves_item, 1401 &set_startdir_item, &add_to_faves_item, &file_menu,
1401 ); 1402 );
1402static int onplaymenu_callback(int action,const struct menu_item_ex *this_item) 1403static int onplaymenu_callback(int action,const struct menu_item_ex *this_item)
1403{ 1404{
diff --git a/apps/tree.c b/apps/tree.c
index 938e44d350..8efccf5549 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -359,6 +359,7 @@ static int update_dir(void)
359 else 359 else
360#endif 360#endif
361 { 361 {
362 tc.sort_dir = global_settings.sort_dir;
362 /* if the tc.currdir has been changed, reload it ...*/ 363 /* if the tc.currdir has been changed, reload it ...*/
363 if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) 364 if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir)
364 { 365 {