diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/bitmap/list.c | 14 | ||||
-rw-r--r-- | apps/lang/english.lang | 51 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 5 |
4 files changed, 8 insertions, 64 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index efca22832d..79df35b363 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c | |||
@@ -135,9 +135,8 @@ void list_draw(struct screen *display, struct gui_synclist *list) | |||
135 | start = list->start_item[screen]; | 135 | start = list->start_item[screen]; |
136 | end = start + viewport_get_nb_lines(&list_text[screen]); | 136 | end = start + viewport_get_nb_lines(&list_text[screen]); |
137 | 137 | ||
138 | scrollbar_in_left = | 138 | scrollbar_in_left = (global_settings.scrollbar == SCROLLBAR_LEFT); |
139 | (!is_rtl && global_settings.scrollbar == SCROLLBAR_SHOW) || | 139 | |
140 | (is_rtl && global_settings.scrollbar == SCROLLBAR_SHOW_OPPOSITE); | ||
141 | /* draw the scrollbar if its needed */ | 140 | /* draw the scrollbar if its needed */ |
142 | if (global_settings.scrollbar && | 141 | if (global_settings.scrollbar && |
143 | viewport_get_nb_lines(&list_text[screen]) < list->nb_items) | 142 | viewport_get_nb_lines(&list_text[screen]) < list->nb_items) |
@@ -358,15 +357,13 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list) | |||
358 | return ACTION_NONE; | 357 | return ACTION_NONE; |
359 | } | 358 | } |
360 | /* Scroll bar */ | 359 | /* Scroll bar */ |
361 | /* TODO: Support RTL mode */ | 360 | else if(global_settings.scrollbar == SCROLLBAR_LEFT) |
362 | else if(global_settings.scrollbar == SCROLLBAR_SHOW) | ||
363 | return gui_synclist_touchscreen_scrollbar(gui_list, y); | 361 | return gui_synclist_touchscreen_scrollbar(gui_list, y); |
364 | } | 362 | } |
365 | else | 363 | else |
366 | { | 364 | { |
367 | /* TODO: Support RTL mode */ | ||
368 | if(x>list_text[screen].x+list_text[screen].width && | 365 | if(x>list_text[screen].x+list_text[screen].width && |
369 | global_settings.scrollbar == SCROLLBAR_SHOW_OPPOSITE) | 366 | global_settings.scrollbar == SCROLLBAR_RIGHT) |
370 | return gui_synclist_touchscreen_scrollbar(gui_list, y); | 367 | return gui_synclist_touchscreen_scrollbar(gui_list, y); |
371 | 368 | ||
372 | /* |--------------------------------------------------------| | 369 | /* |--------------------------------------------------------| |
@@ -414,8 +411,7 @@ unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list) | |||
414 | an item when he wanted to use the scrollbar, due to touchscreen | 411 | an item when he wanted to use the scrollbar, due to touchscreen |
415 | dead zones) | 412 | dead zones) |
416 | */ | 413 | */ |
417 | /* TODO: Support RTL mode */ | 414 | if(global_settings.scrollbar == SCROLLBAR_RIGHT && |
418 | if(global_settings.scrollbar == SCROLLBAR_SHOW_OPPOSITE && | ||
419 | x > list_text[screen].x + list_text[screen].width - | 415 | x > list_text[screen].x + list_text[screen].width - |
420 | get_icon_width(SCREEN_MAIN)) | 416 | get_icon_width(SCREEN_MAIN)) |
421 | return ACTION_NONE; | 417 | return ACTION_NONE; |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index d34b2e9b32..8be7380225 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13075,54 +13075,3 @@ | |||
13075 | swcodec: "Release Time" | 13075 | swcodec: "Release Time" |
13076 | </voice> | 13076 | </voice> |
13077 | </phrase> | 13077 | </phrase> |
13078 | <phrase> | ||
13079 | id: LANG_HIDE | ||
13080 | desc: in Settings -> General -> Display -> Status-/Scrollbar -> Scrollbar | ||
13081 | user: core | ||
13082 | <source> | ||
13083 | *: none | ||
13084 | lcd_bitmap: "Hide" | ||
13085 | </source> | ||
13086 | <dest> | ||
13087 | *: none | ||
13088 | lcd_bitmap: "Hide" | ||
13089 | </dest> | ||
13090 | <voice> | ||
13091 | *: none | ||
13092 | lcd_bitmap: "Hide" | ||
13093 | </voice> | ||
13094 | </phrase> | ||
13095 | <phrase> | ||
13096 | id: LANG_SHOW | ||
13097 | desc: in Settings -> General -> Display -> Status-/Scrollbar -> Scrollbar | ||
13098 | user: core | ||
13099 | <source> | ||
13100 | *: none | ||
13101 | lcd_bitmap: "Show" | ||
13102 | </source> | ||
13103 | <dest> | ||
13104 | *: none | ||
13105 | lcd_bitmap: "Show" | ||
13106 | </dest> | ||
13107 | <voice> | ||
13108 | *: none | ||
13109 | lcd_bitmap: "Show" | ||
13110 | </voice> | ||
13111 | </phrase> | ||
13112 | <phrase> | ||
13113 | id: LANG_SHOW_OPPOSITE | ||
13114 | desc: in Settings -> General -> Display -> Status-/Scrollbar -> Scrollbar | ||
13115 | user: core | ||
13116 | <source> | ||
13117 | *: none | ||
13118 | lcd_bitmap: "Show Opposite" | ||
13119 | </source> | ||
13120 | <dest> | ||
13121 | *: none | ||
13122 | lcd_bitmap: "Show Opposite" | ||
13123 | </dest> | ||
13124 | <voice> | ||
13125 | *: none | ||
13126 | lcd_bitmap: "Show Opposite" | ||
13127 | </voice> | ||
13128 | </phrase> | ||
diff --git a/apps/settings.h b/apps/settings.h index 275d1c1ad0..ad250ed3b7 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -158,7 +158,7 @@ enum { REPLAYGAIN_TRACK = 0, REPLAYGAIN_ALBUM, REPLAYGAIN_SHUFFLE, REPLAYGAIN_OF | |||
158 | enum { SHOW_PATH_OFF = 0, SHOW_PATH_CURRENT, SHOW_PATH_FULL }; | 158 | enum { SHOW_PATH_OFF = 0, SHOW_PATH_CURRENT, SHOW_PATH_FULL }; |
159 | 159 | ||
160 | /* scrollbar visibility/position */ | 160 | /* scrollbar visibility/position */ |
161 | enum { SCROLLBAR_HIDE = 0, SCROLLBAR_SHOW, SCROLLBAR_SHOW_OPPOSITE }; | 161 | enum { SCROLLBAR_OFF = 0, SCROLLBAR_LEFT, SCROLLBAR_RIGHT }; |
162 | 162 | ||
163 | /* Alarm settings */ | 163 | /* Alarm settings */ |
164 | #ifdef HAVE_RTC_ALARM | 164 | #ifdef HAVE_RTC_ALARM |
diff --git a/apps/settings_list.c b/apps/settings_list.c index d76c2deb69..62a9351782 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -641,9 +641,8 @@ const struct settings_list settings[] = { | |||
641 | ID2P(LANG_STATUSBAR_BOTTOM)), | 641 | ID2P(LANG_STATUSBAR_BOTTOM)), |
642 | #endif | 642 | #endif |
643 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar, | 643 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar, |
644 | LANG_SCROLL_BAR, SCROLLBAR_SHOW, | 644 | LANG_SCROLL_BAR, SCROLLBAR_LEFT, "scrollbar","off,left,right", |
645 | "scrollbar","hide,show,show_opposite", NULL, 3, | 645 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_LEFT), ID2P(LANG_RIGHT)), |
646 | ID2P(LANG_HIDE), ID2P(LANG_SHOW), ID2P(LANG_SHOW_OPPOSITE)), | ||
647 | INT_SETTING(F_THEMESETTING, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, | 646 | INT_SETTING(F_THEMESETTING, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, |
648 | "scrollbar width",UNIT_INT, 3, MAX(LCD_WIDTH/10,25), 1, | 647 | "scrollbar width",UNIT_INT, 3, MAX(LCD_WIDTH/10,25), 1, |
649 | NULL, NULL, NULL), | 648 | NULL, NULL, NULL), |