Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed location combobox not updating properly when a slurl link is clicked. Reset the location combobox when a different grid is selected (added setCurrentGridChangeCallback to hippogridmanager). Moved login panel elements into a layout_stack so hiding the grid or location columns no longer leaves big empty gaps.

Browse Source
This commit is contained in:
Shyotl
2013-07-05 02:28:36 -05:00
parent 624141a31a
commit bbb0bd54bf
12 changed files with 357 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
indra/newview/skins/default/xui/en-us/panel_login.xml
View File

@@ -13,72 +13,81 @@
<string name="forgot_password_url">
http://secondlife.com/account/request.php
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="54" drop_shadow_visible="true" follows="left|bottom"
<layout_stack name="element_stack" border_size="0" left="28" right="800" top="70" bottom="10" follows="left|bottom" orientation="horizontal">
<layout_panel name="name_panel" left="0" user_resize="false" auto_resize="false" width="163" min_width="0">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="44" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="32" mouse_opaque="true" name="name_label" v_pad="0" width="120">
Name or Username:
</text>
<combo_box bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
font="SansSerif" handle_edit_keys_directly="true" height="20" left="32"
max_chars="64" mouse_opaque="true" name="name_combo"
select_all_on_focus_received="true" width="155" allow_text_entry="true" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="54" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="203" mouse_opaque="true" name="password_text" v_pad="0" width="120">
Password:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
follows="left|bottom" font="SansSerifSmall" handle_edit_keys_directly="true"
height="20" left="203" max_length="16" mouse_opaque="true"
name="password_edit" select_all_on_focus_received="true" width="120" />
<check_box bottom="10" control_name="RememberName"
left="4" mouse_opaque="true" name="name_label" v_pad="0" width="120">
Name or Username:
</text>
<combo_box bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
font="SansSerif" handle_edit_keys_directly="true" height="20" left="4"
max_chars="64" mouse_opaque="true" name="name_combo"
select_all_on_focus_received="true" width="155" allow_text_entry="true" />
<check_box bottom="0" control_name="RememberName"
follows="left|bottom" font="SansSerifSmall" height="16"
initial_value="true" label="Remember name"
left="28" mouse_opaque="true" name="remember_name_check" width="158" />
<check_box bottom="10" control_name="RememberPassword"
follows="left|bottom" font="SansSerifSmall" height="16"
initial_value="false" label="Remember password"
left="199" mouse_opaque="true" name="remember_check" width="138" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="54" drop_shadow_visible="true" follows="left|bottom"
initial_value="true" label="Remember name"
left="0" mouse_opaque="true" name="remember_name_check" width="158" />
</layout_panel>
<layout_panel name="password_panel" left="0" user_resize="false" auto_resize="false" width="134" min_width="0">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="44" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="339" mouse_opaque="true" name="grids_combo_text" v_pad="0" width="120">
Grid:
</text>
<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|bottom" height="20"
left="339" mouse_opaque="true" name="grids_combo" width="120" />
<button name="grids_btn" label="Grid Manager"
bottom_delta="-20" left_delta="10" height="16" width="100"
follows="left|bottom" font="SansSerifSmall" halign="center"
mouse_opaque="true" scale_image="TRUE" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="54" drop_shadow_visible="true" follows="left|bottom"
left="4" mouse_opaque="true" name="password_text" v_pad="0" width="120">
Password:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
follows="left|bottom" font="SansSerifSmall" handle_edit_keys_directly="true"
height="20" left="4" max_length="16" mouse_opaque="true"
name="password_edit" select_all_on_focus_received="true" width="120" />
<check_box bottom="0" control_name="RememberPassword"
follows="left|bottom" font="SansSerifSmall" height="16"
initial_value="false" label="Remember password"
left="0" mouse_opaque="true" name="remember_check" width="138" />
</layout_panel>
<layout_panel name="grids_panel" left="0" user_resize="false" auto_resize="false" width="129" min_width="0">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="44" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="475" mouse_opaque="true" name="start_location_text" v_pad="0" width="120">
Start Location:
</text>
<combo_box allow_text_entry="true" bottom_delta="-24" left="475" follows="left|bottom" height="20"
max_chars="128" mouse_opaque="true" name="start_location_combo" width="155">
<combo_item name="MyHome" value="home">
My Home
</combo_item>
<combo_item name="MyLastLocation" value="last">
My Last Location
</combo_item>
<combo_item name="Typeregionname" value="">
&lt;Type region name&gt;
</combo_item>
</combo_box>
<button bottom_delta="-3" follows="left|bottom" font="SansSerif" halign="center"
left="0" mouse_opaque="true" name="grids_combo_text" v_pad="0" width="120">
Grid:
</text>
<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|bottom" height="20"
left="0" mouse_opaque="true" name="grids_combo" width="120" />
<button name="grids_btn" label="Grid Manager"
bottom_delta="-20" left_delta="10" height="16" width="100"
follows="left|bottom" font="SansSerifSmall" halign="center"
mouse_opaque="true" scale_image="TRUE" />
</layout_panel>
<layout_panel name="location_panel" left="0" user_resize="false" auto_resize="false" width="165" min_width="0">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="44" drop_shadow_visible="true" follows="left|bottom"
font="SansSerif" h_pad="0" halign="left" height="16"
left="0" mouse_opaque="true" name="start_location_text" v_pad="0" width="120">
Start Location:
</text>
<combo_box allow_text_entry="true" bottom_delta="-24" left="0" follows="left|bottom" height="20"
max_chars="128" mouse_opaque="true" name="start_location_combo" width="155">
<combo_item name="MyHome" value="home">
My Home
</combo_item>
<combo_item name="MyLastLocation" value="last">
My Last Location
</combo_item>
<combo_item name="Typeregionname" value="">
&lt;Type region name&gt;
</combo_item>
</combo_box>
</layout_panel>
<layout_panel name="connect_panel" user_resize="false" auto_resize="true" width="100" min_width="100">
<button bottom="18" follows="left|bottom" font="SansSerif" halign="center"
height="24" label="Log In" label_selected="Log In"
left="634" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
left="0" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
width="100" />
</layout_panel>
</layout_stack>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="45" drop_shadow_visible="true" follows="right|bottom"

