summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-07-18 14:47:16 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-07-18 14:47:16 -0400
commitf7449bdc570e97a2ded2864779c72cce7f52e608 (patch)
treef1304d218fa4ec718db4337a3d5f2b2046233ed8 /indra/newview/skins/default/xui/ja
parent149598bd57ad7a0e6703c49355c6d51ba4c55202 (diff)
Make "Log In" button (etc.) move with start/grid combo visibility.
The "Start at:" combo box and the grid-selector box can be turned on and off with checkboxes on the Preferences floater. Break the bottom-left layout_panel on panel_login into several different layout_panels so when these UI elements disappear, other controls move left to fill the holes. Similarly, when you turn on either or both of the UI elements in question, the remaining controls in that general bottom-left area move right to accommodate. Tweak C++ and non-English panel_login.xml overrides to reflect widgets' containment in new layout_panel elements. Discard obsolete "mode_selection_text" and "mode_combo" translations from non- English panel_login.xml overrides.
Diffstat (limited to 'indra/newview/skins/default/xui/ja')
-rw-r--r--indra/newview/skins/default/xui/ja/panel_login.xml15
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index f883d65a92..780f7aa1ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -15,15 +15,8 @@
<text name="password_text">
パスワード:
</text>
- <check_box label="パスワードを記憶" name="remember_check"/>
- <button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
- <text name="mode_selection_text">
- モード:
- </text>
- <combo_box name="mode_combo" tool_tip="モードを選択します。ベーシックモードでは探索やチャットをすばやく簡単に実行でき、アドバンスモードでは、より多くの機能が利用できます。">
- <combo_box.item label="ベーシック" name="Basic"/>
- <combo_box.item label="アドバンス" name="Advanced"/>
- </combo_box>
+ </layout_panel>
+ <layout_panel name="start_location_panel">
<text name="start_location_text">
開始地点:
</text>
@@ -32,12 +25,16 @@
<combo_box.item label="ホーム" name="MyHome"/>
<combo_box.item label="<地域名を入力>" name="Typeregionname"/>
</combo_box>
+ </layout_panel>
+ <layout_panel name="links_login_panel">
<text name="login_help">
ログインの方法
</text>
<text name="forgot_password_text">
ユーザー名またはパスワードをお忘れですか?
</text>
+ <button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
+ <check_box label="パスワードを記憶" name="remember_check"/>
</layout_panel>
<layout_panel name="links">
<text name="create_account_text">