i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keymap: Localize keyboard layout menu.

Browse Source 
and modify keyboard_layouts/Jamfile to remove "<keyboard-layout>"
from KeyboardLayoutNames.h.

Change-Id: Ibd68bfa165089e77cfeb6ade17f6135ac5608b46
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1719
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Murai Takashi
2019-08-17 16:07:37 +00:00
committed by waddlesplash
parent 472d26a3c0
commit 77fb9ca3e6
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/keyboard_layouts/Jamfile
+3 -3
View File
@@ -40,7 +40,7 @@ HAIKU_KEYBOARD_LAYOUT_FILES =
"Kinesis Advantage" "Kinesis Advantage"
"Kinesis Ergo Elan International" "Kinesis Ergo Elan International"
"TypeMatrix 2030" ; "TypeMatrix 2030" ;
HAIKU_KEYBOARD_LAYOUT_FILES = $(HAIKU_KEYBOARD_LAYOUT_FILES:G=keyboard-layout) ; HAIKU_KEYBOARD_LAYOUT_FILES = $(HAIKU_KEYBOARD_LAYOUT_FILES) ;
SEARCH on $(HAIKU_KEYBOARD_LAYOUT_FILES) = $(keyboardLayoutsDir) ; SEARCH on $(HAIKU_KEYBOARD_LAYOUT_FILES) = $(keyboardLayoutsDir) ;
# Add Apple Aluminum keyboard layout files to the image in an Apple Aluminum # Add Apple Aluminum keyboard layout files to the image in an Apple Aluminum
@@ -55,7 +55,7 @@ HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES =
"Apple Aluminum (US)" "Apple Aluminum (US)"
"Apple Aluminum Extended (US)" ; "Apple Aluminum Extended (US)" ;
HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES
= $(HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES:G=keyboard-layout) ; = $(HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES) ;
SEARCH on $(HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES) = $(appleAluminumDir) ; SEARCH on $(HAIKU_APPLE_ALUMINUM_KEYBOARD_LAYOUT_FILES) = $(appleAluminumDir) ;
# Add ThinkPad keyboard layout files to the image in a ThinkPad # Add ThinkPad keyboard layout files to the image in a ThinkPad
@@ -73,7 +73,7 @@ HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES =
"ThinkPad X100e (US)" "ThinkPad X100e (US)"
"ThinkPad X100e International" ; "ThinkPad X100e International" ;
HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES
= $(HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES:G=keyboard-layout) ; = $(HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES) ;
SEARCH on $(HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES) = $(thinkpadDir) ; SEARCH on $(HAIKU_THINKPAD_KEYBOARD_LAYOUT_FILES) = $(thinkpadDir) ;
src/preferences/keymap/KeymapWindow.cpp
+5 -3
View File
@@ -35,6 +35,7 @@
#include <StringView.h> #include <StringView.h>
#include <TextControl.h> #include <TextControl.h>
#include "KeyboardLayoutNames.h"
#include "KeyboardLayoutView.h" #include "KeyboardLayoutView.h"
#include "KeymapApplication.h" #include "KeymapApplication.h"
#include "KeymapListItem.h" #include "KeymapListItem.h"
@@ -666,7 +667,8 @@ KeymapWindow::_AddKeyboardLayoutMenu(BMenu* menu, BDirectory directory)
BDirectory subdirectory; BDirectory subdirectory;
subdirectory.SetTo(&ref); subdirectory.SetTo(&ref);
if (subdirectory.InitCheck() == B_OK) { if (subdirectory.InitCheck() == B_OK) {
BMenu* submenu = new BMenu(B_TRANSLATE_NOCOLLECT(ref.name)); BMenu* submenu = new BMenu(B_TRANSLATE_NOCOLLECT_ALL((ref.name),
"KeyboardLayoutNames", NULL));
_AddKeyboardLayoutMenu(submenu, subdirectory); _AddKeyboardLayoutMenu(submenu, subdirectory);
menu->AddItem(submenu, (int32)0); menu->AddItem(submenu, (int32)0);
@@ -674,8 +676,8 @@ KeymapWindow::_AddKeyboardLayoutMenu(BMenu* menu, BDirectory directory)
BMessage* message = new BMessage(kChangeKeyboardLayout); BMessage* message = new BMessage(kChangeKeyboardLayout);
message->AddRef("ref", &ref); message->AddRef("ref", &ref);
menu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(ref.name), menu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT_ALL((ref.name),
message), (int32)0); "KeyboardLayoutNames", NULL), message), (int32)0);
} }
} }
} }