From 0d04681ad12b0526c71e2dac23e93e744c955c72 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 5 Mar 2014 09:59:42 -0800
Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - added new
 button images

---
 indra/newview/skins/default/textures/textures.xml        |   5 +++--
 .../skins/default/textures/widgets/PushButton_Login.png  | Bin 0 -> 1485 bytes
 .../default/textures/widgets/PushButton_Login_On.png     | Bin 1485 -> 0 bytes
 .../textures/widgets/PushButton_Login_On_Selected.png    | Bin 1485 -> 0 bytes
 .../default/textures/widgets/PushButton_Login_Over.png   | Bin 0 -> 1568 bytes
 .../textures/widgets/PushButton_Login_Pressed.png        | Bin 0 -> 1569 bytes
 indra/newview/skins/default/xui/en/panel_login.xml       |  15 +++++++++------
 indra/newview/skins/default/xui/en/panel_login_first.xml |   5 +++--
 8 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Login.png
 delete mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Login_On.png
 delete mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
 create mode 100644 indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png

(limited to 'indra')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 605053722d..c563726c85 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -486,8 +486,9 @@ with the same filename but different name
   <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
 
-  <texture name="PushButton_Login_On" file_name="widgets/PushButton_Login_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <texture name="PushButton_Login_On_Selected" file_name="widgets/PushButton_Login_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Login" file_name="widgets/PushButton_Login.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Login_Over" file_name="widgets/PushButton_Login_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Login_Pressed" file_name="widgets/PushButton_Login_Pressed.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
 
 
   <texture name="RadioButton_Press" file_name="widgets/RadioButton_Press.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login.png b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
new file mode 100644
index 0000000000..6f8b5a0770
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Login.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png
deleted file mode 100644
index 6f8b5a0770..0000000000
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png
deleted file mode 100644
index 6f8b5a0770..0000000000
Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
new file mode 100644
index 0000000000..e9e8af13d4
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png differ
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png
new file mode 100644
index 0000000000..4a9f1052b3
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index d37cc24243..6d4085c455 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -78,8 +78,9 @@
   </text>
   <button
     follows="left|top"
-    image_unselected="PushButton_Login_On"
-    image_selected="PushButton_Login_On_Selected"
+    image_unselected="PushButton_Login"
+    image_pressed="PushButton_Login_Pressed"
+    image_hover="PushButton_Login_Over"
     label="Log In"
     label_color="White"
     font="SansSerifMedium"
@@ -117,8 +118,9 @@
   </combo_box>
   <button
     follows="left|top"
-    image_unselected="PushButton_Login_On"
-    image_selected="PushButton_Login_On_Selected"
+    image_unselected="PushButton_Login"
+    image_pressed="PushButton_Login_Pressed"
+    image_hover="PushButton_Login_Over"
     label="Log In"
     label_color="White"
     font="SansSerifMedium"
@@ -141,8 +143,9 @@
     bottom_delta="0" />
   <button
     follows="left|top"
-    image_unselected="PushButton_Login_On"
-    image_selected="PushButton_Login_On_Selected"
+    image_unselected="PushButton_Login"
+    image_pressed="PushButton_Login_Pressed"
+    image_hover="PushButton_Login_Over"
     label="Log In"
     label_color="White"
     font="SansSerifMedium"
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index 2ad5afe956..81cb98c697 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -131,8 +131,9 @@
             top="0" />
           <button
             follows="left|top"
-            image_unselected="PushButton_Login_On"
-            image_selected="PushButton_Login_On_Selected"
+            image_unselected="PushButton_Login"
+            image_pressed="PushButton_Login_Pressed"
+            image_hover="PushButton_Login_Over"
             label="Log In"
             label_color="White"
             font="SansSerifLarge"
-- 
cgit v1.2.3