Compare commits

..

No commits in common. "86639acc5e14af3cde6a8b0ca77761a7bca2293d" and "a6a1be6e304749edd6952143da835c82dbfe770a" have entirely different histories.

36 changed files with 663 additions and 978 deletions

View file

@ -11721,7 +11721,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16976,17 +16976,3 @@
*: "Винаги помни последната папка"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "Ю Ес Би"
</voice>
</phrase>

View file

@ -11697,7 +11697,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16953,17 +16953,3 @@
general_purpose_led: "使用 L E D 指示灯"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -11520,7 +11520,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16992,17 +16992,3 @@
*: "Zuletzt verwendeten Ordner immer merken"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12027,7 +12027,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16970,17 +16970,3 @@
*: "Always remember last folder"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "USB"
</dest>
<voice>
*: "U S B"
</voice>
</phrase>

View file

@ -12280,7 +12280,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16067,16 +16067,16 @@
</phrase>
<phrase>
id: LANG_DEFAULT_BROWSER
desc: deprecated
desc: in Settings
user: core
<source>
*: ""
*: "Default Browser"
</source>
<dest>
*: ""
*: "Default Browser"
</dest>
<voice>
*: ""
*: "Default Browser"
</voice>
</phrase>
<phrase>
@ -17043,17 +17043,3 @@
*: "Always remember last folder"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "USB"
</dest>
<voice>
*: "U S B"
</voice>
</phrase>

View file

@ -12543,7 +12543,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16982,17 +16982,3 @@
*: "Recordar siempre la última carpeta"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -11876,7 +11876,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16953,17 +16953,3 @@
*: "trier les listes de lecture"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -11830,7 +11830,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"

View file

@ -11747,7 +11747,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16974,17 +16974,3 @@
*: "Ricorda sempre l'ultima cartella"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -11511,7 +11511,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16514,17 +16514,3 @@
*: "プレイリストは終了しました。もう一度再生しますか?"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12045,7 +12045,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16988,17 +16988,3 @@
*: "항상 마지막 폴더 기억"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12156,7 +12156,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16959,17 +16959,3 @@
*: "Paziņot statusu"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "Ju es bī"
</voice>
</phrase>

View file

@ -10437,7 +10437,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16962,17 +16962,3 @@
*: "Állapot bejelentése"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12162,7 +12162,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16979,17 +16979,3 @@
*: "Ține minte mereu ultimul dosar"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "u se be"
</voice>
</phrase>

View file

@ -11725,7 +11725,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16954,17 +16954,3 @@
general_purpose_led: "Gebruik LED-indicatoren"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12229,7 +12229,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16978,17 +16978,3 @@
*: "Alltid hugs siste mappe"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -11111,7 +11111,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"

View file

@ -11669,7 +11669,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16980,17 +16980,3 @@
*: "Zawsze pamiętaj ostatni katalog"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "u es be"
</voice>
</phrase>

View file

@ -12225,7 +12225,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16983,17 +16983,3 @@
*: "Playlist finalizada. Reproduzir novamente?"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12863,7 +12863,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"

View file

@ -12162,7 +12162,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16979,17 +16979,3 @@
*: "Ține minte mereu ultimul dosar"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "u se be"
</voice>
</phrase>

View file

@ -11781,7 +11781,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16988,17 +16988,3 @@
*: "Всегда запоминать последнюю папку"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "Ю С Б"
</voice>
</phrase>

View file

@ -11689,7 +11689,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16974,17 +16974,3 @@
*: "Vždy si zapamätať posledný priečinok"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12141,7 +12141,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16958,17 +16958,3 @@
general_purpose_led: "Користи LED индикаторе"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "У Ес Бе"
</voice>
</phrase>

View file

