livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New login page layout - set FSUseLegacyLoginPanel to TRUE if you favor the old crap

master
Ansariel 2016-04-22 14:28:05 +02:00
parent b9cbfdda53
commit 84c65cc6ba
7 changed files with 466 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -23870,6 +23870,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSUseLegacyLoginPanel</key>
<map>
<key>Comment</key>
<string>If enabled, the legacy layout version of the login panel will be used</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

15
indra/newview/fspanellogin.cpp
View File

@ -195,7 +195,14 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
login_holder->addChild(this);
}
buildFromFile( "panel_fs_login.xml");
if (!gSavedSettings.getBOOL("FSUseLegacyLoginPanel"))
{
buildFromFile( "panel_fs_nui_login.xml");
}
else
{
buildFromFile( "panel_fs_login.xml");
}
reshape(rect.getWidth(), rect.getHeight());
@ -205,6 +212,8 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
LLLineEditor* password_edit(getChild<LLLineEditor>("password_edit"));
password_edit->setKeystrokeCallback(onPassKey, this);
// STEAM-14: When user presses Enter with this field in focus, initiate login
password_edit->setCommitCallback(boost::bind(&FSPanelLogin::onClickConnect, this));
// change z sort of clickable text to be behind buttons
sendChildToBack(getChildView("forgot_password_text"));
@ -255,8 +264,8 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
childSetAction("remove_user_btn", onClickRemove, this);
childSetAction("connect_btn", onClickConnect, this);
getChild<LLPanel>("login")->setDefaultBtn(findChild<LLButton>("connect_btn"));
getChild<LLPanel>("start_location_panel")->setDefaultBtn(findChild<LLButton>("connect_btn"));
getChild<LLPanel>("login")->setDefaultBtn(findChild<LLButton>("connect_btn"));
getChild<LLPanel>("start_location_panel")->setDefaultBtn(findChild<LLButton>("connect_btn"));
std::string channel = LLVersionInfo::getChannel();
std::string version = llformat("%s (%d)",

1
indra/newview/skins/default/textures/textures.xml
View File

@ -670,6 +670,7 @@ with the same filename but different name
<texture name="startup_logo" file_name="windows/startup_logo.png" preload="true" />
<texture name="login_fs_logo" file_name="windows/login_fs_logo.png" preload="true" />
<texture name="login_sl_logo" file_name="windows/login_sl_logo.png" preload="true" />
<texture name="login_sl_logo_small" file_name="windows/login_sl_logo_small.png" preload="true" />
<texture name="first_login_image_left" file_name="windows/first_login_image_left.png" preload="true" />

BIN
indra/newview/skins/default/textures/windows/login_fs_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 167 KiB

8
indra/newview/skins/default/xui/de/panel_fs_login.xml
View File

@ -15,7 +15,7 @@
Benutzername:
</text>
<combo_box name="username_combo" tool_tip="Bei der Registrierung gewählter Benutzername wie „berndschmidt12“ oder „Liebe Sonne“"/>
<icon tool_tip="Diesen Benutzernamen löschen" name="remove_user_btn"/>
<button tool_tip="Diesen Benutzernamen löschen" name="remove_user_btn"/>
<text name="password_text">
Kennwort:
</text>
@ -25,8 +25,8 @@
Hier starten:
</text>
<combo_box name="start_location_combo">
<combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
<combo_box.item label="Mein Zuhause" name="MyHome"/>
<combo_box.item label="Letzter Standort" name="MyLastLocation"/>
<combo_box.item label="Zuhause" name="MyHome"/>
<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
</combo_box>
</layout_panel>
@ -50,7 +50,7 @@
<text name="mode_selection_text">
MODUS-WAHL
</text>
<combo_box name="mode_combo" tool_tip="Wählen Sie welcher Viewer Style ihnen am meisten vertraut ist, um die Standards ihren bedürfnissen anzupassen.">
<combo_box name="mode_combo" tool_tip="Wählen Sie, welcher Viewer-Style Ihnen am meisten vertraut ist, um die Standards Ihren Bedürfnissen anzupassen.">
<combo_box.item label="Hybrid" name="Hybrid"/>
<combo_box.item label="Text" name="Text"/>
</combo_box>

59
indra/newview/skins/default/xui/de/panel_fs_nui_login.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php?lang=de
</panel.string>
<layout_stack name="ui_stack">
<layout_panel name="ui_container">
<layout_stack name="vert_stack_left">
<layout_panel name="1st_row">
<layout_stack name="1st_row_stack">
<layout_panel name="login">
<combo_box name="username_combo" label="Benutzername" tool_tip="Bei der Registrierung gewählter Benutzername wie „berndschmidt12“ oder „Liebe Sonne“"/>
<check_box label="Benutzername speichern" name="remember_username_check"/>
</layout_panel>
<layout_panel name="delete_container">
<button tool_tip="Diesen Benutzernamen löschen" name="remove_user_btn"/>
</layout_panel>
<layout_panel name="password_container">
<line_editor name="password_edit" label="Kennwort"/>
<check_box label="Kennwort speichern" name="remember_check"/>
</layout_panel>
<layout_panel name="start_location_panel">
<combo_box name="start_location_combo" label="Hier starten:">
<combo_box.item label="Letzter Standort" name="MyLastLocation"/>
<combo_box.item label="Zuhause" name="MyHome"/>
<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
</combo_box>
</layout_panel>
</layout_stack>
</layout_panel>
<layout_panel name="2nd_row">
<layout_stack name="2nd_row_stack">
<layout_panel name="grid_panel">
<text name="grid_login_text">
Grid:
</text>
</layout_panel>
<layout_panel name="mode_selection">
<text name="mode_selection_text">
Modus:
</text>
<combo_box name="mode_combo" tool_tip="Wählen Sie, welcher Viewer-Style Ihnen am meisten vertraut ist, um die Standards Ihren Bedürfnissen anzupassen.">
<combo_box.item label="Hybrid" name="Hybrid"/>
<combo_box.item label="Text" name="Text"/>
</combo_box>
</layout_panel>
</layout_stack>
</layout_panel>
</layout_stack>
<button label="Anmelden" name="connect_btn"/>
<text name="create_new_account_text">
Registrieren
</text>
<text name="forgot_password_text">
Kennwort vergessen?
</text>
</layout_panel>
</layout_stack>
</panel>

379
indra/newview/skins/default/xui/en/panel_fs_nui_login.xml Normal file
View File

@ -0,0 +1,379 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="768"
layout="topleft"
name="panel_login"
focus_root="true"
background_visible="true"
bg_opaque_color="0.16 0.16 0.16 1"
background_opaque="true"
width="1024">
<panel.string
name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<web_browser
tab_stop="false"
trusted_content="true"
bg_opaque_color="Black"
border_visible="false"
follows="all"
left="0"
name="login_html"
start_url=""
top="18"
height="598"
width="1024" />
<layout_stack
follows="left|right|bottom"
height="152"
left="0"
name="ui_stack"
orientation="horizontal"
bottom="-1"
width="1024">
<layout_panel
height="152"
auto_resize="true"
name="ui_elastic_pad_left"
width="27" />
<layout_panel
auto_resize="false"
follows="left|right|top"
name="ui_container"
layout="topleft"
width="970"
min_width="970"
height="152">
<icon
height="125"
width="125"
image_name="login_fs_logo"
left="0"
top="10"
name="sl_logo_small" />
<layout_stack
animate="false"
clip="false"
follows="all"
name="vert_stack_left"
layout="topleft"
orientation="vertical"
top="0"
left_pad="10"
width="685"
height="152">
<layout_panel
auto_resize="false"
follows="all"
name="1st_row"
layout="topleft"
height="86"
width="685">
<layout_stack
animate="false"
clip="false"
follows="left|top|right"
name="1st_row_stack"
layout="topleft"
orientation="horizontal"
top="0"
left="0"
width="685"
height="86">
<layout_panel
auto_resize="true"
follows="left|top|right"
name="login"
layout="topleft"
width="206"
height="86">
<combo_box
left="5"
top_pad="25"
allow_text_entry="true"
follows="left|top|right"
height="32"
label="Username"
combo_editor.font="SansSerifLarge"
max_chars="128"
force_disable_fulltext_search="true"
combo_editor.commit_on_focus_lost="false"
combo_editor.prevalidate_callback="ascii"
tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
name="username_combo"
width="201">
<combo_box.combo_editor
text_pad_left="8"
bg_image_always_focused="true"/>
</combo_box>
<check_box
tab_stop="false"
control_name="FSRememberUsername"
follows="left|top|right"
font="SansSerifLarge"
left="2"
top_pad="10"
height="18"
label="Remember username"
name="remember_username_check"
width="204" />
</layout_panel> <!-- login -->
<layout_panel
tab_stop="false"
auto_resize="false"
follows="left|top|right"
name="delete_container"
layout="topleft"
width="32"
height="86">
<button
follows="right|top"
height="32"
image_unselected="TrashItem_Off"
image_selected="TrashItem_Press"
image_pressed="TrashItem_Press"
tool_tip="Remove this username"
label=""
layout="topleft"
name="remove_user_btn"
left="0"
top_pad="25"
width="32" />
</layout_panel> <!-- delete_container -->
<layout_panel
auto_resize="true"
follows="left|top|right"
name="password_container"
layout="topleft"
width="206"
height="86">
<!-- The max length might be changed in FSPanelLogin.cpp for Opensim! -->
<line_editor
follows="left|top|right"
height="32"
left="5"
max_length_bytes="16"
text_pad_left="8"
name="password_edit"
label="Password"
bg_image_always_focused="true"
font="SansSerifLarge"
is_password="true"
select_on_focus="true"
commit_on_focus_lost="false"
top_pad="25"
width="201" />
<check_box
tab_stop="false"
control_name="RememberPassword"
enabled_control="FSRememberUsername"
follows="left|top|right"
font="SansSerifLarge"
left="2"
height="18"
label="Remember password"
top_pad="10"
name="remember_check"
width="204" />
</layout_panel> <!-- password_container -->
<layout_panel
auto_resize="false"
follows="left|top|right"
name="start_location_panel"
layout="topleft"
width="211"
height="86">
<combo_box
allow_text_entry="true"
control_name="NextLoginLocation"
follows="left|top|right"
label="Start location"
height="32"
max_chars="128"
combo_editor.font="SansSerifLarge"
left="5"
top_pad="25"
name="start_location_combo"
width="201"
combo_button.scale_image="true">
<combo_box.combo_editor
bg_image_always_focused="true"
text_pad_left="8"/>
<combo_box.item
label="Last location"
name="MyLastLocation"
value="last" />
<combo_box.item
label="Home"
name="MyHome"
value="home" />
<combo_box.item
label="&lt;Type region name&gt;"
name="Typeregionname" value="" />
</combo_box>
</layout_panel> <!-- start_location_panel -->
</layout_stack> <!-- 1st_row_stack -->
</layout_panel> <!-- 1st_row -->
<layout_panel
auto_resize="false"
follows="left|top|right"
name="2nd_row"
layout="topleft"
top_pad="0"
height="66"
width="685">
<layout_stack
animate="false"
clip="false"
follows="left|top|right"
name="2nd_row_stack"
layout="topleft"
orientation="horizontal"
top_pad="0"
left="0"
width="685"
height="66">
<layout_panel
auto_resize="false"
follows="left|top|right"
name="grid_panel"
layout="topleft"
width="342"
height="66"
visible="true">
<text
follows="left|bottom"
font="SansSerifLarge"
height="32"
name="grid_login_text"
valign="center"
top_pad="5"
left="5"
width="35">
Grid:
</text>
<combo_box
allow_text_entry="false"
follows="left|top"
height="32"
max_chars="256"
combo_editor.font="SansSerifLarge"
left_pad="5"
top_delta="0"
layout="topleft"
name="server_combo"
width="250"
combo_button.scale_image="true">
<combo_box.drop_down_button
font="SansSerifLarge"/>
</combo_box>
</layout_panel>
<layout_panel
follows="left|top|right"
name="mode_selection"
width="342"
height="66">
<text
follows="right|top"
font="SansSerifLarge"
halign="right"
valign="center"
height="32"
name="mode_selection_text"
top_pad="5"
right="-130"
width="75">
Mode:
</text>
<combo_box
follows="right|bottom"
top_delta="0"
left_pad="10"
right="-5"
height="32"
max_chars="128"
tool_tip="Select which style of viewer you are most familiar with to set your defaults to appropriately."
name="mode_combo"
width="120"
combo_button.scale_image="true">
<combo_box.drop_down_button
font="SansSerifLarge"/>
<combo_box.item
label="Firestorm"
name="Firestorm"
value="settings_firestorm.xml" />
<combo_box.item
label="Phoenix"
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="Viewer 3"
name="V3"
value="settings_v3.xml" />
<combo_box.item
label="Hybrid"
name="Hybrid"
value="settings_hybrid.xml" />
<combo_box.item
label="Latency"
name="Latency"
value="settings_latency.xml" />
<combo_box.item
label="Text"
name="Text"
value="settings_text.xml" />
</combo_box>
</layout_panel>
</layout_stack> <!-- 2nd_row_stack -->
</layout_panel> <!-- 2nd_row -->
</layout_stack> <!-- vert_stack -->
<button
follows="left|top|right"
image_unselected="PushButton_Login"
image_pressed="PushButton_Login_Pressed"
image_hover_unselected="PushButton_Login_Over"
label="Log In"
label_color="White"
font="SansSerifLarge"
name="connect_btn"
width="140"
height="54"
left_pad="10"
top="25"/>
<text
follows="left|top|right"
font="SansSerifMedium"
text_color="EmphasisColor"
left_delta="0"
height="16"
name="create_new_account_text"
top_pad="14"
width="140">
Create an account
</text>
<text
follows="left|top|right"
font="SansSerifMedium"
text_color="EmphasisColor"
left_delta="0"
height="16"
name="forgot_password_text"
top_pad="5"
width="140">
Forgot password?
</text>
</layout_panel>
<layout_panel
height="152"
auto_resize="true"
name="ui_elastic_pad_right"
width="27" />
</layout_stack>
</panel>