nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added documentation to the new select API, made settings.c to use gui_syncsplash instead of splash to display on all screens 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7751 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kevin Ferrare 2005-11-04 17:25:29 +00:00
parent 80c0f99a1a
commit 9ccca4a1b6
2 changed files with 65 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
apps/gui/select.h
View File

@ -17,7 +17,6 @@
*
****************************************************************************/
#ifndef _GUI_SELECT_H_
#define _GUI_SELECT_H_
#include "screen_access.h"
@ -90,6 +89,17 @@ struct gui_select
const struct opt_items * items;
};
/*
* Initializes a select that let's you choose between several numeric values
* - title : the title of the select
* - init_value : the initial value the number will be
* - min_value, max_value : bounds to the value
* - step : the ammount you want to add / withdraw to the initial number
* each time a key is pressed
* - unit : the unit in which the value is (ex "s", "bytes", ...)
* - formatter : a callback function that generates a string
* from the number it gets
*/
extern void gui_select_init_numeric(struct gui_select * select,
const char * title,
int init_value,
@ -102,6 +112,14 @@ extern void gui_select_init_numeric(struct gui_select * select,
int variable,
const char* unit));
/*
* Initializes a select that let's you choose between options in a list
* - title : the title of the select
* - selected : the initially selected item
* - items : the list of items, defined in settings.h
* - nb_items : the number of items in the 'items' list
*/
extern void gui_select_init_items(struct gui_select * select,
const char * title,
int selected,
@ -109,29 +127,70 @@ extern void gui_select_init_items(struct gui_select * select,
int nb_items
);
/*
* Selects the next value
* - select : the select struct
*/
extern void gui_select_next(struct gui_select * select);
/*
* Selects the previous value
* - select : the select struct
*/
extern void gui_select_prev(struct gui_select * select);
/*
* Draws the select on the given screen
* - select : the select struct
* - display : the display on which you want to output
*/
extern void gui_select_draw(struct gui_select * select, struct screen * display);
/*
* Returns the selected value
* - select : the select struct
*/
#define gui_select_get_selected(select) \
(select)->option
/*
* Cancels the select
* - select : the select struct
*/
#define gui_select_cancel(select) \
(select)->canceled=true
/*
* Tells wether the select has been canceled or not
* - select : the select struct
*/
#define gui_select_is_canceled(select) \
(select)->canceled
/*
* Validate the select
* - select : the select struct
*/
#define gui_select_validate(select) \
(select)->validated=true
/*
* Tells wether the select is validated or not
* - select : the select struct
*/
#define gui_select_is_validated(select) \
(select)->validated
/*
* Draws the select on all the screens
* - select : the select struct
*/
extern void gui_syncselect_draw(struct gui_select * select);
/*
* Handles key events for a synced (drawn on all screens) select
* - select : the select struct
*/
extern bool gui_syncselect_do_button(struct gui_select * select, int button);
#endif /* _GUI_SELECT_H_ */

13
apps/settings.c
View File

@ -70,6 +70,7 @@
#include "dircache.h"
#include "select.h"
#include "statusbar.h"
#include "splash.h"
#if CONFIG_CODEC == MAS3507D
void dac_line_in(bool enable);
@ -1240,16 +1241,13 @@ bool settings_save_config(void)
while (true) {
if (!kbd_input(filename, sizeof filename)) {
fd = creat(filename,0);
if (fd < 0) {
lcd_clear_display();
splash(HZ, true, str(LANG_FAILED));
}
if (fd < 0)
gui_syncsplash(HZ, true, str(LANG_FAILED));
else
break;
}
else {
lcd_clear_display();
splash(HZ, true, str(LANG_RESET_DONE_CANCEL));
gui_syncsplash(HZ, true, str(LANG_RESET_DONE_CANCEL));
return false;
}
}
@ -1278,8 +1276,7 @@ bool settings_save_config(void)
close(fd);
lcd_clear_display();
splash(HZ, true, "%s %s", str(LANG_SETTINGS_SAVED1),
gui_syncsplash(HZ, true, "%s %s", str(LANG_SETTINGS_SAVED1),
str(LANG_SETTINGS_SAVED2));
return true;
}