diff options
-rw-r--r-- | apps/status.c | 5 | ||||
-rw-r--r-- | apps/status.h | 1 | ||||
-rw-r--r-- | apps/tree.c | 9 | ||||
-rw-r--r-- | apps/wps.c | 9 |
4 files changed, 8 insertions, 16 deletions
diff --git a/apps/status.c b/apps/status.c index 4f3afabed8..7d941c30bc 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -59,11 +59,6 @@ bool statusbar(bool state) | |||
59 | 59 | ||
60 | return(laststate); | 60 | return(laststate); |
61 | } | 61 | } |
62 | |||
63 | void statusbar_toggle(void) | ||
64 | { | ||
65 | statusbar_enabled = !statusbar_enabled; | ||
66 | } | ||
67 | #endif | 62 | #endif |
68 | 63 | ||
69 | void status_draw(void) | 64 | void status_draw(void) |
diff --git a/apps/status.h b/apps/status.h index 41251bef28..d908face85 100644 --- a/apps/status.h +++ b/apps/status.h | |||
@@ -35,7 +35,6 @@ void status_set_playmode(enum playmode mode); | |||
35 | #ifdef HAVE_LCD_BITMAP | 35 | #ifdef HAVE_LCD_BITMAP |
36 | extern bool statusbar_enabled; | 36 | extern bool statusbar_enabled; |
37 | bool statusbar(bool state); | 37 | bool statusbar(bool state); |
38 | void statusbar_toggle(void); | ||
39 | #endif | 38 | #endif |
40 | void status_draw(void); | 39 | void status_draw(void); |
41 | 40 | ||
diff --git a/apps/tree.c b/apps/tree.c index 2230f17aa9..d2660513a5 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -74,7 +74,7 @@ void browse_root(void) | |||
74 | 74 | ||
75 | #define MARGIN_Y 0 /* Y pixel margin */ | 75 | #define MARGIN_Y 0 /* Y pixel margin */ |
76 | #define MARGIN_X 10 /* X pixel margin */ | 76 | #define MARGIN_X 10 /* X pixel margin */ |
77 | #define LINE_Y (global_settings.statusbar&&statusbar_enabled?1:0) /* Y position the entry-list starts at */ | 77 | #define LINE_Y (global_settings.statusbar ? 1 : 0) /* Y position the entry-list starts at */ |
78 | #define LINE_X 0 /* X position the entry-list starts at */ | 78 | #define LINE_X 0 /* X position the entry-list starts at */ |
79 | #define LINE_HEIGTH 8 /* pixels for each text line */ | 79 | #define LINE_HEIGTH 8 /* pixels for each text line */ |
80 | 80 | ||
@@ -522,10 +522,9 @@ bool dirbrowse(char *root) | |||
522 | case BUTTON_F3: | 522 | case BUTTON_F3: |
523 | #endif | 523 | #endif |
524 | #ifdef HAVE_LCD_BITMAP | 524 | #ifdef HAVE_LCD_BITMAP |
525 | if(global_settings.statusbar) { | 525 | global_settings.statusbar = !global_settings.statusbar; |
526 | statusbar_toggle(); | 526 | settings_save(); |
527 | restore = true; | 527 | restore = true; |
528 | } | ||
529 | #endif | 528 | #endif |
530 | break; | 529 | break; |
531 | 530 | ||
diff --git a/apps/wps.c b/apps/wps.c index c3f2f0a164..4348819799 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #ifdef HAVE_LCD_BITMAP | 46 | #ifdef HAVE_LCD_BITMAP |
47 | #define LINE_Y (global_settings.statusbar&&statusbar_enabled?1:0) /* Y position the entry-list starts at */ | 47 | #define LINE_Y (global_settings.statusbar ? 1 : 0) /* Y position the entry-list starts at */ |
48 | #else /* HAVE_LCD_BITMAP */ | 48 | #else /* HAVE_LCD_BITMAP */ |
49 | #define LINE_Y 0 /* Y position the entry-list starts at */ | 49 | #define LINE_Y 0 /* Y position the entry-list starts at */ |
50 | #endif /* HAVE_LCD_BITMAP */ | 50 | #endif /* HAVE_LCD_BITMAP */ |
@@ -787,10 +787,9 @@ int wps_show(void) | |||
787 | #ifdef HAVE_RECORDER_KEYPAD | 787 | #ifdef HAVE_RECORDER_KEYPAD |
788 | case BUTTON_F3: | 788 | case BUTTON_F3: |
789 | #ifdef HAVE_LCD_BITMAP | 789 | #ifdef HAVE_LCD_BITMAP |
790 | if(global_settings.statusbar) { | 790 | global_settings.statusbar = !global_settings.statusbar; |
791 | statusbar_toggle(); | 791 | settings_save(); |
792 | draw_screen(id3); | 792 | draw_screen(id3); |
793 | } | ||
794 | #endif | 793 | #endif |
795 | break; | 794 | break; |
796 | #endif | 795 | #endif |