diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.c | 2 | ||||
-rw-r--r-- | apps/screens.c | 11 | ||||
-rw-r--r-- | apps/screens.h | 1 | ||||
-rw-r--r-- | apps/tree.c | 15 |
4 files changed, 28 insertions, 1 deletions
diff --git a/apps/menu.c b/apps/menu.c index 6589ec7be5..f317403f0d 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -316,9 +316,11 @@ int menu_show(int m) | |||
316 | #ifdef HAVE_RECORDER_KEYPAD | 316 | #ifdef HAVE_RECORDER_KEYPAD |
317 | case BUTTON_LEFT: | 317 | case BUTTON_LEFT: |
318 | case BUTTON_F1: | 318 | case BUTTON_F1: |
319 | case BUTTON_OFF | BUTTON_REPEAT: | ||
319 | #else | 320 | #else |
320 | case BUTTON_STOP: | 321 | case BUTTON_STOP: |
321 | case BUTTON_MENU: | 322 | case BUTTON_MENU: |
323 | case BUTTON_STOP | BUTTON_REPEAT: | ||
322 | #endif | 324 | #endif |
323 | lcd_stop_scroll(); | 325 | lcd_stop_scroll(); |
324 | exit = true; | 326 | exit = true; |
diff --git a/apps/screens.c b/apps/screens.c index 32e6936d7b..319c0eabd1 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -540,6 +540,9 @@ bool f2_screen(void) | |||
540 | used = true; | 540 | used = true; |
541 | break; | 541 | break; |
542 | 542 | ||
543 | case BUTTON_OFF | BUTTON_REPEAT: | ||
544 | return false; | ||
545 | |||
543 | case SYS_USB_CONNECTED: | 546 | case SYS_USB_CONNECTED: |
544 | usb_screen(); | 547 | usb_screen(); |
545 | return true; | 548 | return true; |
@@ -623,6 +626,9 @@ bool f3_screen(void) | |||
623 | used = true; | 626 | used = true; |
624 | break; | 627 | break; |
625 | 628 | ||
629 | case BUTTON_OFF | BUTTON_REPEAT: | ||
630 | return false; | ||
631 | |||
626 | case SYS_USB_CONNECTED: | 632 | case SYS_USB_CONNECTED: |
627 | usb_screen(); | 633 | usb_screen(); |
628 | return true; | 634 | return true; |
@@ -810,3 +816,8 @@ void splash(int ticks, /* how long */ | |||
810 | } | 816 | } |
811 | } | 817 | } |
812 | 818 | ||
819 | void charging_splash(void) | ||
820 | { | ||
821 | splash(2*HZ, 0, true, str(LANG_BATTERY_CHARGE)); | ||
822 | while (button_get(false)); | ||
823 | } | ||
diff --git a/apps/screens.h b/apps/screens.h index 4a35d410f1..89bd3c39d8 100644 --- a/apps/screens.h +++ b/apps/screens.h | |||
@@ -22,6 +22,7 @@ | |||
22 | void usb_display_info(void); | 22 | void usb_display_info(void); |
23 | void usb_screen(void); | 23 | void usb_screen(void); |
24 | int charging_screen(void); | 24 | int charging_screen(void); |
25 | void charging_splash(void); | ||
25 | 26 | ||
26 | #ifdef HAVE_RECORDER_KEYPAD | 27 | #ifdef HAVE_RECORDER_KEYPAD |
27 | int on_screen(void); | 28 | int on_screen(void); |
diff --git a/apps/tree.c b/apps/tree.c index 6bd7b21c45..a71db78968 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include "onplay.h" | 52 | #include "onplay.h" |
53 | #include "buffer.h" | 53 | #include "buffer.h" |
54 | #include "plugin.h" | 54 | #include "plugin.h" |
55 | #include "power.h" | ||
55 | 56 | ||
56 | #ifdef HAVE_LCD_BITMAP | 57 | #ifdef HAVE_LCD_BITMAP |
57 | #include "widgets.h" | 58 | #include "widgets.h" |
@@ -885,7 +886,9 @@ static bool dirbrowse(char *root, int *dirfilter) | |||
885 | switch ( button ) { | 886 | switch ( button ) { |
886 | case TREE_EXIT: | 887 | case TREE_EXIT: |
887 | case BUTTON_RC_STOP: | 888 | case BUTTON_RC_STOP: |
888 | case TREE_EXIT | BUTTON_REPEAT: | 889 | #ifdef HAVE_RECORDER_KEYPAD |
890 | case BUTTON_LEFT | BUTTON_REPEAT: | ||
891 | #endif | ||
889 | i=strlen(currdir); | 892 | i=strlen(currdir); |
890 | if (i>1) { | 893 | if (i>1) { |
891 | while (currdir[i-1]!='/') | 894 | while (currdir[i-1]!='/') |
@@ -928,6 +931,16 @@ static bool dirbrowse(char *root, int *dirfilter) | |||
928 | settings_save(); | 931 | settings_save(); |
929 | break; | 932 | break; |
930 | 933 | ||
934 | #ifdef HAVE_RECORDER_KEYPAD | ||
935 | case BUTTON_OFF | BUTTON_REPEAT: | ||
936 | #else | ||
937 | case BUTTON_STOP | BUTTON_REPEAT: | ||
938 | #endif | ||
939 | if (charger_inserted()) { | ||
940 | charging_splash(); | ||
941 | restore = true; | ||
942 | } | ||
943 | break; | ||
931 | 944 | ||
932 | case TREE_ENTER: | 945 | case TREE_ENTER: |
933 | case TREE_ENTER | BUTTON_REPEAT: | 946 | case TREE_ENTER | BUTTON_REPEAT: |