80
indra/newview/skins/default/xui/es/panel_login.xml
View File

@@ -1,46 +1,48 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_login">
<string name="real_url">
http://secondlife.com/app/login/
</string>
<string name="forgot_password_url">
http://secondlife.com/account/request.ph
</string>
<text name="name_label">
Nombre o Usuario:
</text>
<combo_box name="name_combo" />
<text name="password_text">
Contraseña:
</text>
<check_box label="Recordar Nombre" name="remember_name_check"/>
<check_box label="Recordar Contraseña" name="remember_check" width="138" />
<text name="grids_combo_text">
Grid:
</text>
<button name="grids_btn" label="Administrar Grid"/>
<text name="start_location_text" v_pad="0" width="120">
Posición Inicial:
</text>
<combo_box name="start_location_combo" width="155">
<combo_item name="MyHome" value="My Home">
Mi Base
</combo_item>
<combo_item name="MyLastLocation" value="My Last Location">
Mi Última Ubicación
</combo_item>
<combo_item name="Typeregionname">
&lt;Escribe el Nombre de la Región&gt;
</combo_item>
</combo_box>
<button label="Iniciar Sesión" label_selected="Iniciar Sesión" name="connect_btn" width="100" />
<text name="create_new_account_text" width="200">
<layout_stack name="element_stack">
<layout_panel name="name_panel">
<text name="name_label">
Nombre o Usuario:
</text>
<check_box label="Recordar Nombre" name="remember_name_check"/>
</layout_panel>
<layout_panel name="password_panel">
<text name="password_text">
Contraseña:
</text>
<check_box label="Recordar Contraseña" name="remember_check"/>
</layout_panel>
<layout_panel name="grids_panel">
<text name="grids_combo_text">
Grid:
</text>
<button name="grids_btn" label="Administrar Grid"/>
</layout_panel>
<layout_panel name="location_panel">
<text name="start_location_text">
Posición Inicial:
</text>
<combo_box name="start_location_combo">
<combo_item name="MyHome">
Mi Base
</combo_item>
<combo_item name="MyLastLocation">
Mi Última Ubicación
</combo_item>
<combo_item name="Typeregionname">
&lt;Escribe el Nombre de la Región&gt;
</combo_item>
</combo_box>
</layout_panel>
<layout_panel name="connect_panel">
<button label="Iniciar Sesión" label_selected="Iniciar Sesión" name="connect_btn"/>
</layout_panel>
</layout_stack>
<text name="create_new_account_text">
Registrate para obtener una Cuenta
</text>
<text name="forgot_password_text" width="200">
<text name="forgot_password_text">
¿Olvidaste tu Nombre o tu Contraseña?
</text>
<text name="channel_text">
[CHANNEL] [VERSION]
</text>
</panel>

80
indra/newview/skins/default/xui/fr/panel_login.xml
View File

