diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.c | 8 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 6 | ||||
-rw-r--r-- | apps/status.c | 2 | ||||
-rw-r--r-- | apps/tree.c | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/apps/menu.c b/apps/menu.c index 53f60fdd25..2837974c9d 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -145,12 +145,14 @@ void menu_draw(int m) | |||
145 | if (global_settings.statusbar) | 145 | if (global_settings.statusbar) |
146 | height -= STATUSBAR_HEIGHT; | 146 | height -= STATUSBAR_HEIGHT; |
147 | 147 | ||
148 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
148 | if(global_settings.buttonbar && menus[m].use_buttonbar) { | 149 | if(global_settings.buttonbar && menus[m].use_buttonbar) { |
149 | buttonbar_set(menus[m].buttonbar[0], | 150 | buttonbar_set(menus[m].buttonbar[0], |
150 | menus[m].buttonbar[1], | 151 | menus[m].buttonbar[1], |
151 | menus[m].buttonbar[2]); | 152 | menus[m].buttonbar[2]); |
152 | height -= BUTTONBAR_HEIGHT; | 153 | height -= BUTTONBAR_HEIGHT; |
153 | } | 154 | } |
155 | #endif | ||
154 | 156 | ||
155 | menu_lines = height / fh; | 157 | menu_lines = height / fh; |
156 | 158 | ||
@@ -196,9 +198,11 @@ void menu_draw(int m) | |||
196 | height, menus[m].itemcount, menus[m].top, | 198 | height, menus[m].itemcount, menus[m].top, |
197 | menus[m].top + menu_lines, VERTICAL); | 199 | menus[m].top + menu_lines, VERTICAL); |
198 | 200 | ||
201 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
199 | if(global_settings.buttonbar && menus[m].use_buttonbar) | 202 | if(global_settings.buttonbar && menus[m].use_buttonbar) |
200 | buttonbar_draw(); | 203 | buttonbar_draw(); |
201 | #endif | 204 | #endif /* CONFIG_KEYPAD == RECORDER_PAD */ |
205 | #endif /* HAVE_LCD_BITMAP */ | ||
202 | status_draw(true); | 206 | status_draw(true); |
203 | 207 | ||
204 | lcd_update(); | 208 | lcd_update(); |
@@ -280,12 +284,14 @@ int menu_show(int m) | |||
280 | if (global_settings.statusbar) | 284 | if (global_settings.statusbar) |
281 | height -= STATUSBAR_HEIGHT; | 285 | height -= STATUSBAR_HEIGHT; |
282 | 286 | ||
287 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
283 | if(global_settings.buttonbar && menus[m].use_buttonbar) { | 288 | if(global_settings.buttonbar && menus[m].use_buttonbar) { |
284 | buttonbar_set(menus[m].buttonbar[0], | 289 | buttonbar_set(menus[m].buttonbar[0], |
285 | menus[m].buttonbar[1], | 290 | menus[m].buttonbar[1], |
286 | menus[m].buttonbar[2]); | 291 | menus[m].buttonbar[2]); |
287 | height -= BUTTONBAR_HEIGHT; | 292 | height -= BUTTONBAR_HEIGHT; |
288 | } | 293 | } |
294 | #endif | ||
289 | 295 | ||
290 | menu_lines = height / fh; | 296 | menu_lines = height / fh; |
291 | #else | 297 | #else |
diff --git a/apps/settings.c b/apps/settings.c index 04a0e3cd84..09e15b3deb 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -195,7 +195,9 @@ static const struct bit_entry rtc_bits[] = | |||
195 | {1, S_O(invert_cursor), false, "invert cursor", off_on }, | 195 | {1, S_O(invert_cursor), false, "invert cursor", off_on }, |
196 | {1, S_O(statusbar), true, "statusbar", off_on }, | 196 | {1, S_O(statusbar), true, "statusbar", off_on }, |
197 | {1, S_O(scrollbar), true, "scrollbar", off_on }, | 197 | {1, S_O(scrollbar), true, "scrollbar", off_on }, |
198 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
198 | {1, S_O(buttonbar), true, "buttonbar", off_on }, | 199 | {1, S_O(buttonbar), true, "buttonbar", off_on }, |
200 | #endif | ||
199 | {1, S_O(volume_type), 0, "volume display", graphic_numeric }, | 201 | {1, S_O(volume_type), 0, "volume display", graphic_numeric }, |
200 | {1, S_O(battery_type), 0, "battery display", graphic_numeric }, | 202 | {1, S_O(battery_type), 0, "battery display", graphic_numeric }, |
201 | {1, S_O(timeformat), 0, "time format", "24hour,12hour" }, | 203 | {1, S_O(timeformat), 0, "time format", "24hour,12hour" }, |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 099b912efe..35bc932455 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -957,11 +957,13 @@ static bool status_bar(void) | |||
957 | return set_bool( str(LANG_STATUS_BAR), &global_settings.statusbar ); | 957 | return set_bool( str(LANG_STATUS_BAR), &global_settings.statusbar ); |
958 | } | 958 | } |
959 | 959 | ||
960 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
960 | static bool button_bar(void) | 961 | static bool button_bar(void) |
961 | { | 962 | { |
962 | return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar ); | 963 | return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar ); |
963 | } | 964 | } |
964 | #endif | 965 | #endif /* CONFIG_KEYPAD == RECORDER_PAD */ |
966 | #endif /* HAVE_LCD_BITMAP */ | ||
965 | 967 | ||
966 | static bool ff_rewind_settings_menu(void) | 968 | static bool ff_rewind_settings_menu(void) |
967 | { | 969 | { |
@@ -1175,7 +1177,9 @@ static bool bars_settings_menu(void) | |||
1175 | static const struct menu_item items[] = { | 1177 | static const struct menu_item items[] = { |
1176 | { ID2P(LANG_SCROLL_BAR), scroll_bar }, | 1178 | { ID2P(LANG_SCROLL_BAR), scroll_bar }, |
1177 | { ID2P(LANG_STATUS_BAR), status_bar }, | 1179 | { ID2P(LANG_STATUS_BAR), status_bar }, |
1180 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
1178 | { ID2P(LANG_BUTTON_BAR), button_bar }, | 1181 | { ID2P(LANG_BUTTON_BAR), button_bar }, |
1182 | #endif | ||
1179 | { ID2P(LANG_VOLUME_DISPLAY), volume_type }, | 1183 | { ID2P(LANG_VOLUME_DISPLAY), volume_type }, |
1180 | { ID2P(LANG_BATTERY_DISPLAY), battery_type }, | 1184 | { ID2P(LANG_BATTERY_DISPLAY), battery_type }, |
1181 | }; | 1185 | }; |
diff --git a/apps/status.c b/apps/status.c index 248f9b9e1f..03badc5b75 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -267,7 +267,7 @@ void status_draw(bool force_redraw) | |||
267 | 267 | ||
268 | } | 268 | } |
269 | 269 | ||
270 | #ifdef HAVE_LCD_BITMAP | 270 | #if defined(HAVE_LCD_BITMAP) && (CONFIG_KEYPAD == RECORDER_PAD) |
271 | static void draw_buttonbar_btn(int num, const char* caption) | 271 | static void draw_buttonbar_btn(int num, const char* caption) |
272 | { | 272 | { |
273 | int xpos, ypos, button_width, text_width; | 273 | int xpos, ypos, button_width, text_width; |
diff --git a/apps/tree.c b/apps/tree.c index effb093b41..48de4a64aa 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -636,6 +636,7 @@ static int showdir(const char *path, int start, const int *dirfilter) | |||
636 | tree_max_on_screen * line_height, filesindir, start, | 636 | tree_max_on_screen * line_height, filesindir, start, |
637 | start + tree_max_on_screen, VERTICAL); | 637 | start + tree_max_on_screen, VERTICAL); |
638 | 638 | ||
639 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
639 | if(global_settings.buttonbar) { | 640 | if(global_settings.buttonbar) { |
640 | buttonbar_set(*dirfilter < NUM_FILTER_MODES ? | 641 | buttonbar_set(*dirfilter < NUM_FILTER_MODES ? |
641 | str(LANG_DIRBROWSE_F1) : (unsigned char *) "", | 642 | str(LANG_DIRBROWSE_F1) : (unsigned char *) "", |
@@ -644,6 +645,7 @@ static int showdir(const char *path, int start, const int *dirfilter) | |||
644 | buttonbar_draw(); | 645 | buttonbar_draw(); |
645 | } | 646 | } |
646 | #endif | 647 | #endif |
648 | #endif | ||
647 | status_draw(true); | 649 | status_draw(true); |
648 | 650 | ||
649 | return filesindir; | 651 | return filesindir; |