Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove 'USB Keypad Mode' from USB screen, and instead use 'Multimedia Mode',

Browse source 
'Presentation Mode', etc.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22911 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-10-04 05:57:11 +00:00
parent 8ec8fe5737
commit 753ca717b4
6 changed files with 55 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/lang/english.lang
View file

@ -12671,71 +12671,71 @@
</voice>
</phrase>
<phrase>
id: LANG_MULTIMEDIA
id: LANG_MULTIMEDIA_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Multimedia"
usb_hid: "Multimedia Mode"
</source>
<dest>
*: none
usb_hid: "Multimedia"
usb_hid: "Multimedia Mode"
</dest>
<voice>
*: none
usb_hid: "Multimedia"
usb_hid: "Multimedia Mode"
</voice>
</phrase>
<phrase>
id: LANG_PRESENTATION
id: LANG_PRESENTATION_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Presentation"
usb_hid: "Presentation Mode"
</source>
<dest>
*: none
usb_hid: "Presentation"
usb_hid: "Presentation Mode"
</dest>
<voice>
*: none
usb_hid: "Presentation"
usb_hid: "Presentation Mode"
</voice>
</phrase>
<phrase>
id: LANG_BROWSER
id: LANG_BROWSER_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Browser"
usb_hid: "Browser Mode"
</source>
<dest>
*: none
usb_hid: "Browser"
usb_hid: "Browser Mode"
</dest>
<voice>
*: none
usb_hid: "Browser"
usb_hid: "Browser Mode"
</voice>
</phrase>
<phrase>
id: LANG_MOUSE
id: LANG_MOUSE_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Mouse"
usb_hid: "Mouse Mode"
</source>
<dest>
*: none
usb_hid: "Mouse"
usb_hid: "Mouse Mode"
</dest>
<voice>
*: none
usb_hid: "Mouse"
usb_hid: "Mouse Mode"
</voice>
</phrase>
<phrase>

24
apps/lang/hebrew.lang
View file

@ -12602,7 +12602,7 @@
</voice>
</phrase>
<phrase>
id: LANG_MULTIMEDIA
id: LANG_MULTIMEDIA_MODE
desc: in settings_menu
user: core
<source>
@ -12611,15 +12611,15 @@
</source>
<dest>
*: none
usb_hid: "מולטימדיה"
usb_hid: "מצב מולטימדיה"
</dest>
<voice>
*: none
usb_hid: "מולטימדיה"
usb_hid: "מצב מולטימדיה"
</voice>
</phrase>
<phrase>
id: LANG_PRESENTATION
id: LANG_PRESENTATION_MODE
desc: in settings_menu
user: core
<source>
@ -12628,15 +12628,15 @@
</source>
<dest>
*: none
usb_hid: "מצגת"
usb_hid: "מצב מצגת"
</dest>
<voice>
*: none
usb_hid: "מצגת"
usb_hid: "מצב מצגת"
</voice>
</phrase>
<phrase>
id: LANG_BROWSER
id: LANG_BROWSER_MODE
desc: in settings_menu
user: core
<source>
@ -12645,15 +12645,15 @@
</source>
<dest>
*: none
usb_hid: "דפדפן"
usb_hid: "מצב דפדפן"
</dest>
<voice>
*: none
usb_hid: "דפדפן"
usb_hid: "מצב דפדפן"
</voice>
</phrase>
<phrase>
id: LANG_MOUSE
id: LANG_MOUSE_MODE
desc: in settings_menu
user: core
<source>
@ -12662,11 +12662,11 @@
</source>
<dest>
*: none
usb_hid: "עכבר"
usb_hid: "מצב עכבר"
</dest>
<voice>
*: none
usb_hid: "עכבר"
usb_hid: "מצב עכבר"
</voice>
</phrase>
<phrase>

32
apps/lang/italiano.lang
View file

