devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

charcell doesnt show titles in lists, so remove the "show path" setting and free up some bin space

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16069 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-01-13 09:29:45 +00:00
parent f4f90c2283
commit 189f9e2be9
5 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/menus/settings_menu.c
View file

@ -94,7 +94,9 @@ MENUITEM_SETTING(sort_file, &global_settings.sort_file, fileview_callback);
MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL);
MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL);
MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL);
#ifdef HAVE_LCD_BITMAP
MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL);
#endif
static int fileview_callback(int action,const struct menu_item_ex *this_item) static int fileview_callback(int action,const struct menu_item_ex *this_item)
{ {
static int oldval; static int oldval;
@ -115,7 +117,10 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item)
MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu,
&sort_case, &sort_dir, &sort_file, &sort_case, &sort_dir, &sort_file,
&dirfilter, &show_filename_ext, &browse_current, &dirfilter, &show_filename_ext, &browse_current,
&show_path_in_browser); #ifdef HAVE_LCD_BITMAP
&show_path_in_browser
#endif
);
/* FILE VIEW MENU */ /* FILE VIEW MENU */
/***********************************/ /***********************************/

4
apps/plugin.h
View file

@ -119,12 +119,12 @@
#define PLUGIN_MAGIC 0x526F634B /* RocK */ #define PLUGIN_MAGIC 0x526F634B /* RocK */
/* increase this every time the api struct changes */ /* increase this every time the api struct changes */
#define PLUGIN_API_VERSION 96 #define PLUGIN_API_VERSION 97
/* update this to latest version if a change to the api struct breaks /* update this to latest version if a change to the api struct breaks
backwards compatibility (and please take the opportunity to sort in any backwards compatibility (and please take the opportunity to sort in any
new function which are "waiting" at the end of the function table) */ new function which are "waiting" at the end of the function table) */
#define PLUGIN_MIN_API_VERSION 96 #define PLUGIN_MIN_API_VERSION 97
/* plugin return codes */ /* plugin return codes */
enum plugin_status { enum plugin_status {

2
apps/settings.h
View file

@ -658,7 +658,9 @@ struct user_settings
#endif #endif
bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */ bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */
#ifdef HAVE_LCD_BITMAP
int show_path_in_browser; /* 0=off, 1=current directory, 2=full path */ int show_path_in_browser; /* 0=off, 1=current directory, 2=full path */
#endif
#ifdef HAVE_HEADPHONE_DETECTION #ifdef HAVE_HEADPHONE_DETECTION
int unplug_mode; /* pause on headphone unplug */ int unplug_mode; /* pause on headphone unplug */

2
apps/settings_list.c
View file

@ -1027,9 +1027,11 @@ const struct settings_list settings[] = {
OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true, OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true,
"hold_lr_for_scroll_in_list",NULL), "hold_lr_for_scroll_in_list",NULL),
#ifdef HAVE_LCD_BITMAP
CHOICE_SETTING(0, show_path_in_browser, LANG_SHOW_PATH, SHOW_PATH_OFF, CHOICE_SETTING(0, show_path_in_browser, LANG_SHOW_PATH, SHOW_PATH_OFF,
"show path in browser", "off,current directory,full path", NULL, 3, "show path in browser", "off,current directory,full path", NULL, 3,
ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), ID2P(LANG_DISPLAY_FULL_PATH)), ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), ID2P(LANG_DISPLAY_FULL_PATH)),
#endif
#ifdef HAVE_AGC #ifdef HAVE_AGC
{F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORD_AGC_PRESET,INT(1), {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORD_AGC_PRESET,INT(1),

4
apps/tree.c
View file

@ -423,6 +423,7 @@ static int update_dir(void)
#ifdef HAVE_TAGCACHE #ifdef HAVE_TAGCACHE
if (id3db) if (id3db)
{ {
#ifdef HAVE_LCD_BITMAP
if (global_settings.show_path_in_browser == SHOW_PATH_FULL if (global_settings.show_path_in_browser == SHOW_PATH_FULL
|| global_settings.show_path_in_browser == SHOW_PATH_CURRENT) || global_settings.show_path_in_browser == SHOW_PATH_CURRENT)
{ {
@ -434,10 +435,12 @@ static int update_dir(void)
/* Must clear the title as the list is reused */ /* Must clear the title as the list is reused */
gui_synclist_set_title(&tree_lists, NULL, NOICON); gui_synclist_set_title(&tree_lists, NULL, NOICON);
} }
#endif
} }
else else
#endif #endif
{ {
#ifdef HAVE_LCD_BITMAP
if (global_settings.show_path_in_browser && if (global_settings.show_path_in_browser &&
*(tc.dirfilter) == SHOW_PLUGINS) *(tc.dirfilter) == SHOW_PLUGINS)
{ {
@ -474,6 +477,7 @@ static int update_dir(void)
/* Must clear the title as the list is reused */ /* Must clear the title as the list is reused */
gui_synclist_set_title(&tree_lists, NULL, NOICON); gui_synclist_set_title(&tree_lists, NULL, NOICON);
} }
#endif
} }
gui_synclist_set_nb_items(&tree_lists, tc.filesindir); gui_synclist_set_nb_items(&tree_lists, tc.filesindir);