hrev53382 adds 1 changeset to branch 'master'
old head: 472d26a3c0a3f0af2932079147a0a273bcf18f7b
new head: 77fb9ca3e653f72d1d15c9f1a50c3d4287f680e0
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=77fb9ca3e653+%5E472d26a3c0a3
----------------------------------------------------------------------------
77fb9ca3e653: Keymap: Localize keyboard layout menu.
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 <pulkomandy@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53382
Commit: 77fb9ca3e653f72d1d15c9f1a50c3d4287f680e0
URL: https://git.haiku-os.org/haiku/commit/?id=77fb9ca3e653
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Wed Aug 14 07:59:07 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Aug 17 16:07:37 2019 UTC
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 6 deletions(-)
src/data/keyboard_layouts/Jamfile | 6 +++---
src/preferences/keymap/KeymapWindow.cpp | 8 +++++---
----------------------------------------------------------------------------
diff --git a/src/data/keyboard_layouts/Jamfile
b/src/data/keyboard_layouts/Jamfile
index 2013fefefa..acc75ffd32 100644
--- a/src/data/keyboard_layouts/Jamfile
+++ b/src/data/keyboard_layouts/Jamfile
@@ -40,7 +40,7 @@ HAIKU_KEYBOARD_LAYOUT_FILES =
"Kinesis Advantage"
"Kinesis Ergo Elan International"
"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) ;
# 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 Extended (US)" ;
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) ;
# 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 International" ;
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) ;
diff --git a/src/preferences/keymap/KeymapWindow.cpp
b/src/preferences/keymap/KeymapWindow.cpp
index c03d75609b..16cef4b6f7 100644
--- a/src/preferences/keymap/KeymapWindow.cpp
+++ b/src/preferences/keymap/KeymapWindow.cpp
@@ -35,6 +35,7 @@
#include <StringView.h>
#include <TextControl.h>
+#include "KeyboardLayoutNames.h"
#include "KeyboardLayoutView.h"
#include "KeymapApplication.h"
#include "KeymapListItem.h"
@@ -666,7 +667,8 @@ KeymapWindow::_AddKeyboardLayoutMenu(BMenu* menu,
BDirectory directory)
BDirectory subdirectory;
subdirectory.SetTo(&ref);
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);
menu->AddItem(submenu, (int32)0);
@@ -674,8 +676,8 @@ KeymapWindow::_AddKeyboardLayoutMenu(BMenu* menu,
BDirectory directory)
BMessage* message = new BMessage(kChangeKeyboardLayout);
message->AddRef("ref", &ref);
- menu->AddItem(new
BMenuItem(B_TRANSLATE_NOCOLLECT(ref.name),
- message), (int32)0);
+ menu->AddItem(new
BMenuItem(B_TRANSLATE_NOCOLLECT_ALL((ref.name),
+ "KeyboardLayoutNames", NULL), message),
(int32)0);
}
}
}
