From b6821ae35a1d47497dbc990c30e8dddc1eb4ff41 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 12 Feb 2014 11:08:16 -0800
Subject: First pass at FirstLogin login page.

---
 indra/newview/llpanellogin.cpp                     |  38 +---
 indra/newview/skins/default/textures/textures.xml  |   4 +
 .../textures/windows/first_login_image_left.png    | Bin 0 -> 280886 bytes
 .../textures/windows/first_login_image_right.png   | Bin 0 -> 263692 bytes
 .../default/textures/windows/login_sl_logo.png     | Bin 0 -> 28583 bytes
 indra/newview/skins/default/xui/en/main_view.xml   |   3 +-
 .../skins/default/xui/en/panel_login_first.xml     | 249 +++++++++++++++++++++
 7 files changed, 259 insertions(+), 35 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/windows/first_login_image_left.png
 create mode 100644 indra/newview/skins/default/textures/windows/first_login_image_right.png
 create mode 100644 indra/newview/skins/default/textures/windows/login_sl_logo.png
 create mode 100644 indra/newview/skins/default/xui/en/panel_login_first.xml

(limited to 'indra')

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 557c67f2d7..f328ffe1a0 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -78,7 +78,6 @@
 
 #include "llsdserialize.h"
 
-const S32 BLACK_BORDER_HEIGHT = 160;
 const S32 MAX_PASSWORD = 16;
 
 LLPanelLogin *LLPanelLogin::sInstance = NULL;