@@ -1,46 +1,44 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_login">
<web_browser name="login_html" />
<string name="real_url">
http://secondlife.com/app/login/
</string>
<string name="forgot_password_url">
http://secondlife.com/account/request.php
</string>
<text left="32" name="name_label" width="120">
Nom:
</text>
<text name="password_text">
Mot de passe:
</text>
<text name="start_location_text">
Lieu d'arrivée:
</text>
<combo_box name="start_location_combo">
<combo_item name="MyHome">
Domicile
</combo_item>
<combo_item name="MyLastLocation">
Dernier emplacement
</combo_item>
<combo_item name="Typeregionname">
&lt;Nom de la région&gt;
</combo_item>
</combo_box>
<check_box bottom="10" label="Mémoriser le nom" left="28" name="remember_name_check" width="158"/>
<check_box label="Mémoriser mot de passe" name="remember_check"/>
<text bottom="54" left="339" name="grids_combo_text" width="120">
Grille:
</text>
<combo_box bottom_delta="-24" left="339" name="grids_combo" width="120" />
<button name="grids_btn" label="Choix de Grille" bottom_delta="-20" left_delta="10" width="100"/>
<text name="full_screen_text">
Le plein écran sera activé après identification.
</text>
<button label="Nouveau Compte" label_selected="Nouveau Compte" name="new_account_btn"/>
<button label="Connexion" label_selected="Me connecter" name="connect_btn"/>
<button label="Préférences" label_selected="Préférences" name="preferences_btn"/>
<button label="Quitter" label_selected="Quitter" name="quit_btn"/>
<layout_stack name="element_stack">
<layout_panel name="name_panel">
<text name="name_label">
Nom:
</text>
<check_box label="Mémoriser le nom" name="remember_name_check"/>
</layout_panel>
<layout_panel name="password_panel">
<text name="password_text">
Mot de passe:
</text>
<check_box label="Mémoriser mot de passe" name="remember_check"/>
</layout_panel>
<layout_panel name="grids_panel">
<text name="grids_combo_text">
Grille:
</text>
<button name="grids_btn" label="Choix de Grille"/>
</layout_panel>
<layout_panel name="location_panel">
<text name="start_location_text">
Lieu d'arrivée:
</text>
<combo_box name="start_location_combo">
<combo_item name="MyHome">
Domicile
</combo_item>
<combo_item name="MyLastLocation">
Dernier emplacement
</combo_item>
<combo_item name="Typeregionname">
&lt;Nom de la région&gt;
</combo_item>
</combo_box>
</layout_panel>
<layout_panel name="connect_panel">
<button label="Connexion" label_selected="Me connecter" name="connect_btn"/>
</layout_panel>
</layout_stack>
<text name="create_new_account_text">
Créer un compte
</text>

64
indra/newview/skins/default/xui/pt/panel_login.xml
View File

@@ -1,30 +1,44 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_login">
<text name="first_name_text">
Primeiro nome:
</text>
<text name="last_name_text">
Sobrenome:
</text>
<text name="password_text">
Senha:
</text>
<text name="start_location_text">
Posição inicial:
</text>
<combo_box name="start_location_combo">
<combo_item name="MyHome">
Minha casa
</combo_item>
<combo_item name="MyLastLocation">
Minha última localização
</combo_item>
<combo_item name="Typeregionname">
&lt;Digite o nome da região&gt;
</combo_item>
</combo_box>
<check_box label="Lembrar senha" name="remember_check"/>
<button label="Entrar" label_selected="Entrar" name="connect_btn"/>
<layout_stack name="element_stack">
<layout_panel name="name_panel">
<text name="name_label">
Nome:
</text>
<check_box label="Lembre-se Nome" name="remember_name_check"/>
</layout_panel>
<layout_panel name="password_panel">
<text name="password_text">
Senha:
</text>
<check_box label="Lembrar senha" name="remember_check"/>
</layout_panel>
<layout_panel name="grids_panel">
<text name="grids_combo_text">
Grelha:
</text>
<!--<button name="grids_btn" label="Administrar Grid"/>-->
</layout_panel>
<layout_panel name="location_panel">
<text name="start_location_text">
Posição inicial:
</text>
<combo_box name="start_location_combo">
<combo_item name="MyHome">
Minha casa
</combo_item>
<combo_item name="MyLastLocation">
Minha última localização
</combo_item>
<combo_item name="Typeregionname">
&lt;Digite o nome da região&gt;
</combo_item>
</combo_box>
</layout_panel>
<layout_panel name="connect_panel">
<button label="Entrar" label_selected="Entrar" name="connect_btn"/>
</layout_panel>
</layout_stack>
<text name="create_new_account_text">
Registrar-se para uma conta
</text>