diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-08-30 11:10:08 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-08-30 11:10:08 +0000 |
commit | f43216ff0bc6fdf7c2339aefc6c56be09249ce06 (patch) | |
tree | 04f30ecbf442f66971ebb432c3382119f8238651 /apps | |
parent | 5efbdb76aa15dc86f2158912b23ad64111ed0b90 (diff) | |
download | rockbox-f43216ff0bc6fdf7c2339aefc6c56be09249ce06.tar.gz rockbox-f43216ff0bc6fdf7c2339aefc6c56be09249ce06.zip |
Removed the line selector option, it is now always an inverse bar (except for the Player/Studio of course)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7423 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 18 | ||||
-rw-r--r-- | apps/menu.c | 45 | ||||
-rw-r--r-- | apps/menu.h | 4 | ||||
-rw-r--r-- | apps/playlist_viewer.c | 34 | ||||
-rw-r--r-- | apps/recorder/icons.c | 1 | ||||
-rw-r--r-- | apps/recorder/icons.h | 1 | ||||
-rw-r--r-- | apps/recorder/recording.c | 15 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 14 | ||||
-rw-r--r-- | apps/tree.c | 12 |
11 files changed, 47 insertions, 100 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 6feac25ee8..8699fa502e 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -1334,9 +1334,9 @@ voice: "" | |||
1334 | new: | 1334 | new: |
1335 | 1335 | ||
1336 | id: LANG_INVERT_CURSOR | 1336 | id: LANG_INVERT_CURSOR |
1337 | desc: in settings_menu | 1337 | desc: DEPRECATED |
1338 | eng: "Line Selector" | 1338 | eng: "" |
1339 | voice: "Line Selector" | 1339 | voice: "" |
1340 | new: | 1340 | new: |
1341 | 1341 | ||
1342 | id: LANG_RECORDING_EDITABLE | 1342 | id: LANG_RECORDING_EDITABLE |
@@ -1364,15 +1364,15 @@ voice: "Caption backlight" | |||
1364 | new: | 1364 | new: |
1365 | 1365 | ||
1366 | id: LANG_INVERT_CURSOR_POINTER | 1366 | id: LANG_INVERT_CURSOR_POINTER |
1367 | desc: in settings_menu | 1367 | desc: DEPRECATED |
1368 | eng: "Pointer" | 1368 | eng: "" |
1369 | voice: "Pointer" | 1369 | voice: "" |
1370 | new: | 1370 | new: |
1371 | 1371 | ||
1372 | id: LANG_INVERT_CURSOR_BAR | 1372 | id: LANG_INVERT_CURSOR_BAR |
1373 | desc: in settings_menu | 1373 | desc: DEPRECATED |
1374 | eng: "Bar(Inverse)" | 1374 | eng: "" |
1375 | voice: "Inverse Bar" | 1375 | voice: "" |
1376 | new: | 1376 | new: |
1377 | 1377 | ||
1378 | id: LANG_INVERT_LCD_NORMAL | 1378 | id: LANG_INVERT_LCD_NORMAL |
diff --git a/apps/menu.c b/apps/menu.c index ad22047b9d..3b0ee4ddd6 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -59,8 +59,7 @@ struct menu { | |||
59 | 59 | ||
60 | /* pixel margins */ | 60 | /* pixel margins */ |
61 | #define MARGIN_X (global_settings.scrollbar && \ | 61 | #define MARGIN_X (global_settings.scrollbar && \ |
62 | menu_lines < menus[m].itemcount ? SCROLLBAR_WIDTH : 0) +\ | 62 | menu_lines < menus[m].itemcount ? SCROLLBAR_WIDTH : 0) |
63 | CURSOR_WIDTH | ||
64 | #define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) | 63 | #define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) |
65 | 64 | ||
66 | /* position the entry-list starts at */ | 65 | /* position the entry-list starts at */ |
@@ -73,7 +72,6 @@ struct menu { | |||
73 | the margins, so this is the amount of lines | 72 | the margins, so this is the amount of lines |
74 | we add to the cursor Y position to position | 73 | we add to the cursor Y position to position |
75 | it on a line */ | 74 | it on a line */ |
76 | #define CURSOR_WIDTH (global_settings.invert_cursor ? 0 : 4) | ||
77 | 75 | ||
78 | #define SCROLLBAR_X 0 | 76 | #define SCROLLBAR_X 0 |
79 | #define SCROLLBAR_Y lcd_getymargin() | 77 | #define SCROLLBAR_Y lcd_getymargin() |
@@ -95,44 +93,19 @@ struct menu { | |||
95 | static struct menu menus[MAX_MENUS]; | 93 | static struct menu menus[MAX_MENUS]; |
96 | static bool inuse[MAX_MENUS] = { false }; | 94 | static bool inuse[MAX_MENUS] = { false }; |
97 | 95 | ||
96 | #ifdef HAVE_LCD_CHARCELLS | ||
98 | /* count in letter positions, NOT pixels */ | 97 | /* count in letter positions, NOT pixels */ |
99 | void put_cursorxy(int x, int y, bool on) | 98 | void put_cursorxy(int x, int y, bool on) |
100 | { | 99 | { |
101 | #ifdef HAVE_LCD_BITMAP | ||
102 | int fh, fw; | ||
103 | int xpos, ypos; | ||
104 | |||
105 | /* check here instead of at every call (ugly, but cheap) */ | ||
106 | if (global_settings.invert_cursor) | ||
107 | return; | ||
108 | |||
109 | lcd_getstringsize("A", &fw, &fh); | ||
110 | xpos = x*6; | ||
111 | ypos = y*fh + lcd_getymargin(); | ||
112 | if ( fh > 8 ) | ||
113 | ypos += (fh - 8) / 2; | ||
114 | #endif | ||
115 | |||
116 | /* place the cursor */ | 100 | /* place the cursor */ |
117 | if(on) { | 101 | if(on) { |
118 | #ifdef HAVE_LCD_BITMAP | ||
119 | lcd_mono_bitmap(bitmap_icons_6x8[Icon_Cursor], xpos, ypos, 4, 8); | ||
120 | #else | ||
121 | lcd_putc(x, y, CURSOR_CHAR); | 102 | lcd_putc(x, y, CURSOR_CHAR); |
122 | #endif | ||
123 | } | 103 | } |
124 | else { | 104 | else { |
125 | #if defined(HAVE_LCD_BITMAP) | ||
126 | /* I use xy here since it needs to disregard the margins */ | ||
127 | lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | ||
128 | lcd_fillrect (xpos, ypos, 4, 8); | ||
129 | lcd_set_drawmode(DRMODE_SOLID); | ||
130 | #else | ||
131 | lcd_putc(x, y, ' '); | 105 | lcd_putc(x, y, ' '); |
132 | #endif | ||
133 | } | 106 | } |
134 | } | 107 | } |
135 | 108 | #endif | |
136 | void menu_draw(int m) | 109 | void menu_draw(int m) |
137 | { | 110 | { |
138 | int i = 0; | 111 | int i = 0; |
@@ -180,18 +153,20 @@ void menu_draw(int m) | |||
180 | /* We want to scroll the line where the cursor is */ | 153 | /* We want to scroll the line where the cursor is */ |
181 | if((menus[m].cursor - menus[m].top)==(i-menus[m].top)) | 154 | if((menus[m].cursor - menus[m].top)==(i-menus[m].top)) |
182 | #ifdef HAVE_LCD_BITMAP | 155 | #ifdef HAVE_LCD_BITMAP |
183 | if (global_settings.invert_cursor) | 156 | lcd_puts_scroll_style(LINE_X, i-menus[m].top, |
184 | lcd_puts_scroll_style(LINE_X, i-menus[m].top, | 157 | P2STR(menus[m].items[i].desc), STYLE_INVERT); |
185 | P2STR(menus[m].items[i].desc), STYLE_INVERT); | 158 | #else |
186 | else | 159 | lcd_puts_scroll(LINE_X, i-menus[m].top, |
160 | P2STR(menus[m].items[i].desc)); | ||
187 | #endif | 161 | #endif |
188 | lcd_puts_scroll(LINE_X, i-menus[m].top, P2STR(menus[m].items[i].desc)); | ||
189 | else | 162 | else |
190 | lcd_puts(LINE_X, i-menus[m].top, P2STR(menus[m].items[i].desc)); | 163 | lcd_puts(LINE_X, i-menus[m].top, P2STR(menus[m].items[i].desc)); |
191 | } | 164 | } |
192 | 165 | ||
166 | #ifdef HAVE_LCD_CHARCELLS | ||
193 | /* place the cursor */ | 167 | /* place the cursor */ |
194 | put_cursorxy(CURSOR_X, menus[m].cursor - menus[m].top, true); | 168 | put_cursorxy(CURSOR_X, menus[m].cursor - menus[m].top, true); |
169 | #endif | ||
195 | 170 | ||
196 | #ifdef HAVE_LCD_BITMAP | 171 | #ifdef HAVE_LCD_BITMAP |
197 | if (global_settings.scrollbar && menus[m].itemcount > menu_lines) | 172 | if (global_settings.scrollbar && menus[m].itemcount > menu_lines) |
diff --git a/apps/menu.h b/apps/menu.h index a378bd8402..d8d9386236 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -91,7 +91,11 @@ int menu_init(const struct menu_item* mitems, int count, int (*callback)(int, in | |||
91 | const char *button1, const char *button2, const char *button3); | 91 | const char *button1, const char *button2, const char *button3); |
92 | void menu_exit(int menu); | 92 | void menu_exit(int menu); |
93 | 93 | ||
94 | #ifdef HAVE_LCD_CHARCELLS | ||
94 | void put_cursorxy(int x, int y, bool on); | 95 | void put_cursorxy(int x, int y, bool on); |
96 | #else | ||
97 | #define put_cursorxy(...) | ||
98 | #endif | ||
95 | 99 | ||
96 | /* Returns below define, or number of selected menu item*/ | 100 | /* Returns below define, or number of selected menu item*/ |
97 | int menu_show(int m); | 101 | int menu_show(int m); |
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index b7a042733e..33e00981da 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -48,13 +48,12 @@ | |||
48 | #define CURSOR_X (global_settings.scrollbar && \ | 48 | #define CURSOR_X (global_settings.scrollbar && \ |
49 | viewer.num_tracks>viewer.num_display_lines?1:0) | 49 | viewer.num_tracks>viewer.num_display_lines?1:0) |
50 | #define CURSOR_Y 0 | 50 | #define CURSOR_Y 0 |
51 | #define CURSOR_WIDTH (global_settings.invert_cursor ? 0 : 4) | ||
52 | 51 | ||
53 | #define ICON_WIDTH ((viewer.char_width > 6) ? viewer.char_width : 6) | 52 | #define ICON_WIDTH ((viewer.char_width > 6) ? viewer.char_width : 6) |
54 | 53 | ||
55 | #define MARGIN_X ((global_settings.scrollbar && \ | 54 | #define MARGIN_X ((global_settings.scrollbar && \ |
56 | viewer.num_tracks > viewer.num_display_lines ? \ | 55 | viewer.num_tracks > viewer.num_display_lines ? \ |
57 | SCROLLBAR_WIDTH : 0) + CURSOR_WIDTH + \ | 56 | SCROLLBAR_WIDTH : 0) + \ |
58 | (global_settings.playlist_viewer_icons ? \ | 57 | (global_settings.playlist_viewer_icons ? \ |
59 | ICON_WIDTH : 0)) | 58 | ICON_WIDTH : 0)) |
60 | #define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) | 59 | #define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) |
@@ -462,7 +461,7 @@ static void display_playlist(void) | |||
462 | if ( viewer.line_height > 8 ) | 461 | if ( viewer.line_height > 8 ) |
463 | offset = (viewer.line_height - 8) / 2; | 462 | offset = (viewer.line_height - 8) / 2; |
464 | lcd_mono_bitmap(bitmap_icons_6x8[Icon_Audio], | 463 | lcd_mono_bitmap(bitmap_icons_6x8[Icon_Audio], |
465 | CURSOR_X * 6 + CURSOR_WIDTH, | 464 | CURSOR_X * 6, |
466 | MARGIN_Y+(i*viewer.line_height) + offset, 6, 8); | 465 | MARGIN_Y+(i*viewer.line_height) + offset, 6, 8); |
467 | #else | 466 | #else |
468 | lcd_putc(LINE_X-1, i, Icon_Audio); | 467 | lcd_putc(LINE_X-1, i, Icon_Audio); |
@@ -472,7 +471,7 @@ static void display_playlist(void) | |||
472 | { | 471 | { |
473 | /* Track we are moving */ | 472 | /* Track we are moving */ |
474 | #ifdef HAVE_LCD_BITMAP | 473 | #ifdef HAVE_LCD_BITMAP |
475 | lcd_putsxy(CURSOR_X * 6 + CURSOR_WIDTH, | 474 | lcd_putsxy(CURSOR_X * 6, |
476 | MARGIN_Y+(i*viewer.line_height), "M"); | 475 | MARGIN_Y+(i*viewer.line_height), "M"); |
477 | #else | 476 | #else |
478 | lcd_putc(LINE_X-1, i, 'M'); | 477 | lcd_putc(LINE_X-1, i, 'M'); |
@@ -482,7 +481,7 @@ static void display_playlist(void) | |||
482 | { | 481 | { |
483 | /* Queued track */ | 482 | /* Queued track */ |
484 | #ifdef HAVE_LCD_BITMAP | 483 | #ifdef HAVE_LCD_BITMAP |
485 | lcd_putsxy(CURSOR_X * 6 + CURSOR_WIDTH, | 484 | lcd_putsxy(CURSOR_X * 6, |
486 | MARGIN_Y+(i*viewer.line_height), "Q"); | 485 | MARGIN_Y+(i*viewer.line_height), "Q"); |
487 | #else | 486 | #else |
488 | lcd_putc(LINE_X-1, i, 'Q'); | 487 | lcd_putc(LINE_X-1, i, 'Q'); |
@@ -603,11 +602,10 @@ static void update_display_line(int line, bool scroll) | |||
603 | if (scroll) | 602 | if (scroll) |
604 | { | 603 | { |
605 | #ifdef HAVE_LCD_BITMAP | 604 | #ifdef HAVE_LCD_BITMAP |
606 | if (global_settings.invert_cursor) | 605 | lcd_puts_scroll_style(LINE_X, line, str, STYLE_INVERT); |
607 | lcd_puts_scroll_style(LINE_X, line, str, STYLE_INVERT); | 606 | #else |
608 | else | 607 | lcd_puts_scroll(LINE_X, line, str); |
609 | #endif | 608 | #endif |
610 | lcd_puts_scroll(LINE_X, line, str); | ||
611 | } | 609 | } |
612 | else | 610 | else |
613 | lcd_puts(LINE_X, line, str); | 611 | lcd_puts(LINE_X, line, str); |
@@ -851,18 +849,12 @@ bool playlist_viewer_ex(char* filename) | |||
851 | /* Flash cursor to identify that we are moving a track */ | 849 | /* Flash cursor to identify that we are moving a track */ |
852 | cursor_on = !cursor_on; | 850 | cursor_on = !cursor_on; |
853 | #ifdef HAVE_LCD_BITMAP | 851 | #ifdef HAVE_LCD_BITMAP |
854 | if (global_settings.invert_cursor) | 852 | lcd_set_drawmode(DRMODE_COMPLEMENT); |
855 | { | 853 | lcd_fillrect( |
856 | lcd_set_drawmode(DRMODE_COMPLEMENT); | 854 | MARGIN_X, MARGIN_Y+(viewer.cursor_pos*viewer.line_height), |
857 | lcd_fillrect( | 855 | LCD_WIDTH, viewer.line_height); |
858 | MARGIN_X, MARGIN_Y+(viewer.cursor_pos*viewer.line_height), | 856 | lcd_set_drawmode(DRMODE_SOLID); |
859 | LCD_WIDTH, viewer.line_height); | 857 | lcd_invertscroll(LINE_X, viewer.cursor_pos); |
860 | lcd_set_drawmode(DRMODE_SOLID); | ||
861 | lcd_invertscroll(LINE_X, viewer.cursor_pos); | ||
862 | } | ||
863 | else | ||
864 | put_cursorxy(CURSOR_X, CURSOR_Y + viewer.cursor_pos, | ||
865 | cursor_on); | ||
866 | 858 | ||
867 | lcd_update_rect( | 859 | lcd_update_rect( |
868 | 0, MARGIN_Y + (viewer.cursor_pos * viewer.line_height), | 860 | 0, MARGIN_Y + (viewer.cursor_pos * viewer.line_height), |
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 148235f040..4d1d2908c4 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -39,7 +39,6 @@ const unsigned char bitmap_icons_6x8[LastIcon][6] = | |||
39 | { 0x60, 0x7f, 0x03, 0x33, 0x3f, 0x00 }, /* Musical note */ | 39 | { 0x60, 0x7f, 0x03, 0x33, 0x3f, 0x00 }, /* Musical note */ |
40 | { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */ | 40 | { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */ |
41 | { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */ | 41 | { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */ |
42 | { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 }, /* Cursor / Marker */ | ||
43 | { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */ | 42 | { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */ |
44 | { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */ | 43 | { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */ |
45 | { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */ | 44 | { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */ |
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 17605ef490..5c442ea371 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -36,7 +36,6 @@ enum icons_6x8 { | |||
36 | Icon_Audio, | 36 | Icon_Audio, |
37 | Icon_Folder, | 37 | Icon_Folder, |
38 | Icon_Playlist, | 38 | Icon_Playlist, |
39 | Icon_Cursor, | ||
40 | Icon_Wps, | 39 | Icon_Wps, |
41 | Icon_Firmware, | 40 | Icon_Firmware, |
42 | Icon_Font, | 41 | Icon_Font, |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index ea71538322..72d752ec55 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -348,7 +348,7 @@ bool recording_screen(void) | |||
348 | 348 | ||
349 | lcd_setfont(FONT_SYSFIXED); | 349 | lcd_setfont(FONT_SYSFIXED); |
350 | lcd_getstringsize("M", &w, &h); | 350 | lcd_getstringsize("M", &w, &h); |
351 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); | 351 | lcd_setmargins(0, 8); |
352 | 352 | ||
353 | if(rec_create_directory() > 0) | 353 | if(rec_create_directory() > 0) |
354 | have_recorded = true; | 354 | have_recorded = true; |
@@ -598,7 +598,7 @@ bool recording_screen(void) | |||
598 | update_countdown = 1; /* Update immediately */ | 598 | update_countdown = 1; /* Update immediately */ |
599 | 599 | ||
600 | lcd_setfont(FONT_SYSFIXED); | 600 | lcd_setfont(FONT_SYSFIXED); |
601 | lcd_setmargins(global_settings.invert_cursor ? 0 : w, 8); | 601 | lcd_setmargins(0, 8); |
602 | } | 602 | } |
603 | break; | 603 | break; |
604 | #endif | 604 | #endif |
@@ -739,7 +739,7 @@ bool recording_screen(void) | |||
739 | fmt_gain(SOUND_MIC_GAIN, | 739 | fmt_gain(SOUND_MIC_GAIN, |
740 | global_settings.rec_mic_gain, | 740 | global_settings.rec_mic_gain, |
741 | buf2, sizeof(buf2))); | 741 | buf2, sizeof(buf2))); |
742 | if (global_settings.invert_cursor && (pos++ == cursor)) | 742 | if (pos++ == cursor) |
743 | lcd_puts_style(0, 4, buf, STYLE_INVERT); | 743 | lcd_puts_style(0, 4, buf, STYLE_INVERT); |
744 | else | 744 | else |
745 | lcd_puts(0, 4, buf); | 745 | lcd_puts(0, 4, buf); |
@@ -754,7 +754,7 @@ bool recording_screen(void) | |||
754 | snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), | 754 | snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN), |
755 | fmt_gain(SOUND_LEFT_GAIN, gain, | 755 | fmt_gain(SOUND_LEFT_GAIN, gain, |
756 | buf2, sizeof(buf2))); | 756 | buf2, sizeof(buf2))); |
757 | if (global_settings.invert_cursor && (pos++ == cursor)) | 757 | if (pos++ == cursor) |
758 | lcd_puts_style(0, 4, buf, STYLE_INVERT); | 758 | lcd_puts_style(0, 4, buf, STYLE_INVERT); |
759 | else | 759 | else |
760 | lcd_puts(0, 4, buf); | 760 | lcd_puts(0, 4, buf); |
@@ -763,7 +763,7 @@ bool recording_screen(void) | |||
763 | fmt_gain(SOUND_LEFT_GAIN, | 763 | fmt_gain(SOUND_LEFT_GAIN, |
764 | global_settings.rec_left_gain, | 764 | global_settings.rec_left_gain, |
765 | buf2, sizeof(buf2))); | 765 | buf2, sizeof(buf2))); |
766 | if (global_settings.invert_cursor && (pos++ == cursor)) | 766 | if (pos++ == cursor) |
767 | lcd_puts_style(0, 5, buf, STYLE_INVERT); | 767 | lcd_puts_style(0, 5, buf, STYLE_INVERT); |
768 | else | 768 | else |
769 | lcd_puts(0, 5, buf); | 769 | lcd_puts(0, 5, buf); |
@@ -772,16 +772,13 @@ bool recording_screen(void) | |||
772 | fmt_gain(SOUND_RIGHT_GAIN, | 772 | fmt_gain(SOUND_RIGHT_GAIN, |
773 | global_settings.rec_right_gain, | 773 | global_settings.rec_right_gain, |
774 | buf2, sizeof(buf2))); | 774 | buf2, sizeof(buf2))); |
775 | if (global_settings.invert_cursor && (pos++ == cursor)) | 775 | if (pos++ == cursor) |
776 | lcd_puts_style(0, 6, buf, STYLE_INVERT); | 776 | lcd_puts_style(0, 6, buf, STYLE_INVERT); |
777 | else | 777 | else |
778 | lcd_puts(0, 6, buf); | 778 | lcd_puts(0, 6, buf); |
779 | } | 779 | } |
780 | } | 780 | } |
781 | 781 | ||
782 | if(global_settings.rec_source != SOURCE_SPDIF) | ||
783 | put_cursorxy(0, 4 + cursor, true); | ||
784 | |||
785 | if (global_settings.rec_source != SOURCE_LINE) { | 782 | if (global_settings.rec_source != SOURCE_LINE) { |
786 | snprintf(buf, 32, "%s %s [%d]", | 783 | snprintf(buf, 32, "%s %s [%d]", |
787 | freq_str[global_settings.rec_frequency], | 784 | freq_str[global_settings.rec_frequency], |
diff --git a/apps/settings.c b/apps/settings.c index 6649ce3f89..70049b6217 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -220,7 +220,6 @@ static const struct bit_entry rtc_bits[] = | |||
220 | {1, S_O(invert), false, "invert", off_on }, | 220 | {1, S_O(invert), false, "invert", off_on }, |
221 | {1, S_O(flip_display), false, "flip display", off_on }, | 221 | {1, S_O(flip_display), false, "flip display", off_on }, |
222 | /* display */ | 222 | /* display */ |
223 | {1, S_O(invert_cursor), false, "invert cursor", off_on }, | ||
224 | {1, S_O(statusbar), true, "statusbar", off_on }, | 223 | {1, S_O(statusbar), true, "statusbar", off_on }, |
225 | {1, S_O(scrollbar), true, "scrollbar", off_on }, | 224 | {1, S_O(scrollbar), true, "scrollbar", off_on }, |
226 | #if CONFIG_KEYPAD == RECORDER_PAD | 225 | #if CONFIG_KEYPAD == RECORDER_PAD |
diff --git a/apps/settings.h b/apps/settings.h index 8387fe02a8..0df93c9cf1 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -195,8 +195,6 @@ struct user_settings | |||
195 | 195 | ||
196 | int contrast; /* lcd contrast: 0-63 0=low 63=high */ | 196 | int contrast; /* lcd contrast: 0-63 0=low 63=high */ |
197 | bool invert; /* invert display */ | 197 | bool invert; /* invert display */ |
198 | bool invert_cursor; /* invert the current file in dir browser and menu | ||
199 | instead of using the default cursor */ | ||
200 | bool flip_display; /* turn display (and button layout) by 180 degrees */ | 198 | bool flip_display; /* turn display (and button layout) by 180 degrees */ |
201 | bool bidi_support; /* reverse hebrew/arabic chars: 0=off, 1=on */ | 199 | bool bidi_support; /* reverse hebrew/arabic chars: 0=off, 1=on */ |
202 | int poweroff; /* power off timer */ | 200 | int poweroff; /* power off timer */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index a614723ca5..4af1c75b19 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -269,18 +269,6 @@ static bool flip_display(void) | |||
269 | } | 269 | } |
270 | 270 | ||
271 | /** | 271 | /** |
272 | * Menu to set Line Selector Type (Pointer/Bar) | ||
273 | */ | ||
274 | static bool invert_cursor(void) | ||
275 | { | ||
276 | return set_bool_options(str(LANG_INVERT_CURSOR), | ||
277 | &global_settings.invert_cursor, | ||
278 | STR(LANG_INVERT_CURSOR_BAR), | ||
279 | STR(LANG_INVERT_CURSOR_POINTER), | ||
280 | NULL); | ||
281 | } | ||
282 | |||
283 | /** | ||
284 | * Menu to reverse Hebrew and Arabic text according to BiDi algorythm | 272 | * Menu to reverse Hebrew and Arabic text according to BiDi algorythm |
285 | */ | 273 | */ |
286 | static bool bidi_support(void) | 274 | static bool bidi_support(void) |
@@ -1440,7 +1428,6 @@ static bool lcd_settings_menu(void) | |||
1440 | #ifdef HAVE_LCD_BITMAP | 1428 | #ifdef HAVE_LCD_BITMAP |
1441 | { ID2P(LANG_INVERT), invert }, | 1429 | { ID2P(LANG_INVERT), invert }, |
1442 | { ID2P(LANG_FLIP_DISPLAY), flip_display }, | 1430 | { ID2P(LANG_FLIP_DISPLAY), flip_display }, |
1443 | { ID2P(LANG_INVERT_CURSOR), invert_cursor }, | ||
1444 | #endif | 1431 | #endif |
1445 | }; | 1432 | }; |
1446 | 1433 | ||
@@ -1462,7 +1449,6 @@ static bool lcd_remote_settings_menu(void) | |||
1462 | { ID2P(LANG_CONTRAST), remote_contrast }, | 1449 | { ID2P(LANG_CONTRAST), remote_contrast }, |
1463 | { ID2P(LANG_INVERT), remote_invert }, | 1450 | { ID2P(LANG_INVERT), remote_invert }, |
1464 | { ID2P(LANG_FLIP_DISPLAY), remote_flip_display }, | 1451 | { ID2P(LANG_FLIP_DISPLAY), remote_flip_display }, |
1465 | /* { ID2P(LANG_INVERT_CURSOR), invert_cursor },*/ | ||
1466 | }; | 1452 | }; |
1467 | 1453 | ||
1468 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, | 1454 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |
diff --git a/apps/tree.c b/apps/tree.c index e56c7a76de..e9ee881c01 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -162,7 +162,7 @@ struct tree_context* tree_get_context(void) | |||
162 | /* pixel margins */ | 162 | /* pixel margins */ |
163 | #define MARGIN_X (global_settings.scrollbar && \ | 163 | #define MARGIN_X (global_settings.scrollbar && \ |
164 | tc.filesindir > tree_max_on_screen ? SCROLLBAR_WIDTH : 0) + \ | 164 | tc.filesindir > tree_max_on_screen ? SCROLLBAR_WIDTH : 0) + \ |
165 | CURSOR_WIDTH + (global_settings.show_icons && ICON_WIDTH > 0 ? ICON_WIDTH :0) | 165 | (global_settings.show_icons && ICON_WIDTH > 0 ? ICON_WIDTH :0) |
166 | #define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) | 166 | #define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) |
167 | 167 | ||
168 | /* position the entry-list starts at */ | 168 | /* position the entry-list starts at */ |
@@ -175,7 +175,6 @@ struct tree_context* tree_get_context(void) | |||
175 | the margins, so this is the amount of lines | 175 | the margins, so this is the amount of lines |
176 | we add to the cursor Y position to position | 176 | we add to the cursor Y position to position |
177 | it on a line */ | 177 | it on a line */ |
178 | #define CURSOR_WIDTH (global_settings.invert_cursor ? 0 : 4) | ||
179 | 178 | ||
180 | #define ICON_WIDTH 6 | 179 | #define ICON_WIDTH 6 |
181 | 180 | ||
@@ -222,11 +221,10 @@ static void showfileline(int line, char* name, int attr, bool scroll) | |||
222 | if(scroll) { | 221 | if(scroll) { |
223 | #ifdef HAVE_LCD_BITMAP | 222 | #ifdef HAVE_LCD_BITMAP |
224 | lcd_setfont(FONT_UI); | 223 | lcd_setfont(FONT_UI); |
225 | if (global_settings.invert_cursor) | 224 | lcd_puts_scroll_style(xpos, line, name, STYLE_INVERT); |
226 | lcd_puts_scroll_style(xpos, line, name, STYLE_INVERT); | 225 | #else |
227 | else | 226 | lcd_puts_scroll(xpos, line, name); |
228 | #endif | 227 | #endif |
229 | lcd_puts_scroll(xpos, line, name); | ||
230 | } else | 228 | } else |
231 | lcd_puts(xpos, line, name); | 229 | lcd_puts(xpos, line, name); |
232 | 230 | ||
@@ -396,7 +394,7 @@ static int showdir(void) | |||
396 | if ( line_height > 8 ) | 394 | if ( line_height > 8 ) |
397 | offset = (line_height - 8) / 2; | 395 | offset = (line_height - 8) / 2; |
398 | lcd_mono_bitmap(icon, | 396 | lcd_mono_bitmap(icon, |
399 | CURSOR_X * 6 + CURSOR_WIDTH, | 397 | CURSOR_X * 6, |
400 | MARGIN_Y+(i-start)*line_height + offset, 6, 8); | 398 | MARGIN_Y+(i-start)*line_height + offset, 6, 8); |
401 | #else | 399 | #else |
402 | if (icon < 0 ) | 400 | if (icon < 0 ) |