@ -11577,7 +11577,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16953,17 +16953,3 @@
general_purpose_led: "Använd LED-indikatorer"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -9682,7 +9682,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16975,17 +16975,3 @@
*: "En son dosyayı her zaman hatırla"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12156,7 +12156,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16945,17 +16945,3 @@
general_purpose_led: "Використати світлодіодні індикатори"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12051,7 +12051,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"
@ -16958,17 +16958,3 @@
*: "Thông báo trạng thái"
</voice>
</phrase>
<phrase>
id: LANG_USB_MENU
desc: in settings_menu
user: core
<source>
*: "USB"
</source>
<dest>
*: "~USB"
</dest>
<voice>
*: "~U S B"
</voice>
</phrase>

View file

@ -12856,7 +12856,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB
desc: in Settings -> General -> System -> USB Mode
user: core
<source>
*: "USB Mode"

View file

@ -59,10 +59,6 @@
#include "onplay.h"
#include "misc.h"
#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
#define HAVE_USB_MODE
#endif
#ifndef HAS_BUTTON_HOLD
static int selectivesoftlock_callback(int action,
const struct menu_item_ex *this_item,
@ -275,7 +271,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
&usb_charging,
#endif
);
#ifdef HAVE_USB_MODE
#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL);
#endif
#if defined(HAVE_GENERAL_PURPOSE_LED)
@ -415,22 +411,6 @@ MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE),
MENUITEM_SETTING(governor, &global_settings.governor, NULL);
#endif
MAKE_MENU(usb_menu, ID2P(LANG_USB_MENU), 0, Icon_NOICON,
#ifdef USB_ENABLE_HID
&usb_hid,
&usb_keypad_mode,
#endif
#ifdef USB_ENABLE_AUDIO
&usb_audio,
#endif
#if defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)
&usb_skip_first_drive,
#endif
#ifdef HAVE_USB_MODE
&usb_mode,
#endif
);
MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
0, Icon_System_menu,
#if (BATTERY_CAPACITY_INC > 0) || defined(HAVE_USB_CHARGING_ENABLE)
@ -478,15 +458,23 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
#ifndef HAS_BUTTON_HOLD
&sel_softlock,
#endif
#if defined(USB_ENABLE_HID) || \
defined(USB_ENABLE_AUDIO) || \
(defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)) || \
defined(HAVE_USB_MODE)
&usb_menu,
#ifdef USB_ENABLE_HID
&usb_hid,
&usb_keypad_mode,
#endif
#ifdef USB_ENABLE_AUDIO
&usb_audio,
#endif
#if defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)
&usb_skip_first_drive,
#endif
#if defined(DX50) || defined(DX90)
&governor,
#endif
#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
&usb_mode,
#endif
#if defined(HAVE_GENERAL_PURPOSE_LED)
&use_led_indicators,
#endif
@ -737,12 +725,15 @@ MENUITEM_FUNCTION(wps_set_context_plugin, 0,
/***********************************/
/* WPS Settings MENU */
MENUITEM_SETTING(browser_default,
&global_settings.browser_default, NULL);
#ifdef HAVE_HOTKEY
MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL);
#endif
MAKE_MENU(wps_settings, ID2P(LANG_WPS), 0, Icon_Playback_menu
,&browser_default
#ifdef HAVE_HOTKEY
,&hotkey_wps_item
#endif

View file

@ -931,10 +931,25 @@ static int root_menu_setup_screens(void)
return new_screen;
}
static int browser_default(void)
{
switch (global_settings.browser_default)
{
#ifdef HAVE_TAGCACHE
case BROWSER_DEFAULT_DB:
return GO_TO_DBBROWSER;
#endif
case BROWSER_DEFAULT_PL_CAT:
return GO_TO_PLAYLISTS_SCREEN;
case BROWSER_DEFAULT_FILES:
default:
return GO_TO_FILEBROWSER;
}
}
void root_menu(void)
{
int previous_browser = global_status.last_browser;
int previous_browser = browser_default();
int selected = 0;
int shortcut_origin = GO_TO_ROOT;
@ -968,7 +983,7 @@ void root_menu(void)
#endif
case GO_TO_FILEBROWSER:
case GO_TO_PLAYLISTS_SCREEN:
global_status.last_browser = previous_browser = next_screen;
previous_browser = next_screen;
goto load_next_screen;
break;
#if CONFIG_TUNER
@ -1063,8 +1078,8 @@ void root_menu(void)
last_screen = GO_TO_PLUGIN;
}
}
previous_browser = (next_screen == GO_TO_WPS) ?
GO_TO_PLUGIN : global_status.last_browser;
previous_browser = (next_screen != GO_TO_WPS) ? browser_default() :
GO_TO_PLUGIN;
break;
}
default:

View file

@ -135,6 +135,15 @@ enum
QUEUE_SHOW_IN_SUBMENU
};
enum
{
BROWSER_DEFAULT_FILES = 0,
#ifdef HAVE_TAGCACHE
BROWSER_DEFAULT_DB,
#endif
BROWSER_DEFAULT_PL_CAT
};
#ifdef HAVE_ALBUMART
enum
{
@ -351,7 +360,6 @@ struct system_status
relative to MIN_FREQ */
#endif
int last_screen;
int last_browser;
int viewer_icon_count;
int last_volume_change; /* tick the last volume change happened. skins use this */
int font_id[NB_SCREENS]; /* font id of the settings font for each screen */
@ -640,6 +648,8 @@ struct user_settings
unsigned char colors_file[MAX_FILENAME+1];
#endif
int browser_default; /* Default browser when accessed from WPS */
/* playlist/playback settings */
int repeat_mode; /* 0=off 1=repeat all 2=repeat one 3=shuffle 4=ab */
int next_folder; /* move to next folder */

View file

@ -960,7 +960,6 @@ const struct settings_list settings[] = {
SYSTEM_STATUS(0, runtime, 0, "CRT"),
SYSTEM_STATUS(0, topruntime, 0, "TRT"),
SYSTEM_STATUS(0, last_screen, -1, "PVS"),
SYSTEM_STATUS(0, last_browser, 0, "BRS"),
/* sound settings */
CUSTOM_SETTING(F_NO_WRAP, volume_limit, LANG_VOLUME_LIMIT,
NULL, "volume limit",
@ -1990,6 +1989,25 @@ const struct settings_list settings[] = {
ID2P(LANG_SET_BOOL_YES),
ID2P(LANG_IN_SUBMENU)),
CHOICE_SETTING(0, browser_default, LANG_DEFAULT_BROWSER, 0,
"default browser",
#ifdef HAVE_TAGCACHE
"files,database,playlists",
#else
"files,playlists",
#endif
NULL,
#ifdef HAVE_TAGCACHE
3
#else
2
#endif
,ID2P(LANG_DIR_BROWSER),
#ifdef HAVE_TAGCACHE
ID2P(LANG_TAGCACHE),
#endif
ID2P(LANG_PLAYLISTS)),
#ifdef HAVE_BACKLIGHT
CHOICE_SETTING(0, backlight_on_button_hold,
LANG_BACKLIGHT_ON_BUTTON_HOLD,

View file

@ -252,6 +252,7 @@
tagcache\_ram & on, off & N/A\\
database path & path to a directory & N/A\\
database scan paths & one or more paths, each separated by a colon & N/A\\
default browser & files, database, playlists & N/A\\
\opt{touchpad}{
\opt{GIGABEAT_PAD}{

File diff suppressed because it is too large Load diff

View file

@ -2,6 +2,10 @@
\section{\label{ref:WPSSettings}What's Playing Screen}
\begin{description}
\item[Default Browser.]
Decide if you want the \setting{File Browser}, \setting{Database}, or
\setting{Playlists} to launch after pressing \ActionWpsBrowse{}
on the WPS, when no other browser has recently been used.
\opt{hotkey}{
\item[WPS Hotkey.] Sets the hotkey function for
the WPS (see \reference{ref:Hotkeys}). The