@ -12600,71 +12600,71 @@
</voice>
</phrase>
<phrase>
id: LANG_MULTIMEDIA
id: LANG_MULTIMEDIA_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Multimedia"
usb_hid: "Multimedia Mode"
</source>
<dest>
*: none
usb_hid: "Multimedia"
usb_hid: "Modo Multimedia"
</dest>
<voice>
*: none
usb_hid: "Multimedia"
usb_hid: "Modo Multimedia"
</voice>
</phrase>
<phrase>
id: LANG_PRESENTATION
id: LANG_PRESENTATION_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Presentation"
usb_hid: "Presentation Mode"
</source>
<dest>
*: none
usb_hid: "Presentazione"
usb_hid: "Modo Presentazione"
</dest>
<voice>
*: none
usb_hid: "Presentazione"
usb_hid: "Modo Presentazione"
</voice>
</phrase>
<phrase>
id: LANG_BROWSER
id: LANG_BROWSER_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Browser"
usb_hid: "Browser Mode"
</source>
<dest>
*: none
usb_hid: "Sfoglia"
usb_hid: "Modo Sfoglia"
</dest>
<voice>
*: none
usb_hid: "Sfoglia"
usb_hid: "Modo Sfoglia"
</voice>
</phrase>
<phrase>
id: LANG_MOUSE
id: LANG_MOUSE_MODE
desc: in settings_menu
user: core
<source>
*: none
usb_hid: "Mouse"
usb_hid: "Mouse Mode"
</source>
<dest>
*: none
usb_hid: "Mouse"
usb_hid: "Modo Mouse"
</dest>
<voice>
*: none
usb_hid: "Mouse"
usb_hid: "Modo Mouse"
</voice>
</phrase>
<phrase>

14
apps/screens.c
View file

@ -200,22 +200,16 @@ void usb_screen(void)
(LCD_WIDTH-BMPWIDTH_usblogo),
(LCD_HEIGHT-BMPHEIGHT_usblogo)/2,
BMPWIDTH_usblogo, BMPHEIGHT_usblogo);
#ifdef USB_ENABLE_HID
char mode_name[MODE_NAME_LEN];
int y, w, h;
screens[i].getstringsize(str(LANG_USB_KEYPAD_MODE), &w, &h);
y = (LCD_HEIGHT - BMPHEIGHT_usblogo) / 2 + BMPHEIGHT_usblogo + h;
screens[i].putsxy((LCD_WIDTH - w) / 2, y,
str(LANG_USB_KEYPAD_MODE));
y += 3 * h / 2;
int w, h;
snprintf(mode_name, MODE_NAME_LEN, "%s",
str(keypad_mode_name_get()));
screens[i].getstringsize(mode_name, &w, &h);
screens[i].putsxy((LCD_WIDTH - w) / 2, y, mode_name);
screens[i].putsxy((LCD_WIDTH - w) / 2, BMPHEIGHT_usblogo +
(LCD_HEIGHT - BMPHEIGHT_usblogo + h) / 2, mode_name);
#endif /* HID */
#else /* HAVE_LCD_BITMAP */
screens[i].double_height(false);

5
apps/settings_list.c
View file

@ -1625,9 +1625,10 @@ const struct settings_list settings[] = {
#else
3,
#endif
ID2P(LANG_MULTIMEDIA), ID2P(LANG_PRESENTATION), ID2P(LANG_BROWSER)
ID2P(LANG_MULTIMEDIA_MODE), ID2P(LANG_PRESENTATION_MODE),
ID2P(LANG_BROWSER_MODE)
#ifdef HAVE_USB_HID_MOUSE
, ID2P(LANG_MOUSE)
, ID2P(LANG_MOUSE_MODE)
#endif
), /* CHOICE_SETTING( usb_keypad_mode ) */
#endif

8
apps/usb_keymaps.c
View file

@ -50,7 +50,7 @@ typedef struct
} hid_key_mapping_t;
static const hid_key_mapping_t hid_key_mapping_multimedia = {
LANG_MULTIMEDIA,
LANG_MULTIMEDIA_MODE,
HID_USAGE_PAGE_CONSUMER,
{
/* Volume up */
@ -72,7 +72,7 @@ static const hid_key_mapping_t hid_key_mapping_multimedia = {
};
static const hid_key_mapping_t hid_key_mapping_presentation = {
LANG_PRESENTATION,
LANG_PRESENTATION_MODE,
HID_USAGE_PAGE_KEYBOARD_KEYPAD,
{
/* Slideshow start */
@ -104,7 +104,7 @@ static const hid_key_mapping_t hid_key_mapping_presentation = {
};
static const hid_key_mapping_t hid_key_mapping_browser = {
LANG_BROWSER,
LANG_BROWSER_MODE,
HID_USAGE_PAGE_KEYBOARD_KEYPAD,
{
/* Scroll up */
@ -139,7 +139,7 @@ static const hid_key_mapping_t hid_key_mapping_browser = {
#ifdef HAVE_USB_HID_MOUSE
static const hid_key_mapping_t hid_key_mapping_mouse = {
LANG_MOUSE,
LANG_MOUSE_MODE,
HID_USAGE_PAGE_GENERIC_DESKTOP_CONTROLS,
{
/* Cursor move up */