diff options
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 55cefd9bb7..56107e7b04 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1572,22 +1572,22 @@ const struct settings_list settings[] = { | |||
1572 | #if CONFIG_TUNER | 1572 | #if CONFIG_TUNER |
1573 | "radio," | 1573 | "radio," |
1574 | #endif | 1574 | #endif |
1575 | "bookmarks" ,NULL, | 1575 | "bookmarks,pictureflow", NULL, |
1576 | #if defined(HAVE_TAGCACHE) | 1576 | #if defined(HAVE_TAGCACHE) |
1577 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | 1577 | #if defined(HAVE_RECORDING) && CONFIG_TUNER |
1578 | 9, | 1578 | 10, |
1579 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | 1579 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ |
1580 | 8, | 1580 | 9, |
1581 | #else | 1581 | #else |
1582 | 7, | 1582 | 8, |
1583 | #endif | 1583 | #endif |
1584 | #else | 1584 | #else |
1585 | #if defined(HAVE_RECORDING) && CONFIG_TUNER | 1585 | #if defined(HAVE_RECORDING) && CONFIG_TUNER |
1586 | 8, | 1586 | 9, |
1587 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ | 1587 | #elif defined(HAVE_RECORDING) || CONFIG_TUNER /* only one of them */ |
1588 | 7, | 1588 | 8, |
1589 | #else | 1589 | #else |
1590 | 6, | 1590 | 7, |
1591 | #endif | 1591 | #endif |
1592 | #endif | 1592 | #endif |
1593 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), | 1593 | ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU), |
@@ -1602,7 +1602,8 @@ const struct settings_list settings[] = { | |||
1602 | #if CONFIG_TUNER | 1602 | #if CONFIG_TUNER |
1603 | ID2P(LANG_FM_RADIO), | 1603 | ID2P(LANG_FM_RADIO), |
1604 | #endif | 1604 | #endif |
1605 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS) | 1605 | ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), |
1606 | ID2P(LANG_ONPLAY_PICTUREFLOW) | ||
1606 | ), | 1607 | ), |
1607 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), | 1608 | SYSTEM_SETTING(NVRAM(1),last_screen,-1), |
1608 | #if defined(HAVE_RTC_ALARM) && \ | 1609 | #if defined(HAVE_RTC_ALARM) && \ |
@@ -1746,10 +1747,10 @@ const struct settings_list settings[] = { | |||
1746 | #ifdef HAVE_HOTKEY | 1747 | #ifdef HAVE_HOTKEY |
1747 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps, | 1748 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_wps, |
1748 | LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps", | 1749 | LANG_HOTKEY_WPS, HOTKEY_VIEW_PLAYLIST, "hotkey wps", |
1749 | "off,view playlist,show track info,pitchscreen,open with,delete", | 1750 | "off,view playlist,show track info,pitchscreen,open with,delete,pictureflow", |
1750 | UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 6, HOTKEY_OFF, | 1751 | UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 7, HOTKEY_OFF, |
1751 | HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN, | 1752 | HOTKEY_VIEW_PLAYLIST, HOTKEY_SHOW_TRACK_INFO, HOTKEY_PITCHSCREEN, |
1752 | HOTKEY_OPEN_WITH, HOTKEY_DELETE), | 1753 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_PICTUREFLOW), |
1753 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, | 1754 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, |
1754 | LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", | 1755 | LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", |
1755 | "off,open with,delete,insert,insert shuffled", | 1756 | "off,open with,delete,insert,insert shuffled", |