summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/lang/english.lang32
-rw-r--r--apps/lang/hebrew.lang24
-rw-r--r--apps/lang/italiano.lang32
-rw-r--r--apps/screens.c14
-rw-r--r--apps/settings_list.c5
-rw-r--r--apps/usb_keymaps.c8
6 files changed, 55 insertions, 60 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 196971fd0d..8be7380225 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -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>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index a6788cf6f9..76deb4d007 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -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>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 04c0cfa9c7..ef357e816b 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -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>
diff --git a/apps/screens.c b/apps/screens.c
index 5981e91811..66e42290c1 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -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);
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 769664eee3..62a9351782 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -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
diff --git a/apps/usb_keymaps.c b/apps/usb_keymaps.c
index 466cf6f9e8..23f7333a64 100644
--- a/apps/usb_keymaps.c
+++ b/apps/usb_keymaps.c
@@ -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 */