Skip to content
Snippets Groups Projects
Commit 10541660 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-15107 Fix some typos in llsetkeybinddialog

parent 4bab66a4
No related branches found
No related tags found
No related merge requests found
...@@ -96,7 +96,7 @@ BOOL LLSetKeyBindDialog::postBuild() ...@@ -96,7 +96,7 @@ BOOL LLSetKeyBindDialog::postBuild()
getChild<LLUICtrl>("Cancel")->setFocus(TRUE); getChild<LLUICtrl>("Cancel")->setFocus(TRUE);
pCheckBox = getChild<LLCheckBoxCtrl>("apply_all"); pCheckBox = getChild<LLCheckBoxCtrl>("apply_all");
pDesription = getChild<LLTextBase>("descritption"); pDescription = getChild<LLTextBase>("description");
gFocusMgr.setKeystrokesOnly(TRUE); gFocusMgr.setKeystrokesOnly(TRUE);
...@@ -160,8 +160,8 @@ void LLSetKeyBindDialog::setParent(LLKeyBindResponderInterface* parent, LLView* ...@@ -160,8 +160,8 @@ void LLSetKeyBindDialog::setParent(LLKeyBindResponderInterface* parent, LLView*
} }
input += getString("keyboard"); input += getString("keyboard");
} }
pDesription->setText(getString("basic_description")); pDescription->setText(getString("basic_description"));
pDesription->setTextArg("[INPUT]", input); pDescription->setTextArg("[INPUT]", input);
} }
// static // static
...@@ -257,8 +257,8 @@ bool LLSetKeyBindDialog::recordAndHandleKey(KEY key, MASK mask, BOOL down) ...@@ -257,8 +257,8 @@ bool LLSetKeyBindDialog::recordAndHandleKey(KEY key, MASK mask, BOOL down)
if (LLKeyConflictHandler::isReservedByMenu(key, mask)) if (LLKeyConflictHandler::isReservedByMenu(key, mask))
{ {
pDesription->setText(getString("reserved_by_menu")); pDescription->setText(getString("reserved_by_menu"));
pDesription->setTextArg("[KEYSTR]", LLKeyboard::stringFromAccelerator(mask,key)); pDescription->setTextArg("[KEYSTR]", LLKeyboard::stringFromAccelerator(mask,key));
mLastMaskKey = 0; mLastMaskKey = 0;
return true; return true;
} }
......
...@@ -83,7 +83,7 @@ class LLSetKeyBindDialog : public LLModalDialog ...@@ -83,7 +83,7 @@ class LLSetKeyBindDialog : public LLModalDialog
void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes); void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes);
LLKeyBindResponderInterface *pParent; LLKeyBindResponderInterface *pParent;
LLCheckBoxCtrl *pCheckBox; LLCheckBoxCtrl *pCheckBox;
LLTextBase *pDesription; LLTextBase *pDescription;
U32 mKeyFilterMask; U32 mKeyFilterMask;
Updater *pUpdater; Updater *pUpdater;
......
...@@ -33,7 +33,7 @@ Combination [KEYSTR] is reserved by menu. ...@@ -33,7 +33,7 @@ Combination [KEYSTR] is reserved by menu.
height="30" height="30"
layout="topleft" layout="topleft"
left="30" left="30"
name="descritption" name="description"
top="25" top="25"
word_wrap="true" word_wrap="true"
width="212"> width="212">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment