From 6f622262948f42886a3f7e602a3b6aa2bb1c6e44 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 28 Mar 2012 00:38:30 +1100 Subject: 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 Reviewed-by: Jonathan Gordon --- apps/gui/quickscreen.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apps/gui') diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index acef2c32a0..965fe67a4c 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c @@ -38,6 +38,7 @@ #include "list.h" #include "option_select.h" #include "debug.h" +#include "shortcuts.h" /* 1 top, 1 bottom, 2 on either side, 1 for the icons * if enough space, top and bottom have 2 lines */ @@ -391,6 +392,9 @@ bool quick_screen_quick(int button_enter) bool oldshuffle = global_settings.playlist_shuffle; int oldrepeat = global_settings.repeat_mode; + if (global_settings.shortcuts_replaces_qs) + return do_shortcut_menu(NULL); + qs.items[QUICKSCREEN_TOP] = get_setting(global_settings.qs_items[QUICKSCREEN_TOP], NULL); qs.items[QUICKSCREEN_LEFT] = -- cgit v1.2.3