diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-10-04 05:57:11 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-10-04 05:57:11 +0000 |
commit | 753ca717b4625e326ccf10ee574079e24bedd06b (patch) | |
tree | fa48d99fb28ec57a5f282aabc60ca116aac77975 | |
parent | 8ec8fe573730f1180ece211a7633d34024f94467 (diff) | |
download | rockbox-753ca717b4625e326ccf10ee574079e24bedd06b.tar.gz rockbox-753ca717b4625e326ccf10ee574079e24bedd06b.zip |
Remove 'USB Keypad Mode' from USB screen, and instead use 'Multimedia Mode',
'Presentation Mode', etc.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22911 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 32 | ||||
-rw-r--r-- | apps/lang/hebrew.lang | 24 | ||||
-rw-r--r-- | apps/lang/italiano.lang | 32 | ||||
-rw-r--r-- | apps/screens.c | 14 | ||||
-rw-r--r-- | apps/settings_list.c | 5 | ||||
-rw-r--r-- | apps/usb_keymaps.c | 8 |
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 @@ | |||
12671 | </voice> | 12671 | </voice> |
12672 | </phrase> | 12672 | </phrase> |
12673 | <phrase> | 12673 | <phrase> |
12674 | id: LANG_MULTIMEDIA | 12674 | id: LANG_MULTIMEDIA_MODE |
12675 | desc: in settings_menu | 12675 | desc: in settings_menu |
12676 | user: core | 12676 | user: core |
12677 | <source> | 12677 | <source> |
12678 | *: none | 12678 | *: none |
12679 | usb_hid: "Multimedia" | 12679 | usb_hid: "Multimedia Mode" |
12680 | </source> | 12680 | </source> |
12681 | <dest> | 12681 | <dest> |
12682 | *: none | 12682 | *: none |
12683 | usb_hid: "Multimedia" | 12683 | usb_hid: "Multimedia Mode" |
12684 | </dest> | 12684 | </dest> |
12685 | <voice> | 12685 | <voice> |
12686 | *: none | 12686 | *: none |
12687 | usb_hid: "Multimedia" | 12687 | usb_hid: "Multimedia Mode" |
12688 | </voice> | 12688 | </voice> |
12689 | </phrase> | 12689 | </phrase> |
12690 | <phrase> | 12690 | <phrase> |
12691 | id: LANG_PRESENTATION | 12691 | id: LANG_PRESENTATION_MODE |
12692 | desc: in settings_menu | 12692 | desc: in settings_menu |
12693 | user: core | 12693 | user: core |
12694 | <source> | 12694 | <source> |
12695 | *: none | 12695 | *: none |
12696 | usb_hid: "Presentation" | 12696 | usb_hid: "Presentation Mode" |
12697 | </source> | 12697 | </source> |
12698 | <dest> | 12698 | <dest> |
12699 | *: none | 12699 | *: none |
12700 | usb_hid: "Presentation" | 12700 | usb_hid: "Presentation Mode" |
12701 | </dest> | 12701 | </dest> |
12702 | <voice> | 12702 | <voice> |
12703 | *: none | 12703 | *: none |
12704 | usb_hid: "Presentation" | 12704 | usb_hid: "Presentation Mode" |
12705 | </voice> | 12705 | </voice> |
12706 | </phrase> | 12706 | </phrase> |
12707 | <phrase> | 12707 | <phrase> |
12708 | id: LANG_BROWSER | 12708 | id: LANG_BROWSER_MODE |
12709 | desc: in settings_menu | 12709 | desc: in settings_menu |
12710 | user: core | 12710 | user: core |
12711 | <source> | 12711 | <source> |
12712 | *: none | 12712 | *: none |
12713 | usb_hid: "Browser" | 12713 | usb_hid: "Browser Mode" |
12714 | </source> | 12714 | </source> |
12715 | <dest> | 12715 | <dest> |
12716 | *: none | 12716 | *: none |
12717 | usb_hid: "Browser" | 12717 | usb_hid: "Browser Mode" |
12718 | </dest> | 12718 | </dest> |
12719 | <voice> | 12719 | <voice> |
12720 | *: none | 12720 | *: none |
12721 | usb_hid: "Browser" | 12721 | usb_hid: "Browser Mode" |
12722 | </voice> | 12722 | </voice> |
12723 | </phrase> | 12723 | </phrase> |
12724 | <phrase> | 12724 | <phrase> |
12725 | id: LANG_MOUSE | 12725 | id: LANG_MOUSE_MODE |
12726 | desc: in settings_menu | 12726 | desc: in settings_menu |
12727 | user: core | 12727 | user: core |
12728 | <source> | 12728 | <source> |
12729 | *: none | 12729 | *: none |
12730 | usb_hid: "Mouse" | 12730 | usb_hid: "Mouse Mode" |
12731 | </source> | 12731 | </source> |
12732 | <dest> | 12732 | <dest> |
12733 | *: none | 12733 | *: none |
12734 | usb_hid: "Mouse" | 12734 | usb_hid: "Mouse Mode" |
12735 | </dest> | 12735 | </dest> |
12736 | <voice> | 12736 | <voice> |
12737 | *: none | 12737 | *: none |
12738 | usb_hid: "Mouse" | 12738 | usb_hid: "Mouse Mode" |
12739 | </voice> | 12739 | </voice> |
12740 | </phrase> | 12740 | </phrase> |
12741 | <phrase> | 12741 | <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 @@ | |||
12602 | </voice> | 12602 | </voice> |
12603 | </phrase> | 12603 | </phrase> |
12604 | <phrase> | 12604 | <phrase> |
12605 | id: LANG_MULTIMEDIA | 12605 | id: LANG_MULTIMEDIA_MODE |
12606 | desc: in settings_menu | 12606 | desc: in settings_menu |
12607 | user: core | 12607 | user: core |
12608 | <source> | 12608 | <source> |
@@ -12611,15 +12611,15 @@ | |||
12611 | </source> | 12611 | </source> |
12612 | <dest> | 12612 | <dest> |
12613 | *: none | 12613 | *: none |
12614 | usb_hid: "מולטימדיה" | 12614 | usb_hid: "מצב מולטימדיה" |
12615 | </dest> | 12615 | </dest> |
12616 | <voice> | 12616 | <voice> |
12617 | *: none | 12617 | *: none |
12618 | usb_hid: "מולטימדיה" | 12618 | usb_hid: "מצב מולטימדיה" |
12619 | </voice> | 12619 | </voice> |
12620 | </phrase> | 12620 | </phrase> |
12621 | <phrase> | 12621 | <phrase> |
12622 | id: LANG_PRESENTATION | 12622 | id: LANG_PRESENTATION_MODE |
12623 | desc: in settings_menu | 12623 | desc: in settings_menu |
12624 | user: core | 12624 | user: core |
12625 | <source> | 12625 | <source> |
@@ -12628,15 +12628,15 @@ | |||
12628 | </source> | 12628 | </source> |
12629 | <dest> | 12629 | <dest> |
12630 | *: none | 12630 | *: none |
12631 | usb_hid: "מצגת" | 12631 | usb_hid: "מצב מצגת" |
12632 | </dest> | 12632 | </dest> |
12633 | <voice> | 12633 | <voice> |
12634 | *: none | 12634 | *: none |
12635 | usb_hid: "מצגת" | 12635 | usb_hid: "מצב מצגת" |
12636 | </voice> | 12636 | </voice> |
12637 | </phrase> | 12637 | </phrase> |
12638 | <phrase> | 12638 | <phrase> |
12639 | id: LANG_BROWSER | 12639 | id: LANG_BROWSER_MODE |
12640 | desc: in settings_menu | 12640 | desc: in settings_menu |
12641 | user: core | 12641 | user: core |
12642 | <source> | 12642 | <source> |
@@ -12645,15 +12645,15 @@ | |||
12645 | </source> | 12645 | </source> |
12646 | <dest> | 12646 | <dest> |
12647 | *: none | 12647 | *: none |
12648 | usb_hid: "דפדפן" | 12648 | usb_hid: "מצב דפדפן" |
12649 | </dest> | 12649 | </dest> |
12650 | <voice> | 12650 | <voice> |
12651 | *: none | 12651 | *: none |
12652 | usb_hid: "דפדפן" | 12652 | usb_hid: "מצב דפדפן" |
12653 | </voice> | 12653 | </voice> |
12654 | </phrase> | 12654 | </phrase> |
12655 | <phrase> | 12655 | <phrase> |
12656 | id: LANG_MOUSE | 12656 | id: LANG_MOUSE_MODE |
12657 | desc: in settings_menu | 12657 | desc: in settings_menu |
12658 | user: core | 12658 | user: core |
12659 | <source> | 12659 | <source> |
@@ -12662,11 +12662,11 @@ | |||
12662 | </source> | 12662 | </source> |
12663 | <dest> | 12663 | <dest> |
12664 | *: none | 12664 | *: none |
12665 | usb_hid: "עכבר" | 12665 | usb_hid: "מצב עכבר" |
12666 | </dest> | 12666 | </dest> |
12667 | <voice> | 12667 | <voice> |
12668 | *: none | 12668 | *: none |
12669 | usb_hid: "עכבר" | 12669 | usb_hid: "מצב עכבר" |
12670 | </voice> | 12670 | </voice> |
12671 | </phrase> | 12671 | </phrase> |
12672 | <phrase> | 12672 | <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 @@ | |||
12600 | </voice> | 12600 | </voice> |
12601 | </phrase> | 12601 | </phrase> |
12602 | <phrase> | 12602 | <phrase> |
12603 | id: LANG_MULTIMEDIA | 12603 | id: LANG_MULTIMEDIA_MODE |
12604 | desc: in settings_menu | 12604 | desc: in settings_menu |
12605 | user: core | 12605 | user: core |
12606 | <source> | 12606 | <source> |
12607 | *: none | 12607 | *: none |
12608 | usb_hid: "Multimedia" | 12608 | usb_hid: "Multimedia Mode" |
12609 | </source> | 12609 | </source> |
12610 | <dest> | 12610 | <dest> |
12611 | *: none | 12611 | *: none |
12612 | usb_hid: "Multimedia" | 12612 | usb_hid: "Modo Multimedia" |
12613 | </dest> | 12613 | </dest> |
12614 | <voice> | 12614 | <voice> |
12615 | *: none | 12615 | *: none |
12616 | usb_hid: "Multimedia" | 12616 | usb_hid: "Modo Multimedia" |
12617 | </voice> | 12617 | </voice> |
12618 | </phrase> | 12618 | </phrase> |
12619 | <phrase> | 12619 | <phrase> |
12620 | id: LANG_PRESENTATION | 12620 | id: LANG_PRESENTATION_MODE |
12621 | desc: in settings_menu | 12621 | desc: in settings_menu |
12622 | user: core | 12622 | user: core |
12623 | <source> | 12623 | <source> |
12624 | *: none | 12624 | *: none |
12625 | usb_hid: "Presentation" | 12625 | usb_hid: "Presentation Mode" |
12626 | </source> | 12626 | </source> |
12627 | <dest> | 12627 | <dest> |
12628 | *: none | 12628 | *: none |
12629 | usb_hid: "Presentazione" | 12629 | usb_hid: "Modo Presentazione" |
12630 | </dest> | 12630 | </dest> |
12631 | <voice> | 12631 | <voice> |
12632 | *: none | 12632 | *: none |
12633 | usb_hid: "Presentazione" | 12633 | usb_hid: "Modo Presentazione" |
12634 | </voice> | 12634 | </voice> |
12635 | </phrase> | 12635 | </phrase> |
12636 | <phrase> | 12636 | <phrase> |
12637 | id: LANG_BROWSER | 12637 | id: LANG_BROWSER_MODE |
12638 | desc: in settings_menu | 12638 | desc: in settings_menu |
12639 | user: core | 12639 | user: core |
12640 | <source> | 12640 | <source> |
12641 | *: none | 12641 | *: none |
12642 | usb_hid: "Browser" | 12642 | usb_hid: "Browser Mode" |
12643 | </source> | 12643 | </source> |
12644 | <dest> | 12644 | <dest> |
12645 | *: none | 12645 | *: none |
12646 | usb_hid: "Sfoglia" | 12646 | usb_hid: "Modo Sfoglia" |
12647 | </dest> | 12647 | </dest> |
12648 | <voice> | 12648 | <voice> |
12649 | *: none | 12649 | *: none |
12650 | usb_hid: "Sfoglia" | 12650 | usb_hid: "Modo Sfoglia" |
12651 | </voice> | 12651 | </voice> |
12652 | </phrase> | 12652 | </phrase> |
12653 | <phrase> | 12653 | <phrase> |
12654 | id: LANG_MOUSE | 12654 | id: LANG_MOUSE_MODE |
12655 | desc: in settings_menu | 12655 | desc: in settings_menu |
12656 | user: core | 12656 | user: core |
12657 | <source> | 12657 | <source> |
12658 | *: none | 12658 | *: none |
12659 | usb_hid: "Mouse" | 12659 | usb_hid: "Mouse Mode" |
12660 | </source> | 12660 | </source> |
12661 | <dest> | 12661 | <dest> |
12662 | *: none | 12662 | *: none |
12663 | usb_hid: "Mouse" | 12663 | usb_hid: "Modo Mouse" |
12664 | </dest> | 12664 | </dest> |
12665 | <voice> | 12665 | <voice> |
12666 | *: none | 12666 | *: none |
12667 | usb_hid: "Mouse" | 12667 | usb_hid: "Modo Mouse" |
12668 | </voice> | 12668 | </voice> |
12669 | </phrase> | 12669 | </phrase> |
12670 | <phrase> | 12670 | <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) | |||
200 | (LCD_WIDTH-BMPWIDTH_usblogo), | 200 | (LCD_WIDTH-BMPWIDTH_usblogo), |
201 | (LCD_HEIGHT-BMPHEIGHT_usblogo)/2, | 201 | (LCD_HEIGHT-BMPHEIGHT_usblogo)/2, |
202 | BMPWIDTH_usblogo, BMPHEIGHT_usblogo); | 202 | BMPWIDTH_usblogo, BMPHEIGHT_usblogo); |
203 | |||
204 | #ifdef USB_ENABLE_HID | 203 | #ifdef USB_ENABLE_HID |
205 | char mode_name[MODE_NAME_LEN]; | 204 | char mode_name[MODE_NAME_LEN]; |
206 | int y, w, h; | 205 | int w, h; |
207 | |||
208 | screens[i].getstringsize(str(LANG_USB_KEYPAD_MODE), &w, &h); | ||
209 | |||
210 | y = (LCD_HEIGHT - BMPHEIGHT_usblogo) / 2 + BMPHEIGHT_usblogo + h; | ||
211 | screens[i].putsxy((LCD_WIDTH - w) / 2, y, | ||
212 | str(LANG_USB_KEYPAD_MODE)); | ||
213 | y += 3 * h / 2; | ||
214 | 206 | ||
215 | snprintf(mode_name, MODE_NAME_LEN, "%s", | 207 | snprintf(mode_name, MODE_NAME_LEN, "%s", |
216 | str(keypad_mode_name_get())); | 208 | str(keypad_mode_name_get())); |
209 | |||
217 | screens[i].getstringsize(mode_name, &w, &h); | 210 | screens[i].getstringsize(mode_name, &w, &h); |
218 | screens[i].putsxy((LCD_WIDTH - w) / 2, y, mode_name); | 211 | screens[i].putsxy((LCD_WIDTH - w) / 2, BMPHEIGHT_usblogo + |
212 | (LCD_HEIGHT - BMPHEIGHT_usblogo + h) / 2, mode_name); | ||
219 | #endif /* HID */ | 213 | #endif /* HID */ |
220 | #else /* HAVE_LCD_BITMAP */ | 214 | #else /* HAVE_LCD_BITMAP */ |
221 | screens[i].double_height(false); | 215 | 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[] = { | |||
1625 | #else | 1625 | #else |
1626 | 3, | 1626 | 3, |
1627 | #endif | 1627 | #endif |
1628 | ID2P(LANG_MULTIMEDIA), ID2P(LANG_PRESENTATION), ID2P(LANG_BROWSER) | 1628 | ID2P(LANG_MULTIMEDIA_MODE), ID2P(LANG_PRESENTATION_MODE), |
1629 | ID2P(LANG_BROWSER_MODE) | ||
1629 | #ifdef HAVE_USB_HID_MOUSE | 1630 | #ifdef HAVE_USB_HID_MOUSE |
1630 | , ID2P(LANG_MOUSE) | 1631 | , ID2P(LANG_MOUSE_MODE) |
1631 | #endif | 1632 | #endif |
1632 | ), /* CHOICE_SETTING( usb_keypad_mode ) */ | 1633 | ), /* CHOICE_SETTING( usb_keypad_mode ) */ |
1633 | #endif | 1634 | #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 | |||
50 | } hid_key_mapping_t; | 50 | } hid_key_mapping_t; |
51 | 51 | ||
52 | static const hid_key_mapping_t hid_key_mapping_multimedia = { | 52 | static const hid_key_mapping_t hid_key_mapping_multimedia = { |
53 | LANG_MULTIMEDIA, | 53 | LANG_MULTIMEDIA_MODE, |
54 | HID_USAGE_PAGE_CONSUMER, | 54 | HID_USAGE_PAGE_CONSUMER, |
55 | { | 55 | { |
56 | /* Volume up */ | 56 | /* Volume up */ |
@@ -72,7 +72,7 @@ static const hid_key_mapping_t hid_key_mapping_multimedia = { | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | static const hid_key_mapping_t hid_key_mapping_presentation = { | 74 | static const hid_key_mapping_t hid_key_mapping_presentation = { |
75 | LANG_PRESENTATION, | 75 | LANG_PRESENTATION_MODE, |
76 | HID_USAGE_PAGE_KEYBOARD_KEYPAD, | 76 | HID_USAGE_PAGE_KEYBOARD_KEYPAD, |
77 | { | 77 | { |
78 | /* Slideshow start */ | 78 | /* Slideshow start */ |
@@ -104,7 +104,7 @@ static const hid_key_mapping_t hid_key_mapping_presentation = { | |||
104 | }; | 104 | }; |
105 | 105 | ||
106 | static const hid_key_mapping_t hid_key_mapping_browser = { | 106 | static const hid_key_mapping_t hid_key_mapping_browser = { |
107 | LANG_BROWSER, | 107 | LANG_BROWSER_MODE, |
108 | HID_USAGE_PAGE_KEYBOARD_KEYPAD, | 108 | HID_USAGE_PAGE_KEYBOARD_KEYPAD, |
109 | { | 109 | { |
110 | /* Scroll up */ | 110 | /* Scroll up */ |
@@ -139,7 +139,7 @@ static const hid_key_mapping_t hid_key_mapping_browser = { | |||
139 | 139 | ||
140 | #ifdef HAVE_USB_HID_MOUSE | 140 | #ifdef HAVE_USB_HID_MOUSE |
141 | static const hid_key_mapping_t hid_key_mapping_mouse = { | 141 | static const hid_key_mapping_t hid_key_mapping_mouse = { |
142 | LANG_MOUSE, | 142 | LANG_MOUSE_MODE, |
143 | HID_USAGE_PAGE_GENERIC_DESKTOP_CONTROLS, | 143 | HID_USAGE_PAGE_GENERIC_DESKTOP_CONTROLS, |
144 | { | 144 | { |
145 | /* Cursor move up */ | 145 | /* Cursor move up */ |