diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/ja/floater_test_combobox.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_test_combobox.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_test_combobox.xml | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_test_combobox.xml b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml new file mode 100644 index 0000000000..5059a9d57a --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_test_combobox.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="floater_test_combobox"> + <text type="string" length="1" height="16" layout="topleft" left="10" top="24" width="200"> + 現実の使い道（ログイン場所）： + </text> + <combo_box name="start_location_combo"> + <combo_box.item label="最後に訪れた場所" name="MyLastLocation" value="last"/> + <combo_box.item label="自分の家" name="MyHome" value="home"/> + <combo_box.item label="＜リージョン（地域）名を入力＞" name="Typeregionname" value=""/> + </combo_box> + <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200"> + 最小のコンボボックス： + </text> + <combo_box name="minimal_combo"> + <combo_box.item label="最初" name="item1" value="first"/> + <combo_box.item label="２つ目" name="item2" value="second"/> + </combo_box> + <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200"> + テキスト入力を許可： + </text> + <combo_box name="text_entry_combo"> + <combo_box.item label="最初の項目" name="item1" value="first"/> + <combo_box.item label="２つ目の項目" name="item2" value="second"/> + </combo_box> + <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200"> + テキスト入力を許可。デフォルトは２つ目の項目： + </text> + <combo_box name="text_entry_combo2"> + <combo_box.item label="最初の項目" name="item1" value="first"/> + <combo_box.item label="２つ目の項目" name="item2" value="second"/> + </combo_box> + <text type="string" length="1" height="16" layout="topleft" left_delta="0" top_pad="24" width="200"> + ２文字まで入力可能： + </text> + <combo_box name="state_combo"> + <combo_box.item label="CA" name="item1" value="ca"/> + <combo_box.item label="NY" name="item2" value="ny"/> + <combo_box.item label="TX" name="item3" value="tx"/> + </combo_box> +</floater> |