len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-05-12 11:43:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: Move USB-related settings to their own submenu

Browse source 
Change-Id: Ic35025633f655138767e82bf4369e0626e91b4d4
This commit is contained in:
Vencislav Atanasov 2026-04-13 01:03:07 +03:00
parent a6a1be6e30
commit 719f0f1a3b
27 changed files with 939 additions and 573 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/lang/bulgarian.lang
View file

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

14
apps/lang/chinese-simp.lang
View file

@ -16953,3 +16953,17 @@
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>

14
apps/lang/deutsch.lang
View file

@ -16992,3 +16992,17 @@
*: "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>

14
apps/lang/english-us.lang
View file

@ -16970,3 +16970,17 @@
*: "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>

16
apps/lang/english.lang
View file

@ -12280,7 +12280,7 @@
</phrase>
<phrase>
id: LANG_USB_MODE
desc: in Settings -> General -> System -> USB Mode
desc: in Settings -> General -> System -> USB
user: core
<source>
*: "USB Mode"
@ -17043,3 +17043,17 @@
*: "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>

14
apps/lang/espanol.lang
View file

@ -16982,3 +16982,17 @@
*: "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>

14
apps/lang/francais.lang
View file

@ -16953,3 +16953,17 @@
*: "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>

14
apps/lang/italiano.lang
View file

@ -16974,3 +16974,17 @@
*: "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>

14
apps/lang/japanese.lang
View file

@ -16514,3 +16514,17 @@
*: "プレイリストは終了しました。もう一度再生しますか？"
</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>

14
apps/lang/korean.lang
View file

@ -16988,3 +16988,17 @@
*: "항상 마지막 폴더 기억"
</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>

14
apps/lang/latviesu.lang
View file

@ -16959,3 +16959,17 @@
*: "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>

14
apps/lang/magyar.lang
View file

@ -16962,3 +16962,17 @@
*: "Á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>

14
apps/lang/moldoveneste.lang
View file

@ -16979,3 +16979,17 @@
*: "Ț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>

14
apps/lang/nederlands.lang
View file

@ -16954,3 +16954,17 @@
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>

14
apps/lang/norsk-nynorsk.lang
View file

@ -16978,3 +16978,17 @@
*: "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>

14
apps/lang/polski.lang
View file

@ -16980,3 +16980,17 @@
*: "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>

14
apps/lang/portugues-brasileiro.lang
View file

@ -16983,3 +16983,17 @@
*: "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>

14
apps/lang/romaneste.lang
View file

@ -16979,3 +16979,17 @@
*: "Ț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>

14
apps/lang/russian.lang
View file

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

14
apps/lang/slovak.lang
View file

@ -16974,3 +16974,17 @@
*: "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>

14
apps/lang/srpski.lang
View file

@ -16958,3 +16958,17 @@
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>

14
apps/lang/svenska.lang
View file

@ -16953,3 +16953,17 @@
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>

14
apps/lang/turkce.lang
View file

@ -16975,3 +16975,17 @@
*: "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>

14
apps/lang/ukrainian.lang
View file

@ -16945,3 +16945,17 @@
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>

14
apps/lang/vietnamese.lang
View file

@ -16958,3 +16958,17 @@
*: "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>

40
apps/menus/settings_menu.c
View file

@ -59,6 +59,10 @@
#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,
@ -271,7 +275,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
&usb_charging,
#endif
);
#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
#ifdef HAVE_USB_MODE
MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL);
#endif
#if defined(HAVE_GENERAL_PURPOSE_LED)
@ -411,6 +415,22 @@ 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)
@ -458,23 +478,15 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
#ifndef HAS_BUTTON_HOLD
&sel_softlock,
#endif
#ifdef USB_ENABLE_HID
&usb_hid,
&usb_keypad_mode,
#if defined(USB_ENABLE_HID) || \
defined(USB_ENABLE_AUDIO) || \
(defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)) || \
defined(HAVE_USB_MODE)
&usb_menu,
#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

1120
manual/configure_rockbox/system_options.tex
View file

File diff suppressed because it is too large Load diff