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

Localize keyboard layout names in Keymap preferences

Browse Source
This commit is contained in:
John Scipione
2014-02-21 20:05:26 -05:00
parent 4e152efced
commit 5e96d7d537
6 changed files with 97 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/Jamfile
+4
View File
@@ -1,12 +1,16 @@
SubDir HAIKU_TOP src preferences keymap ;
UseHeaders [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) data keymaps ] ;
UseHeaders [ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) data
keyboard_layouts ] ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders interface shared ;
Includes [ FGristFiles KeymapWindow.cpp ] : <keymap-locale>KeymapNames.h ;
Includes [ FGristFiles KeymapWindow.cpp ]
: <keyboard-layout-locale>KeyboardLayoutNames.h ;
Preference Keymap :
KeyboardLayout.cpp
src/preferences/keymap/KeymapWindow.cpp
+5 -3
View File
@@ -616,7 +616,8 @@ KeymapWindow::_AddKeyboardLayouts(BMenu* menu)
if (find_directory(dataDirectories[i], &path) != B_OK)
continue;
path.Append("KeyboardLayouts");
if (path.Append("KeyboardLayouts") != B_OK)
continue;
BDirectory directory;
if (directory.SetTo(path.Path()) == B_OK)
@@ -641,7 +642,7 @@ KeymapWindow::_AddKeyboardLayoutMenu(BMenu* menu, BDirectory directory)
BDirectory subdirectory;
subdirectory.SetTo(&ref);
if (subdirectory.InitCheck() == B_OK) {
BMenu* submenu = new BMenu(ref.name);
BMenu* submenu = new BMenu(B_TRANSLATE_NOCOLLECT(ref.name));
_AddKeyboardLayoutMenu(submenu, subdirectory);
menu->AddItem(submenu);
@@ -649,7 +650,8 @@ KeymapWindow::_AddKeyboardLayoutMenu(BMenu* menu, BDirectory directory)
BMessage* message = new BMessage(kChangeKeyboardLayout);
message->AddRef("ref", &ref);
menu->AddItem(new BMenuItem(ref.name, message));
menu->AddItem(new BMenuItem(B_TRANSLATE_NOCOLLECT(ref.name),
message));
}
}
}