diff options
-rw-r--r-- | apps/settings.c | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/apps/settings.c b/apps/settings.c index 3bc39ed6d2..5d1ffef4a4 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -657,6 +657,7 @@ void set_int(char* string, | |||
657 | int max ) | 657 | int max ) |
658 | { | 658 | { |
659 | bool done = false; | 659 | bool done = false; |
660 | int button; | ||
660 | 661 | ||
661 | #ifdef HAVE_LCD_BITMAP | 662 | #ifdef HAVE_LCD_BITMAP |
662 | if(global_settings.statusbar) | 663 | if(global_settings.statusbar) |
@@ -677,7 +678,8 @@ void set_int(char* string, | |||
677 | #endif | 678 | #endif |
678 | lcd_update(); | 679 | lcd_update(); |
679 | 680 | ||
680 | switch( button_get_w_tmo(HZ/2) ) { | 681 | button = button_get_w_tmo(HZ/2); |
682 | switch(button) { | ||
681 | #ifdef HAVE_RECORDER_KEYPAD | 683 | #ifdef HAVE_RECORDER_KEYPAD |
682 | case BUTTON_UP: | 684 | case BUTTON_UP: |
683 | case BUTTON_UP | BUTTON_REPEAT: | 685 | case BUTTON_UP | BUTTON_REPEAT: |
@@ -710,23 +712,8 @@ void set_int(char* string, | |||
710 | #endif | 712 | #endif |
711 | done = true; | 713 | done = true; |
712 | break; | 714 | break; |
713 | |||
714 | #ifdef HAVE_RECORDER_KEYPAD | ||
715 | case BUTTON_F3: | ||
716 | #ifdef HAVE_LCD_BITMAP | ||
717 | global_settings.statusbar = !global_settings.statusbar; | ||
718 | settings_save(); | ||
719 | if(global_settings.statusbar) | ||
720 | lcd_setmargins(0, STATUSBAR_HEIGHT); | ||
721 | else | ||
722 | lcd_setmargins(0, 0); | ||
723 | lcd_clear_display(); | ||
724 | lcd_puts_scroll(0, 0, string); | ||
725 | #endif | ||
726 | break; | ||
727 | #endif | ||
728 | } | 715 | } |
729 | if ( function ) | 716 | if ( function && button != BUTTON_NONE) |
730 | function(*variable); | 717 | function(*variable); |
731 | } | 718 | } |
732 | lcd_stop_scroll(); | 719 | lcd_stop_scroll(); |
@@ -736,6 +723,7 @@ void set_option(char* string, int* variable, char* options[], | |||
736 | int numoptions, void (*function)(int)) | 723 | int numoptions, void (*function)(int)) |
737 | { | 724 | { |
738 | bool done = false; | 725 | bool done = false; |
726 | int button; | ||
739 | 727 | ||
740 | #ifdef HAVE_LCD_BITMAP | 728 | #ifdef HAVE_LCD_BITMAP |
741 | if(global_settings.statusbar) | 729 | if(global_settings.statusbar) |
@@ -753,7 +741,8 @@ void set_option(char* string, int* variable, char* options[], | |||
753 | #endif | 741 | #endif |
754 | lcd_update(); | 742 | lcd_update(); |
755 | 743 | ||
756 | switch ( button_get_w_tmo(HZ/2) ) { | 744 | button = button_get_w_tmo(HZ/2); |
745 | switch (button) { | ||
757 | #ifdef HAVE_RECORDER_KEYPAD | 746 | #ifdef HAVE_RECORDER_KEYPAD |
758 | case BUTTON_UP: | 747 | case BUTTON_UP: |
759 | case BUTTON_UP | BUTTON_REPEAT: | 748 | case BUTTON_UP | BUTTON_REPEAT: |
@@ -788,24 +777,9 @@ void set_option(char* string, int* variable, char* options[], | |||
788 | #endif | 777 | #endif |
789 | done = true; | 778 | done = true; |
790 | break; | 779 | break; |
791 | |||
792 | #ifdef HAVE_RECORDER_KEYPAD | ||
793 | case BUTTON_F3: | ||
794 | #ifdef HAVE_LCD_BITMAP | ||
795 | global_settings.statusbar = !global_settings.statusbar; | ||
796 | settings_save(); | ||
797 | if(global_settings.statusbar) | ||
798 | lcd_setmargins(0, STATUSBAR_HEIGHT); | ||
799 | else | ||
800 | lcd_setmargins(0, 0); | ||
801 | lcd_clear_display(); | ||
802 | lcd_puts_scroll(0, 0, string); | ||
803 | #endif | ||
804 | break; | ||
805 | #endif | ||
806 | } | 780 | } |
807 | 781 | ||
808 | if ( function ) | 782 | if ( function && button != BUTTON_NONE) |
809 | function(*variable); | 783 | function(*variable); |
810 | } | 784 | } |
811 | lcd_stop_scroll(); | 785 | lcd_stop_scroll(); |