summaryrefslogtreecommitdiffstats
path: root/apps/menus
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2012-03-28 00:38:30 +1100
committerJonathan Gordon <rockbox@jdgordon.info>2012-03-28 10:56:12 +0200
commit6f622262948f42886a3f7e602a3b6aa2bb1c6e44 (patch)
tree471905bae06f6b514a97abd74d7dbcad1be1e043 /apps/menus
parent7ec426e497daa1b4a6082bf4e4e3df687b11db44 (diff)
downloadrockbox-6f622262948f42886a3f7e602a3b6aa2bb1c6e44.tar.gz
rockbox-6f622262948f42886a3f7e602a3b6aa2bb1c6e44.tar.bz2
rockbox-6f622262948f42886a3f7e602a3b6aa2bb1c6e44.zip
quickscreen: optionally display the shortcuts menu instead of the QS
Adds an option under settings > general settings > system to allow the user to have the shortcuts menu displayed instead of the quick screen. (option is "shortcuts instead of quickscreen" in the .cfg) Change-Id: Id679b461c40ac617629422736d1509384364084d Reviewed-on: http://gerrit.rockbox.org/199 Reviewed-by: Marek Salaba <marek.salaba@gmail.com> Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
Diffstat (limited to 'apps/menus')
-rw-r--r--apps/menus/settings_menu.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 659a7f2fbb..0e3e861834 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -297,6 +297,10 @@ MENUITEM_SETTING(buttonlight_brightness, &global_settings.buttonlight_brightness
MENUITEM_SETTING(touchpad_sensitivity, &global_settings.touchpad_sensitivity, NULL);
#endif
+#ifdef HAVE_QUICKSCREEN
+MENUITEM_SETTING(shortcuts_replaces_quickscreen, &global_settings.shortcuts_replaces_qs, NULL);
+#endif
+
MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
0, Icon_System_menu,
#if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1)
@@ -306,6 +310,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
&disk_menu,
#endif
&limits_menu,
+#ifdef HAVE_QUICKSCREEN
+ &shortcuts_replaces_quickscreen,
+#endif
#ifdef HAVE_MORSE_INPUT
&morse_input,
#endif