devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Commited George Styles's patch which added multi-screen support to the delete menu (gui_yesno)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8045 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Kevin Ferrare 2005-11-22 22:19:08 +00:00
parent f57d0220dd
commit 40cc43a7b6
2 changed files with 26 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/yesno.c
View file

@ -75,7 +75,7 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
switch (button) switch (button)
{ {
case YESNO_OK: case YESNO_OK:
#ifdef TREE_RC_RUN #ifdef YESNO_RC_OK
case YESNO_RC_OK: case YESNO_RC_OK:
#endif #endif
result=YESNO_YES; result=YESNO_YES;

49
apps/onplay.c
View file

@ -48,6 +48,8 @@
#include "bookmark.h" #include "bookmark.h"
#include "action.h" #include "action.h"
#include "splash.h" #include "splash.h"
#include "yesno.h"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#include "icons.h" #include "icons.h"
#endif #endif
@ -392,24 +394,20 @@ static int remove_dir(char* dirname, int len)
/* share code for file and directory deletion, saves space */ /* share code for file and directory deletion, saves space */
static bool delete_handler(bool is_dir) static bool delete_handler(bool is_dir)
{ {
bool exit = false; char *lines[]={
str(LANG_REALLY_DELETE),
selected_file
};
char *yes_lines[]={
str(LANG_DELETED),
selected_file
};
struct text_message message={lines, 2};
struct text_message yes_message={yes_lines, 2};
if(gui_syncyesno_run(&message, &yes_message, NULL)!=YESNO_YES)
return false;
int res; int res;
lcd_clear_display();
lcd_puts(0,0,str(LANG_REALLY_DELETE));
lcd_puts_scroll(0,1,selected_file);
#ifdef HAVE_LCD_BITMAP
lcd_puts(0,3,str(LANG_CONFIRM_WITH_PLAY_RECORDER));
lcd_puts(0,4,str(LANG_CANCEL_WITH_ANY_RECORDER));
#endif
lcd_update();
while (!exit) {
int btn = button_get(true);
switch (btn) {
case SETTINGS_OK:
if (is_dir) if (is_dir)
{ {
char pathname[MAX_PATH]; /* space to go deep */ char pathname[MAX_PATH]; /* space to go deep */
@ -417,27 +415,10 @@ static bool delete_handler(bool is_dir)
res = remove_dir(pathname, sizeof(pathname)); res = remove_dir(pathname, sizeof(pathname));
} }
else else
{
res = remove(selected_file); res = remove(selected_file);
}
if (!res) { if (!res) {
onplay_result = ONPLAY_RELOAD_DIR; onplay_result = ONPLAY_RELOAD_DIR;
lcd_clear_display();
lcd_puts(0,0,str(LANG_DELETED));
lcd_puts_scroll(0,1,selected_file);
lcd_update();
sleep(HZ);
exit = true;
}
break;
default:
/* ignore button releases */
if (!(btn & BUTTON_REL))
exit = true;
break;
}
} }
return false; return false;
} }