Skip to content
Snippets Groups Projects
Commit c49e9baa authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-12607 Rearrange login panel

parent 032c4a1b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llprogressview.cpp
+ 10
− 9
View file @ c49e9baa
...@@ -382,14 +382,14 @@ void LLProgressView::initLogos() ...@@ -382,14 +382,14 @@ void LLProgressView::initLogos()
const U8 image_codec = IMG_CODEC_PNG; const U8 image_codec = IMG_CODEC_PNG;
const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); const LLRectf default_clip(0.f, 1.f, 1.f, 0.f);
const S32 default_height = 32; const S32 default_height = 32;
const S32 default_pad = 7; const S32 default_pad = 25;
S32 icon_width; S32 icon_width;
// We don't know final screen rect yet, so we can't precalculate position fully // We don't know final screen rect yet, so we can't precalculate position fully
LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl"); LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl");
S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad; S32 texture_start_x = logos_label->getFont()->getWidthF32(logos_label->getText()) + default_pad;
S32 texture_start_y = -3; S32 texture_start_y = -7;
// Normally we would just preload these textures from textures.xml, // Normally we would just preload these textures from textures.xml,
// and display them via icon control, but they are only needed on // and display them via icon control, but they are only needed on
...@@ -507,11 +507,10 @@ void LLProgressView::initTextures(S32 location_id, bool is_in_production) ...@@ -507,11 +507,10 @@ void LLProgressView::initTextures(S32 location_id, bool is_in_production)
initStartTexture(location_id, is_in_production); initStartTexture(location_id, is_in_production);
initLogos(); initLogos();
if (!mLogosList.empty()) childSetVisible("panel_icons", mLogosList.empty() ? FALSE : TRUE);
{ childSetVisible("panel_login", TRUE);
LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl"); childSetVisible("panel_teleport", FALSE);
logos_label->setVisible(true); childSetVisible("panel_spacer", FALSE);
}
} }
void LLProgressView::releaseTextures() void LLProgressView::releaseTextures()
...@@ -519,8 +518,10 @@ void LLProgressView::releaseTextures() ...@@ -519,8 +518,10 @@ void LLProgressView::releaseTextures()
gStartTexture = NULL; gStartTexture = NULL;
mLogosList.clear(); mLogosList.clear();
LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl"); childSetVisible("panel_login", FALSE);
logos_label->setVisible(false); childSetVisible("panel_teleport", TRUE);
childSetVisible("panel_spacer", TRUE);
childSetVisible("panel_icons", FALSE);
} }
void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label) void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label)
......
indra/newview/skins/default/textures/textures.xml
+ 1
− 0
View file @ c49e9baa
...@@ -486,6 +486,7 @@ with the same filename but different name ...@@ -486,6 +486,7 @@ with the same filename but different name
<texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" /> <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
<texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" /> <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
<texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
<texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" /> <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
<texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
......
indra/newview/skins/default/textures/widgets/ProgressBarSolid.png 0 → 100644
+ 0
− 0
View file @ c49e9baa
indra/newview/skins/default/textures/widgets/ProgressBarSolid.png

208 B

indra/newview/skins/default/xui/en/panel_progress.xml
+ 137
− 61
View file @ c49e9baa
...@@ -58,69 +58,145 @@ ...@@ -58,69 +58,145 @@
left="0" left="0"
top="0" top="0"
width="670" /> width="670" />
<text <layout_stack
follows="left|right|top"
font="SansSerifHuge"
font_shadow="none"
halign="left"
height="20"
layout="topleft"
left_delta="47"
name="title_text"
text_color="LoginProgressBoxTextColor"
top_delta="50"
right="-47"/>
<text
follows="left|right|top"
font="SansSerif"
font_shadow="none"
halign="left"
height="20"
layout="topleft"
left_delta="0"
name="progress_text"
text_color="LoginProgressBoxTextColor"
top_pad="5"
right="-47"
word_wrap="true"/>
<progress_bar
bottom="115"
color_bar="1 1 1 0.96"
follows="left|right|top"
height="16"
layout="topleft"
left="45"
name="login_progress_bar"
right="-45" />
<text
follows="left|right|top|bottom" follows="left|right|top|bottom"
font="SansSerifLarge" height="250"
font_shadow="none"
halign="left"
height="100"
layout="topleft"
left="45"
line_spacing.pixels="2"
name="message_text"
text_color="LoginProgressBoxTextColor"
top="145"
right="-90"
word_wrap="true"/>
<!--Logos are tied to following label from code-->
<text
follows="left|right|top"
layout="topleft" layout="topleft"
font_shadow="none" left="0"
halign="left" orientation="vertical"
height="16" name="vertical_centering"
width="100" animate="false"
left="48" top="0"
top="200" width="670">
line_spacing.pixels="2" <layout_panel
name="logos_lbl" auto_resize="false"
text_color="LoginProgressBoxTextColor"> height="60"
Second Life uses layout="topleft"
</text> min_height="60"
name="panel_login"
width="670">
<text
follows="left|right|top"
layout="topleft"
font="SansSerifHuge"
font_shadow="none"
halign="left"
height="20"
left="47"
top="32"
right="-47"
name="login_text"
text_color="LoginProgressBoxTextColor">
Logging in...
</text>
</layout_panel>
<layout_panel
auto_resize="false"
height="100"
layout="topleft"
min_height="100"
name="panel_teleport"
width="670">
<text
follows="left|right|top"
layout="topleft"
font="SansSerifHuge"
font_shadow="none"
halign="left"
height="20"
left="47"
top="50"
right="-47"
name="title_text"
text_color="LoginProgressBoxTextColor"/>
<text
follows="left|right|top"
layout="topleft"
font="SansSerif"
font_shadow="none"
halign="left"
height="20"
top_pad="5"
right="-47"
left_delta="0"
name="progress_text"
text_color="LoginProgressBoxTextColor"
word_wrap="true"/>
</layout_panel>
<layout_panel
auto_resize="false"
height="19"
layout="topleft"
min_height="19"
name="panel_progress"
width="670">
<progress_bar
color_bar="1 0.314 0 0.96"
follows="left|right|top"
layout="topleft"
image_fill="ProgressBarSolid"
height="16"
left="45"
top="2"
name="login_progress_bar"
right="-45" />
</layout_panel>
<layout_panel
auto_resize="false"
height="12"
layout="topleft"
min_height="12"
name="panel_spacer"
width="670">
</layout_panel>
<layout_panel
auto_resize="false"
height="110"
layout="topleft"
min_height="110"
name="panel_motd"
width="670">
<text
follows="left|right|top|bottom"
font="SansSerifLarge"
font_shadow="none"
halign="left"
valign="center"
height="100"
layout="topleft"
left="45"
line_spacing.pixels="2"
name="message_text"
text_color="LoginProgressBoxTextColor"
top="7"
right="-90"
word_wrap="true"/>
</layout_panel>
<layout_panel
auto_resize="false"
height="40"
layout="topleft"
min_height="40"
name="panel_icons"
width="670">
<!--Logos are tied to following label from code-->
<text
follows="left|right|top"
layout="topleft"
font="SansSerifLarge"
font_shadow="none"
halign="left"
height="16"
width="240"
left="47"
top="6"
line_spacing.pixels="2"
name="logos_lbl"
text_color="LoginProgressBoxTextColor">
Second Life uses
</text>
</layout_panel>
</layout_stack>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
height="200" height="200"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment