summaryrefslogtreecommitdiffstats
path: root/apps/gui/quickscreen.h
diff options
context:
space:
mode:
authorKevin Ferrare <kevin@rockbox.org>2005-11-22 21:55:05 +0000
committerKevin Ferrare <kevin@rockbox.org>2005-11-22 21:55:05 +0000
commitf57d0220dd216937a210a18f8ab8394091bb6a08 (patch)
tree79b724000023174b931ce898a42f8a2fbf6d1438 /apps/gui/quickscreen.h
parentfd02642ee0238ae2b32b7a5ea7005abf0e72489d (diff)
downloadrockbox-f57d0220dd216937a210a18f8ab8394091bb6a08.tar.gz
rockbox-f57d0220dd216937a210a18f8ab8394091bb6a08.tar.bz2
rockbox-f57d0220dd216937a210a18f8ab8394091bb6a08.zip
Adapted and commited Markus Kaufhold's remote hold icon on statusbar patch for iriver ; generic logo handler (now it's possible to have a different USB logo on main screen and on remote), made the quickscreen behave as it was before
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8044 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/quickscreen.h')
-rw-r--r--apps/gui/quickscreen.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h
index 09a0390d93..fdbe4db386 100644
--- a/apps/gui/quickscreen.h
+++ b/apps/gui/quickscreen.h
@@ -34,10 +34,8 @@
#define QUICKSCREEN_BOTTOM_INV BUTTON_UP
#define QUICKSCREEN_RIGHT BUTTON_RIGHT
-#if CONFIG_KEYPAD == RECORDER_PAD
-#define QUICKSCREEN_QUIT BUTTON_F2
-#define QUICKSCREEN_QUIT2 BUTTON_F3
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
+
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define QUICKSCREEN_QUIT BUTTON_MODE
#define QUICKSCREEN_QUIT2 BUTTON_OFF
#define QUICKSCREEN_RC_QUIT BUTTON_RC_MODE
@@ -104,11 +102,12 @@ bool gui_quickscreen_do_button(struct gui_quickscreen * qs, int button);
void gui_syncquickscreen_draw(struct gui_quickscreen * qs);
/*
- * Runs the quickscreen on all available screens
+ * Runs the quickscreen on all available screens, if button_enter is released, quits
* - qs : the quickscreen
+ * - button_enter : button pressed at the same time the quickscreen is displayed
* returns : true if usb was connected, false otherwise
*/
-bool gui_syncquickscreen_run(struct gui_quickscreen * qs);
+bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter);
#endif /*_GUI_QUICK_SCREEN_H_*/
#endif /* CONFIG_KEYPAD */