From f7c938a7b730c2149f93db5c66b1336835e0a81e Mon Sep 17 00:00:00 2001 From: Paul Louden Date: Tue, 5 Feb 2008 09:09:38 +0000 Subject: (Hopefully) Revert the quickscreen changes. Many fixes need to be made, and the exact implementation needs discussion. We apologize for the inconvenience and hope to bring an improved quickscreen to you soon. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16224 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/quickscreen.h | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) (limited to 'apps/gui/quickscreen.h') diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h index a264a9383d..179d619883 100644 --- a/apps/gui/quickscreen.h +++ b/apps/gui/quickscreen.h @@ -27,30 +27,45 @@ #include "option_select.h" #include "screen_access.h" -enum QUICKSCREEN_ITEM { - QUICKSCREEN_LEFT = 0, - QUICKSCREEN_RIGHT, - QUICKSCREEN_TOP, - QUICKSCREEN_BOTTOM, - QUICKSCREEN_ITEM_COUNT, -}; +struct gui_quickscreen; +/* + * Callback function called each time the quickscreen gets modified + * - qs : the quickscreen that did the modification + */ +typedef void (quickscreen_callback)(struct gui_quickscreen * qs); struct gui_quickscreen { - const struct settings_list *items[QUICKSCREEN_ITEM_COUNT]; - void (*callback)(struct gui_quickscreen * qs); + struct option_select *left_option; + struct option_select *bottom_option; + struct option_select *right_option; + quickscreen_callback *callback; }; +/* + * Initializes a quickscreen + * - qs : the quickscreen + * - left_option, bottom_option, right_option : a list of choices + * for each option + * - left_right_title : the 2nd line of the title + * on the left and on the right + * - callback : a callback function called each time the quickscreen + * gets modified + */ +void gui_quickscreen_init(struct gui_quickscreen * qs, + struct option_select *left_option, + struct option_select *bottom_option, + struct option_select *right_option, + quickscreen_callback *callback); -struct gui_quickscreen; -bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter); - - -#ifdef BUTTON_F3 -extern bool quick_screen_f3(int button_enter); -#endif -extern bool quick_screen_quick(int button_enter); +/* + * 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, int button_enter); #endif /*_GUI_QUICK_SCREEN_H_*/ #endif /* HAVE_QUICKSCREEN */ -- cgit