@@ -192,7 +191,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	mCallbackData(cb_data),
 	mListener(new LLPanelLoginListener(this))
 {
-	setBackgroundVisible(FALSE);
+	setBackgroundVisible(TRUE);
 	setBackgroundOpaque(TRUE);
 
 	// instance management
@@ -207,20 +206,16 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	mPasswordModified = FALSE;
 	LLPanelLogin::sInstance = this;
+	buildFromFile( "panel_login_first.xml");
 
 	LLView* login_holder = gViewerWindow->getLoginPanelHolder();
 	if (login_holder)
 	{
+		setOrigin(0,0);
+		reshape(rect.getWidth(), rect.getHeight());
 		login_holder->addChild(this);
 	}
 
-	// Logo
-	mLogoImage = LLUI::getUIImage("startup_logo");
-
-	buildFromFile( "panel_login.xml");
-
-	reshape(rect.getWidth(), rect.getHeight());
-
 	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
@@ -408,31 +403,6 @@ LLPanelLogin::~LLPanelLogin()
 // virtual
 void LLPanelLogin::draw()
 {
-	gGL.pushMatrix();
-	{
-		F32 image_aspect = 1.333333f;
-		F32 view_aspect = (F32)getRect().getWidth() / (F32)getRect().getHeight();
-		// stretch image to maintain aspect ratio
-		if (image_aspect > view_aspect)
-		{
-			gGL.translatef(-0.5f * (image_aspect / view_aspect - 1.f) * getRect().getWidth(), 0.f, 0.f);
-			gGL.scalef(image_aspect / view_aspect, 1.f, 1.f);
-		}
-
-		S32 width = getRect().getWidth();
-		S32 height = getRect().getHeight();
-
-		if (getChild<LLView>("login_widgets")->getVisible())
-		{
-			// draw a background box in black
-			gl_rect_2d( 0, height - 264, width, 264, LLColor4::black );
-			// draw the bottom part of the background image
-			// just the blue background to the native client UI
-			mLogoImage->draw(0, -264, width + 8, mLogoImage->getHeight());
-		};
-	}
-	gGL.popMatrix();
-
 	LLPanel::draw();
 }
 
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index bb891996c9..4aa668c242 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -577,6 +577,10 @@ with the same filename but different name
 
   <texture name="startup_logo"  file_name="windows/startup_logo.png" preload="true" />
 
+  <texture name="login_sl_logo"  file_name="windows/login_sl_logo.png" preload="true" />
+  <texture name="first_login_image_left"  file_name="windows/first_login_image_left.png" preload="true" />
+  <texture name="first_login_image_right"  file_name="windows/first_login_image_right.png" preload="true" />
+
   <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="false" />
   <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="false" />
   <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/windows/first_login_image_left.png b/indra/newview/skins/default/textures/windows/first_login_image_left.png
new file mode 100644
index 0000000000..b1cb30fe67
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/first_login_image_left.png differ
diff --git a/indra/newview/skins/default/textures/windows/first_login_image_right.png b/indra/newview/skins/default/textures/windows/first_login_image_right.png
new file mode 100644
index 0000000000..bdd3afdd48
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/first_login_image_right.png differ
diff --git a/indra/newview/skins/default/textures/windows/login_sl_logo.png b/indra/newview/skins/default/textures/windows/login_sl_logo.png
new file mode 100644
index 0000000000..3bc93ab24d
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/login_sl_logo.png differ
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a87027a113..b1eb3caccb 100755
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -67,7 +67,8 @@
       <panel top="0"
              left="0"
              follows="all"
-             height="500"
+             height="768"
+             layout="topleft"
              mouse_opaque="false"
              name="login_panel_holder"
              width="1024"/>
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
new file mode 100644
index 0000000000..5e257df4fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -0,0 +1,249 @@
+<panel
+  follows="all"
+  height="768"
+  layout="topleft"
+  name="panel_login"
+  focus_root="true"
+  bg_opaque_color="Red"
+  background_opaque="true"
+  width="1024">
+  <layout_stack
+    follows="left|right|top|bottom"
+    width="1024"
+    height="768"
+    left="0"
+    name="logo_stack"
+    orientation="vertical"
+    top="0">
+    <layout_panel
+      height="400"
+      min_height="10"
+      auto_resize="true"
+      name="page_top"
+      width="1024" />
+    <!-- start of logo stack -->
+    <layout_panel
+      height="150"
+      min_height="10"
+      auto_resize="false"
+      name="parent_panel"
+      width="1024">
+      <layout_stack
+        follows="left|right|top|bottom"
+        height="400"
+        left="0"
+        name="logo_stack"
+        orientation="horizontal"
+        top="0"
+        width="1024">
+        <layout_panel
+          height="400"
+          min_height="10"
+          auto_resize="true"
+          name="logo_left"
+          width="300" />
+        <layout_panel
+          auto_resize="false"
+          follows="left|right|top"
+          name="logo_container"
+          width="315"
+          left="0"
+          top="0"
+          height="215">
+          <icon
+            height="128"
+            image_name="login_sl_logo"
+            left="0"
+            name="sl_logo"
+            top="15" />
+        </layout_panel>
+        <layout_panel
+          height="400"
+          name="logo_right"
+          auto_resize="true"
+          width="300" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of logo stack -->
+    <!-- start of widget stack -->
+    <layout_panel
+      height="100"
+      min_height="10"
+      auto_resize="false"
+      name="parent_panel2"
+      width="1024">
+      <layout_stack
+        follows="left|right|top|bottom"
+        height="80"
+        left="0"
+        name="widget_stack"
+        orientation="horizontal"
+        top="0"
+        width="1024">
+        <layout_panel
+          height="80"
+          min_height="10"
+          auto_resize="true"
+          name="widget_left"
+          width="200" />
+        <layout_panel
+          auto_resize="false"
+          follows="left|right|top"
+          name="widget_container"
+          width="532"
+          left="0"
+          top="0"
+          height="80">
+          <line_editor
+            follows="left|top"
+            height="32"
+            left="0"
+            max_length_bytes="16"
+            name="username_edit"
+            label="Username"
+            is_password="false"
+            font="SansSerifLarge"
+            select_on_focus="true"
+            commit_on_focus_lost="false"
+            top="0"
+            width="200" />
+          <line_editor
+            follows="left|top"
+            width="200"
+            height="32"
+            left="216"
+            max_length_bytes="16"
+            name="password_edit"
+            label="Password"
+            font="SansSerifLarge"
+            is_password="true"
+            select_on_focus="true"
+            commit_on_focus_lost="false"
+            top="0" />
+          <button
+            follows="left|top"
+            image_unselected="PushButton_On"
+            image_selected="PushButton_On_Selected"
+            label="Log In"
+            label_color="White"
+            font="SansSerifLarge"
+            name="connect_btn"
+            left="432"
+            width="100"
+            height="32"
+            top="0" />
+          <check_box
+            control_name="RememberMe"
+            follows="left|top"
+            font="SansSerifLarge"
+            left="0"
+            top="32"
+            height="24"
+            label="Remember me"
+            check_button.bottom="3"
+            name="remember_me"
+            width="145" />
+          <text
+            follows="left|top"
+            font="SansSerifLarge"
+            text_color="EmphasisColor"
+            height="16"
+            name="forgot_password_text"
+            left="216"
+            top="34"
+            width="200">
+            Forgotten password?
+          </text>
+        </layout_panel>
+        <layout_panel
+          height="100"
+          name="widget_right"
+          auto_resize="true"
+          width="200" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of widget stack -->
+    <!-- start of images stack -->
+    <layout_panel
+      height="500"
+      min_height="10"
+      auto_resize="false"
+      name="parent_panel3"
+      width="1024">
+      <layout_stack
+        follows="left|right|top|bottom"
+        height="500"
+        left="0"
+        name="images_stack"
+        orientation="horizontal"
+        top="0"
+        width="1024">
+        <layout_panel
+          height="500"
+          min_height="10"
+          auto_resize="true"
+          name="images_left"
+          width="96" />
+        <layout_panel
+          auto_resize="false"
+          follows="left|right|top"
+          name="images_container"
+          width="832"
+          left="0"
+          top="0"
+          height="500">
+          <icon
+            height="400"
+            width="400"
+            image_name="first_login_image_left"
+            left="0"
+            name="image_left"
+            top="0" />
+          <icon
+            height="400"
+            width="400"
+            image_name="first_login_image_right"
+            left_pad="32"
+            name="image_right"
+            top="0" />
+          <text
+            follows="left|top"
+            font="SansSerifMedium"
+            text_color="White"
+            height="16"
+            name="image_caption_left"
+            left="0"
+            halign="center"
+            top="408"
+            width="400">
+            Your first step is Learning Island. Find the exit portal!
+          </text>
+          <text
+            follows="left|top"
+            font="SansSerifMedium"
+            text_color="White"
+            height="16"
+            name="image_caption_left"
+            left="432"
+            halign="center"
+            top="408"
+            width="400">
+            Then explore Social Island and meet other new residents!
+          </text>
+        </layout_panel>
+        <layout_panel
+          height="100"
+          name="images_right"
+          auto_resize="true"
+          width="96" />
+      </layout_stack>
+    </layout_panel>
+    <!-- end of images stack -->
+    <layout_panel
+      height="400"
+      min_height="10"
+      auto_resize="true"
+      name="page_bottom"
+      width="1024" />
+  </layout_stack>
+</panel>
-- 
cgit v1.2.3