From d4f12f2630d41b0dc534c0d3d0d8ae7b3881c680 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 11 Aug 2010 20:39:34 +0300 Subject: EXT-8425 FIXED Translated names of "Home" and "Esc" keys shown in shortcuts. Each key has KEY (typedef of U8) represantation which is paired with text version of key. To get strings corresponding to keys LLKeyboard::stringFromKey() is used. - Added translation of keys into LLKeyboard::stringFromKey(). - Added corresponding strings into strings.xml. - Changed LLTrans::getKeyboardString() so that it correctly process key names that are not found in strings.xml(returns English name instead of "MissingString"). Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/845/ --HG-- branch : product-engine --- indra/llwindow/llkeyboard.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 16cbf815e0..8f26f980d1 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -343,6 +343,13 @@ std::string LLKeyboard::stringFromKey(KEY key) buffer[1] = '\0'; res = std::string(buffer); } + + LLKeyStringTranslatorFunc *trans = gKeyboard->mStringTranslator; + if (trans != NULL) + { + res = trans(res.c_str()); + } + return res; } -- cgit v1.2.3 From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 Sep 2010 13:26:52 -0400 Subject: Fix for build failures - disabling tcmalloc for now --- indra/llwindow/CMakeLists.txt | 0 indra/llwindow/GL/glh_extensions.h | 0 indra/llwindow/GL/glh_genext.h | 0 indra/llwindow/lldragdropwin32.cpp | 0 indra/llwindow/lldragdropwin32.h | 0 indra/llwindow/lldxhardware.cpp | 0 indra/llwindow/lldxhardware.h | 0 indra/llwindow/llkeyboard.cpp | 0 indra/llwindow/llkeyboard.h | 0 indra/llwindow/llkeyboardmacosx.cpp | 0 indra/llwindow/llkeyboardmacosx.h | 0 indra/llwindow/llkeyboardsdl.cpp | 0 indra/llwindow/llkeyboardsdl.h | 0 indra/llwindow/llkeyboardwin32.cpp | 0 indra/llwindow/llkeyboardwin32.h | 0 indra/llwindow/llmousehandler.cpp | 0 indra/llwindow/llmousehandler.h | 0 indra/llwindow/llpreeditor.h | 0 indra/llwindow/llwindow.cpp | 0 indra/llwindow/llwindow.h | 0 indra/llwindow/llwindowcallbacks.cpp | 0 indra/llwindow/llwindowcallbacks.h | 0 indra/llwindow/llwindowheadless.cpp | 0 indra/llwindow/llwindowheadless.h | 0 indra/llwindow/llwindowmacosx-objc.h | 0 indra/llwindow/llwindowmacosx-objc.mm | 0 indra/llwindow/llwindowmacosx.cpp | 0 indra/llwindow/llwindowmacosx.h | 0 indra/llwindow/llwindowmesaheadless.cpp | 0 indra/llwindow/llwindowmesaheadless.h | 0 indra/llwindow/llwindowsdl.cpp | 0 indra/llwindow/llwindowsdl.h | 0 indra/llwindow/llwindowwin32.cpp | 0 indra/llwindow/llwindowwin32.h | 0 34 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/llwindow/CMakeLists.txt mode change 100644 => 100755 indra/llwindow/GL/glh_extensions.h mode change 100644 => 100755 indra/llwindow/GL/glh_genext.h mode change 100644 => 100755 indra/llwindow/lldragdropwin32.cpp mode change 100644 => 100755 indra/llwindow/lldragdropwin32.h mode change 100644 => 100755 indra/llwindow/lldxhardware.cpp mode change 100644 => 100755 indra/llwindow/lldxhardware.h mode change 100644 => 100755 indra/llwindow/llkeyboard.cpp mode change 100644 => 100755 indra/llwindow/llkeyboard.h mode change 100644 => 100755 indra/llwindow/llkeyboardmacosx.cpp mode change 100644 => 100755 indra/llwindow/llkeyboardmacosx.h mode change 100644 => 100755 indra/llwindow/llkeyboardsdl.cpp mode change 100644 => 100755 indra/llwindow/llkeyboardsdl.h mode change 100644 => 100755 indra/llwindow/llkeyboardwin32.cpp mode change 100644 => 100755 indra/llwindow/llkeyboardwin32.h mode change 100644 => 100755 indra/llwindow/llmousehandler.cpp mode change 100644 => 100755 indra/llwindow/llmousehandler.h mode change 100644 => 100755 indra/llwindow/llpreeditor.h mode change 100644 => 100755 indra/llwindow/llwindow.cpp mode change 100644 => 100755 indra/llwindow/llwindow.h mode change 100644 => 100755 indra/llwindow/llwindowcallbacks.cpp mode change 100644 => 100755 indra/llwindow/llwindowcallbacks.h mode change 100644 => 100755 indra/llwindow/llwindowheadless.cpp mode change 100644 => 100755 indra/llwindow/llwindowheadless.h mode change 100644 => 100755 indra/llwindow/llwindowmacosx-objc.h mode change 100644 => 100755 indra/llwindow/llwindowmacosx-objc.mm mode change 100644 => 100755 indra/llwindow/llwindowmacosx.cpp mode change 100644 => 100755 indra/llwindow/llwindowmacosx.h mode change 100644 => 100755 indra/llwindow/llwindowmesaheadless.cpp mode change 100644 => 100755 indra/llwindow/llwindowmesaheadless.h mode change 100644 => 100755 indra/llwindow/llwindowsdl.cpp mode change 100644 => 100755 indra/llwindow/llwindowsdl.h mode change 100644 => 100755 indra/llwindow/llwindowwin32.cpp mode change 100644 => 100755 indra/llwindow/llwindowwin32.h (limited to 'indra/llwindow') diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/indra/llwindow/GL/glh_extensions.h b/indra/llwindow/GL/glh_extensions.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/GL/glh_genext.h b/indra/llwindow/GL/glh_genext.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/lldragdropwin32.cpp b/indra/llwindow/lldragdropwin32.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/lldragdropwin32.h b/indra/llwindow/lldragdropwin32.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboardmacosx.cpp b/indra/llwindow/llkeyboardmacosx.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboardmacosx.h b/indra/llwindow/llkeyboardmacosx.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboardsdl.h b/indra/llwindow/llkeyboardsdl.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llkeyboardwin32.h b/indra/llwindow/llkeyboardwin32.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llmousehandler.cpp b/indra/llwindow/llmousehandler.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llmousehandler.h b/indra/llwindow/llmousehandler.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llpreeditor.h b/indra/llwindow/llpreeditor.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowmesaheadless.cpp b/indra/llwindow/llwindowmesaheadless.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowmesaheadless.h b/indra/llwindow/llwindowmesaheadless.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp old mode 100644 new mode 100755 diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h old mode 100644 new mode 100755 -- cgit v1.2.3