diff options
author | thickbrick | 2010-09-25 16:18:20 +0200 |
---|---|---|
committer | thickbrick | 2010-09-25 16:18:20 +0200 |
commit | 702b44426e036495c5568e7422e8cd77a46f1966 (patch) | |
tree | 057b360b743bd27e404cb09861dc3332cff673ec | |
parent | LLTextEditor context translator: set selection after translation. (diff) | |
download | meta-impy-702b44426e036495c5568e7422e8cd77a46f1966.zip meta-impy-702b44426e036495c5568e7422e8cd77a46f1966.tar.gz meta-impy-702b44426e036495c5568e7422e8cd77a46f1966.tar.bz2 meta-impy-702b44426e036495c5568e7422e8cd77a46f1966.tar.xz |
Context translator: default to enabled.
Set the default of the xui attribute "allow_translate" to true,
and add allow_translate="false" to panel_login.xml. This probably
needs to be disabled in other places as well.
-rw-r--r-- | linden/indra/llui/lllineeditor.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llui/lltexteditor.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_login.xml | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp index 05966d6..8d88ce9 100644 --- a/linden/indra/llui/lllineeditor.cpp +++ b/linden/indra/llui/lllineeditor.cpp | |||
@@ -176,7 +176,7 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect, | |||
176 | mReplaceNewlinesWithSpaces( TRUE ), | 176 | mReplaceNewlinesWithSpaces( TRUE ), |
177 | mSpellCheckable( FALSE ), | 177 | mSpellCheckable( FALSE ), |
178 | mShowMisspellings(FALSE), | 178 | mShowMisspellings(FALSE), |
179 | mAllowTranslate(FALSE) | 179 | mAllowTranslate(TRUE) |
180 | { | 180 | { |
181 | llassert( max_length_bytes > 0 ); | 181 | llassert( max_length_bytes > 0 ); |
182 | 182 | ||
@@ -2885,7 +2885,7 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory | |||
2885 | { | 2885 | { |
2886 | line_editor->setSpellCheckable(spell_checking); | 2886 | line_editor->setSpellCheckable(spell_checking); |
2887 | } | 2887 | } |
2888 | BOOL allow_translate = FALSE; | 2888 | BOOL allow_translate = TRUE; |
2889 | if (node->getAttributeBOOL("allow_translate", allow_translate)) | 2889 | if (node->getAttributeBOOL("allow_translate", allow_translate)) |
2890 | { | 2890 | { |
2891 | line_editor->setAllowTranslate(allow_translate); | 2891 | line_editor->setAllowTranslate(allow_translate); |
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp index d59eed6..5ee94c8 100644 --- a/linden/indra/llui/lltexteditor.cpp +++ b/linden/indra/llui/lltexteditor.cpp | |||
@@ -331,7 +331,7 @@ LLTextEditor::LLTextEditor( | |||
331 | mScrollNeeded(FALSE), | 331 | mScrollNeeded(FALSE), |
332 | mSpellCheckable(FALSE), | 332 | mSpellCheckable(FALSE), |
333 | mShowMisspellings(FALSE), | 333 | mShowMisspellings(FALSE), |
334 | mAllowTranslate(FALSE) | 334 | mAllowTranslate(TRUE) |
335 | { | 335 | { |
336 | mSourceID.generate(); | 336 | mSourceID.generate(); |
337 | 337 | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml index dda5e4d..96f3f77 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml | |||
@@ -58,7 +58,8 @@ | |||
58 | bevel_style="in" border_style="line" border_thickness="1" | 58 | bevel_style="in" border_style="line" border_thickness="1" |
59 | max_length="31" mouse_opaque="true" | 59 | max_length="31" mouse_opaque="true" |
60 | handle_edit_keys_directly="true" | 60 | handle_edit_keys_directly="true" |
61 | select_all_on_focus_received="true" /> | 61 | select_all_on_focus_received="true" |
62 | allow_translate="false" /> | ||
62 | 63 | ||
63 | 64 | ||
64 | <!-- LAST NAME --> | 65 | <!-- LAST NAME --> |
@@ -77,7 +78,8 @@ | |||
77 | bevel_style="in" border_style="line" border_thickness="1" | 78 | bevel_style="in" border_style="line" border_thickness="1" |
78 | max_length="31" mouse_opaque="true" | 79 | max_length="31" mouse_opaque="true" |
79 | handle_edit_keys_directly="true" | 80 | handle_edit_keys_directly="true" |
80 | select_all_on_focus_received="true" /> | 81 | select_all_on_focus_received="true" |
82 | allow_translate="false" /> | ||
81 | 83 | ||
82 | 84 | ||
83 | <!-- PASSWORD --> | 85 | <!-- PASSWORD --> |
@@ -96,7 +98,8 @@ | |||
96 | bevel_style="in" border_style="line" border_thickness="1" | 98 | bevel_style="in" border_style="line" border_thickness="1" |
97 | max_length="16" mouse_opaque="true" | 99 | max_length="16" mouse_opaque="true" |
98 | handle_edit_keys_directly="true" | 100 | handle_edit_keys_directly="true" |
99 | select_all_on_focus_received="true" /> | 101 | select_all_on_focus_received="true" |
102 | allow_translate="false" /> | ||
100 | <check_box name="remember_check" label="Remember password" | 103 | <check_box name="remember_check" label="Remember password" |
101 | bottom_delta="-24" left_delta="0" height="16" width="140" | 104 | bottom_delta="-24" left_delta="0" height="16" width="140" |
102 | follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" | 105 | follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" |