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

Renamed 'load default config' to 'reset settings'. Made it work on recorder.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2225 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-09-07 12:28:46 +00:00
parent 92408568e4
commit 94afb54228
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

50
apps/settings_menu.c
View file

@ -192,24 +192,6 @@ static Menu ff_rewind_accel(void)
return MENU_OK; return MENU_OK;
} }
Menu settings_menu(void)
{
int m;
Menu result;
struct menu_items items[] = {
{ "Playback", playback_settings_menu },
{ "File View", fileview_settings_menu },
{ "Display", display_settings_menu },
{ "System", system_settings_menu },
};
m=menu_init( items, sizeof items / sizeof(struct menu_items) );
result = menu_run(m);
menu_exit(m);
return result;
}
Menu playback_settings_menu(void) Menu playback_settings_menu(void)
{ {
int m; int m;
@ -243,7 +225,7 @@ Menu playback_settings_menu(void)
return result; return result;
} }
Menu load_default_config(void) static Menu reset_settings(void)
{ {
int button = 0; int button = 0;
@ -256,23 +238,26 @@ Menu load_default_config(void)
lcd_puts(0,1,"Play = Yes"); lcd_puts(0,1,"Play = Yes");
lcd_puts(0,2,"Any Other = No"); lcd_puts(0,2,"Any Other = No");
#endif #endif
lcd_update();
button = button_get(true); button = button_get(true);
if (button == BUTTON_PLAY) { if (button == BUTTON_PLAY) {
settings_reset(); settings_reset();
lcd_clear_display(); lcd_clear_display();
lcd_puts(0,0,"Settings"); lcd_puts(0,0,"Settings");
lcd_puts(0,1,"Cleared"); lcd_puts(0,1,"Cleared");
lcd_update();
sleep(HZ); sleep(HZ);
return(true); return(true);
} else { } else {
lcd_clear_display(); lcd_clear_display();
lcd_puts(0,0,"Canceled"); lcd_puts(0,0,"Canceled");
lcd_update();
sleep(HZ); sleep(HZ);
return(false); return(false);
} }
} }
Menu fileview_settings_menu(void) static Menu fileview_settings_menu(void)
{ {
int m; int m;
Menu result; Menu result;
@ -289,7 +274,7 @@ Menu fileview_settings_menu(void)
return result; return result;
} }
Menu display_settings_menu(void) static Menu display_settings_menu(void)
{ {
int m; int m;
Menu result; Menu result;
@ -306,7 +291,7 @@ Menu display_settings_menu(void)
return result; return result;
} }
Menu system_settings_menu(void) static Menu system_settings_menu(void)
{ {
int m; int m;
Menu result; Menu result;
@ -319,7 +304,7 @@ Menu system_settings_menu(void)
#ifdef HAVE_RTC #ifdef HAVE_RTC
{ "Time/Date", timedate_set }, { "Time/Date", timedate_set },
#endif #endif
{ "Load Default Config", load_default_config }, { "Reset settings", reset_settings },
}; };
m=menu_init( items, sizeof items / sizeof(struct menu_items) ); m=menu_init( items, sizeof items / sizeof(struct menu_items) );
@ -327,3 +312,22 @@ Menu system_settings_menu(void)
menu_exit(m); menu_exit(m);
return result; return result;
} }
Menu settings_menu(void)
{
int m;
Menu result;
struct menu_items items[] = {
{ "Playback", playback_settings_menu },
{ "File View", fileview_settings_menu },
{ "Display", display_settings_menu },
{ "System", system_settings_menu },
};
m=menu_init( items, sizeof items / sizeof(struct menu_items) );
result = menu_run(m);
menu_exit(m);
return result;
}

4
apps/settings_menu.h
View file

@ -21,10 +21,6 @@
#include "menu.h" #include "menu.h"
Menu playback_settings_menu(void);
Menu fileview_settings_menu(void);
Menu display_settings_menu(void);
Menu system_settings_menu(void);
Menu settings_menu(void); Menu settings_menu(void);
#endif #endif