diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 97 | ||||
-rw-r--r-- | apps/onplay.c | 18 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
3 files changed, 87 insertions, 32 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 18842a3207..3ad2921abe 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -6228,58 +6228,58 @@ | |||
6228 | </phrase> | 6228 | </phrase> |
6229 | <phrase> | 6229 | <phrase> |
6230 | id: LANG_INSERT | 6230 | id: LANG_INSERT |
6231 | desc: in onplay menu. insert a track/playlist into dynamic playlist. | 6231 | desc: deprecated |
6232 | user: core | 6232 | user: core |
6233 | <source> | 6233 | <source> |
6234 | *: "Insert" | 6234 | *: "" |
6235 | </source> | 6235 | </source> |
6236 | <dest> | 6236 | <dest> |
6237 | *: "Insert" | 6237 | *: "" |
6238 | </dest> | 6238 | </dest> |
6239 | <voice> | 6239 | <voice> |
6240 | *: "Insert" | 6240 | *: "" |
6241 | </voice> | 6241 | </voice> |
6242 | </phrase> | 6242 | </phrase> |
6243 | <phrase> | 6243 | <phrase> |
6244 | id: LANG_INSERT_FIRST | 6244 | id: LANG_INSERT_FIRST |
6245 | desc: in onplay menu. insert a track/playlist into dynamic playlist. | 6245 | desc: deprecated |
6246 | user: core | 6246 | user: core |
6247 | <source> | 6247 | <source> |
6248 | *: "Insert Next" | 6248 | *: "" |
6249 | </source> | 6249 | </source> |
6250 | <dest> | 6250 | <dest> |
6251 | *: "Insert Next" | 6251 | *: "" |
6252 | </dest> | 6252 | </dest> |
6253 | <voice> | 6253 | <voice> |
6254 | *: "Insert Next" | 6254 | *: "" |
6255 | </voice> | 6255 | </voice> |
6256 | </phrase> | 6256 | </phrase> |
6257 | <phrase> | 6257 | <phrase> |
6258 | id: LANG_INSERT_LAST | 6258 | id: LANG_INSERT_LAST |
6259 | desc: in onplay menu. append a track/playlist into dynamic playlist. | 6259 | desc: deprecated |
6260 | user: core | 6260 | user: core |
6261 | <source> | 6261 | <source> |
6262 | *: "Insert Last" | 6262 | *: "" |
6263 | </source> | 6263 | </source> |
6264 | <dest> | 6264 | <dest> |
6265 | *: "Insert Last" | 6265 | *: "" |
6266 | </dest> | 6266 | </dest> |
6267 | <voice> | 6267 | <voice> |
6268 | *: "Insert Last" | 6268 | *: "" |
6269 | </voice> | 6269 | </voice> |
6270 | </phrase> | 6270 | </phrase> |
6271 | <phrase> | 6271 | <phrase> |
6272 | id: LANG_INSERT_SHUFFLED | 6272 | id: LANG_INSERT_SHUFFLED |
6273 | desc: in onplay menu. insert a track/playlist randomly into dynamic playlist | 6273 | desc: deprecated |
6274 | user: core | 6274 | user: core |
6275 | <source> | 6275 | <source> |
6276 | *: "Insert Shuffled" | 6276 | *: "" |
6277 | </source> | 6277 | </source> |
6278 | <dest> | 6278 | <dest> |
6279 | *: "Insert Shuffled" | 6279 | *: "" |
6280 | </dest> | 6280 | </dest> |
6281 | <voice> | 6281 | <voice> |
6282 | *: "Insert Shuffled" | 6282 | *: "" |
6283 | </voice> | 6283 | </voice> |
6284 | </phrase> | 6284 | </phrase> |
6285 | <phrase> | 6285 | <phrase> |
@@ -10980,16 +10980,16 @@ | |||
10980 | </phrase> | 10980 | </phrase> |
10981 | <phrase> | 10981 | <phrase> |
10982 | id: LANG_INSERT_LAST_SHUFFLED | 10982 | id: LANG_INSERT_LAST_SHUFFLED |
10983 | desc: in onplay menu. insert a playlist randomly at end of dynamic playlist | 10983 | desc: deprecated |
10984 | user: core | 10984 | user: core |
10985 | <source> | 10985 | <source> |
10986 | *: "Insert Last Shuffled" | 10986 | *: "" |
10987 | </source> | 10987 | </source> |
10988 | <dest> | 10988 | <dest> |
10989 | *: "Insert Last Shuffled" | 10989 | *: "" |
10990 | </dest> | 10990 | </dest> |
10991 | <voice> | 10991 | <voice> |
10992 | *: "Insert Last Shuffled" | 10992 | *: "" |
10993 | </voice> | 10993 | </voice> |
10994 | </phrase> | 10994 | </phrase> |
10995 | <phrase> | 10995 | <phrase> |
@@ -16503,4 +16503,59 @@ | |||
16503 | *: "Playing Next..." | 16503 | *: "Playing Next..." |
16504 | </voice> | 16504 | </voice> |
16505 | </phrase> | 16505 | </phrase> |
16506 | 16506 | <phrase> | |
16507 | id: LANG_PLAY_NEXT | ||
16508 | desc: used in the onplay menu | ||
16509 | user: core | ||
16510 | <source> | ||
16511 | *: "Play Next" | ||
16512 | </source> | ||
16513 | <dest> | ||
16514 | *: "Play Next" | ||
16515 | </dest> | ||
16516 | <voice> | ||
16517 | *: "Play Next" | ||
16518 | </voice> | ||
16519 | </phrase> | ||
16520 | <phrase> | ||
16521 | id: LANG_ADD_SHUFFLED | ||
16522 | desc: used in the onplay menu | ||
16523 | user: core | ||
16524 | <source> | ||
16525 | *: "Add Shuffled" | ||
16526 | </source> | ||
16527 | <dest> | ||
16528 | *: "Add Shuffled" | ||
16529 | </dest> | ||
16530 | <voice> | ||
16531 | *: "Add Shuffled" | ||
16532 | </voice> | ||
16533 | </phrase> | ||
16534 | <phrase> | ||
16535 | id: LANG_PLAY_LAST | ||
16536 | desc: used in the onplay menu | ||
16537 | user: core | ||
16538 | <source> | ||
16539 | *: "Play Last" | ||
16540 | </source> | ||
16541 | <dest> | ||
16542 | *: "Play Last" | ||
16543 | </dest> | ||
16544 | <voice> | ||
16545 | *: "Play Last" | ||
16546 | </voice> | ||
16547 | </phrase> | ||
16548 | <phrase> | ||
16549 | id: LANG_PLAY_LAST_SHUFFLED | ||
16550 | desc: used in the onplay menu | ||
16551 | user: core | ||
16552 | <source> | ||
16553 | *: "Play Last Shuffled" | ||
16554 | </source> | ||
16555 | <dest> | ||
16556 | *: "Play Last Shuffled" | ||
16557 | </dest> | ||
16558 | <voice> | ||
16559 | *: "Play Last Shuffled" | ||
16560 | </voice> | ||
16561 | </phrase> | ||
diff --git a/apps/onplay.c b/apps/onplay.c index 415cc05be8..190f67d3ed 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -626,19 +626,19 @@ static int treeplaylist_callback(int action, | |||
626 | struct gui_synclist *this_list); | 626 | struct gui_synclist *this_list); |
627 | 627 | ||
628 | /* insert items */ | 628 | /* insert items */ |
629 | MENUITEM_FUNCTION_W_PARAM(i_pl_item, 0, ID2P(LANG_INSERT), | 629 | MENUITEM_FUNCTION_W_PARAM(i_pl_item, 0, ID2P(LANG_ADD), |
630 | add_to_playlist, &addtopl_insert, | 630 | add_to_playlist, &addtopl_insert, |
631 | treeplaylist_callback, Icon_Playlist); | 631 | treeplaylist_callback, Icon_Playlist); |
632 | MENUITEM_FUNCTION_W_PARAM(i_first_pl_item, 0, ID2P(LANG_INSERT_FIRST), | 632 | MENUITEM_FUNCTION_W_PARAM(i_first_pl_item, 0, ID2P(LANG_PLAY_NEXT), |
633 | add_to_playlist, &addtopl_insert_first, | 633 | add_to_playlist, &addtopl_insert_first, |
634 | treeplaylist_callback, Icon_Playlist); | 634 | treeplaylist_callback, Icon_Playlist); |
635 | MENUITEM_FUNCTION_W_PARAM(i_last_pl_item, 0, ID2P(LANG_INSERT_LAST), | 635 | MENUITEM_FUNCTION_W_PARAM(i_last_pl_item, 0, ID2P(LANG_PLAY_LAST), |
636 | add_to_playlist, &addtopl_insert_last, | 636 | add_to_playlist, &addtopl_insert_last, |
637 | treeplaylist_callback, Icon_Playlist); | 637 | treeplaylist_callback, Icon_Playlist); |
638 | MENUITEM_FUNCTION_W_PARAM(i_shuf_pl_item, 0, ID2P(LANG_INSERT_SHUFFLED), | 638 | MENUITEM_FUNCTION_W_PARAM(i_shuf_pl_item, 0, ID2P(LANG_ADD_SHUFFLED), |
639 | add_to_playlist, &addtopl_insert_shuf, | 639 | add_to_playlist, &addtopl_insert_shuf, |
640 | treeplaylist_callback, Icon_Playlist); | 640 | treeplaylist_callback, Icon_Playlist); |
641 | MENUITEM_FUNCTION_W_PARAM(i_last_shuf_pl_item, 0, ID2P(LANG_INSERT_LAST_SHUFFLED), | 641 | MENUITEM_FUNCTION_W_PARAM(i_last_shuf_pl_item, 0, ID2P(LANG_PLAY_LAST_SHUFFLED), |
642 | add_to_playlist, &addtopl_insert_last_shuf, | 642 | add_to_playlist, &addtopl_insert_last_shuf, |
643 | treeplaylist_callback, Icon_Playlist); | 643 | treeplaylist_callback, Icon_Playlist); |
644 | /* queue items */ | 644 | /* queue items */ |
@@ -661,10 +661,10 @@ MENUITEM_FUNCTION_W_PARAM(q_last_shuf_pl_item, 0, ID2P(LANG_QUEUE_LAST_SHUFFLED) | |||
661 | /* queue submenu */ | 661 | /* queue submenu */ |
662 | MAKE_ONPLAYMENU(queue_menu, ID2P(LANG_QUEUE_MENU), | 662 | MAKE_ONPLAYMENU(queue_menu, ID2P(LANG_QUEUE_MENU), |
663 | treeplaylist_callback, Icon_Playlist, | 663 | treeplaylist_callback, Icon_Playlist, |
664 | &q_pl_item, | ||
665 | &q_first_pl_item, | 664 | &q_first_pl_item, |
666 | &q_last_pl_item, | 665 | &q_pl_item, |
667 | &q_shuf_pl_item, | 666 | &q_shuf_pl_item, |
667 | &q_last_pl_item, | ||
668 | &q_last_shuf_pl_item); | 668 | &q_last_shuf_pl_item); |
669 | 669 | ||
670 | /* replace playlist */ | 670 | /* replace playlist */ |
@@ -680,15 +680,15 @@ MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_PLAYING_NEXT), | |||
680 | treeplaylist_callback, Icon_Playlist, | 680 | treeplaylist_callback, Icon_Playlist, |
681 | 681 | ||
682 | /* insert */ | 682 | /* insert */ |
683 | &i_pl_item, | ||
684 | &i_first_pl_item, | 683 | &i_first_pl_item, |
684 | &i_pl_item, | ||
685 | &i_last_pl_item, | 685 | &i_last_pl_item, |
686 | &i_shuf_pl_item, | 686 | &i_shuf_pl_item, |
687 | &i_last_shuf_pl_item, | 687 | &i_last_shuf_pl_item, |
688 | 688 | ||
689 | /* queue */ | 689 | /* queue */ |
690 | &q_pl_item, | ||
691 | &q_first_pl_item, | 690 | &q_first_pl_item, |
691 | &q_pl_item, | ||
692 | &q_last_pl_item, | 692 | &q_last_pl_item, |
693 | &q_shuf_pl_item, | 693 | &q_shuf_pl_item, |
694 | &q_last_shuf_pl_item, | 694 | &q_last_shuf_pl_item, |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 0ea6026346..60ac4192fa 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1766,9 +1766,9 @@ const struct settings_list settings[] = { | |||
1766 | true, "warn when erasing dynamic playlist",NULL), | 1766 | true, "warn when erasing dynamic playlist",NULL), |
1767 | OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE, | 1767 | OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE, |
1768 | true, "keep current track when replacing playlist",NULL), | 1768 | true, "keep current track when replacing playlist",NULL), |
1769 | OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, true, | 1769 | OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, false, |
1770 | "show shuffled adding options", NULL), | 1770 | "show shuffled adding options", NULL), |
1771 | CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 1, | 1771 | CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0, |
1772 | "show queue options", "off,on,in submenu", | 1772 | "show queue options", "off,on,in submenu", |
1773 | NULL, 3, | 1773 | NULL, 3, |
1774 | ID2P(LANG_SET_BOOL_NO), | 1774 | ID2P(LANG_SET_BOOL_NO), |