diff options
author | Nick Peskett <rockbox@peskett.co.uk> | 2011-12-26 08:26:38 +0000 |
---|---|---|
committer | Nick Peskett <rockbox@peskett.co.uk> | 2011-12-26 08:26:38 +0000 |
commit | 2ecaca91f028fec8bae7b66ffb014f60afd7b34f (patch) | |
tree | 54efdbda16def5680097c11f060e9e5e606dd023 /apps/menus/time_menu.c | |
parent | 3bc771d669676e9295c3f369955b7e46f5b413d2 (diff) | |
download | rockbox-2ecaca91f028fec8bae7b66ffb014f60afd7b34f.tar.gz rockbox-2ecaca91f028fec8bae7b66ffb014f60afd7b34f.zip |
New General Settings submenu: Startup/Shutdown
A dedicated submenu for items which are run at startup, or initiate a shutdown.
Currently containing: Start Screen, Idle Poweroff, Sleep Timer & Start Sleep Timer on Boot.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31435 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/time_menu.c')
-rw-r--r-- | apps/menus/time_menu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index a793809800..1eb4bd68cc 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -28,10 +28,8 @@ | |||
28 | #include "lang.h" | 28 | #include "lang.h" |
29 | #include "action.h" | 29 | #include "action.h" |
30 | #include "settings.h" | 30 | #include "settings.h" |
31 | #include "powermgmt.h" | ||
32 | #include "menu.h" | 31 | #include "menu.h" |
33 | #include "misc.h" | 32 | #include "misc.h" |
34 | #include "exported_menus.h" | ||
35 | #include "keyboard.h" | 33 | #include "keyboard.h" |
36 | #include "talk.h" | 34 | #include "talk.h" |
37 | #include "time.h" | 35 | #include "time.h" |
@@ -136,8 +134,6 @@ MENUITEM_FUNCTION(alarm_wake_up_screen, 0, ID2P(LANG_ALARM_WAKEUP_SCREEN), | |||
136 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ | 134 | #endif /* CONFIG_TUNER || defined(HAVE_RECORDING) */ |
137 | 135 | ||
138 | #endif /* HAVE_RTC_ALARM */ | 136 | #endif /* HAVE_RTC_ALARM */ |
139 | MENUITEM_SETTING(sleeptimer_on_startup, | ||
140 | &global_settings.sleeptimer_on_startup, NULL); | ||
141 | 137 | ||
142 | void talk_timedate(void) | 138 | void talk_timedate(void) |
143 | { | 139 | { |
@@ -237,14 +233,14 @@ static int time_menu_callback(int action, | |||
237 | 233 | ||
238 | 234 | ||
239 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), time_menu_callback, Icon_NOICON, | 235 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), time_menu_callback, Icon_NOICON, |
240 | &time_set, &sleep_timer_call, | 236 | &time_set, |
241 | #ifdef HAVE_RTC_ALARM | 237 | #ifdef HAVE_RTC_ALARM |
242 | &alarm_screen_call, | 238 | &alarm_screen_call, |
243 | #if defined(HAVE_RECORDING) || CONFIG_TUNER | 239 | #if defined(HAVE_RECORDING) || CONFIG_TUNER |
244 | &alarm_wake_up_screen, | 240 | &alarm_wake_up_screen, |
245 | #endif | 241 | #endif |
246 | #endif | 242 | #endif |
247 | &sleeptimer_on_startup, &timeformat); | 243 | &timeformat); |
248 | 244 | ||
249 | int time_screen(void* ignored) | 245 | int time_screen(void* ignored) |
250 | { | 246 | { |