From e4d03c75fbabf05646fb24a086a6082b0161658f Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Thu, 29 Oct 2009 14:28:12 -0400
Subject: Made toast notifications closer to spec.
 http://jira.secondlife.com/browse/EXT-1673

---
 .../newview/skins/default/xui/en/notifications.xml |  8 +--
 .../skins/default/xui/en/panel_instant_message.xml | 43 ++++++++--------
 .../skins/default/xui/en/panel_notification.xml    | 59 ++++++++++++++--------
 indra/newview/skins/default/xui/en/panel_toast.xml | 43 +++++++++-------
 4 files changed, 86 insertions(+), 67 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7d2ef4923e..c384f9f473 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5837,15 +5837,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
       <button
        index="0"
        name="Keep"
-       text="OK"/>
+       text="Accept"/>
       <button
        index="1"
        name="Discard"
-       text="Cancel"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Block"/>
+       text="No, thanks"/>
     </form>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 00ede1fb2c..26d8304551 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- bevel_style="in"
  bg_alpha_color="0.3 0.3 0.3 0"
- height="140"
+ height="175"
  label="im_panel"
  layout="topleft"
  left="0"
  name="im_panel"
  top="0"
- width="350">
+ width="305">
     <string
      name="message_max_lines_count">
         6
@@ -19,50 +18,52 @@
      bevel_style="in"
      bg_alpha_color="black"
      follows="top"
-     height="30"
+     height="20"
      label="im_header"
      layout="topleft"
      left="5"
      name="im_header"
      top="5"
-     width="340">
+     width="295">
         <avatar_icon
          follows="right"
          height="20"
          image_name="icon_avatar_online.tga"
          layout="topleft"
-         left="5"
+         left="0"
          mouse_opaque="true"
          name="avatar_icon"
-         top="5"
+         top="0"
          width="20" />
         <icon
          follows="right"
          height="20"
          image_name="icon_top_pick.tga"
          layout="topleft"
-         left="5"
+         left="0"
          mouse_opaque="true"
          name="sys_msg_icon"
-         top="5"
+         top="0"
          width="20" />
         <text
          follows="left|right"
-         font="SansSerifBigBold"
+         font="SansSerifBold"
          height="20"
          layout="topleft"
-         left_pad="10"
+         left_pad="5"
          name="user_name"
          text_color="white"
          top="5"
          value="Darth Vader"
-         width="250" />
+         width="295" />
+	 <!-- TIME STAMP -->
         <text
          follows="right"
-         font="SansSerifBig"
+         font="SansSerif"
          height="20"
          layout="topleft"
-         left_pad="10"
+	 halign="right"
+         left="245"
          name="time_box"
          text_color="white"
          top="5"
@@ -71,25 +72,25 @@
     </panel>
     <text
      follows="left|top|bottom|right"
-     height="60"
+     height="86"
      layout="topleft"
      left="10"
      name="message"
      text_color="white"
-     top="40"
+     top="33"
      use_ellipses="true"
      value="MESSAGE"
-     width="330"
+     width="285"
      word_wrap="true"
      max_length="350" />
     <button
      follows="bottom"
-     font="SansSerifBigBold"
+     font="SansSerifBold"
      height="25"
-     label="reply"
+     label="Reply"
      layout="topleft"
-     left="120"
+     left="97"
      name="reply"
-     top="110"
+     top="137"
      width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 9c2829d92d..0d34aa0f08 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -1,37 +1,51 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-  background_opaque="true"
-  background_visible="false"
+  background_opaque="false"
+      border_visible="false"
+  border = "false"
+  border_drop_shadow_visible = "false"
+  drop_shadow_visible = "false"
+  background_visible="true"
   bg_alpha_color="0.3 0.3 0.3 0"
-  height="140"
+  bg_opaque_color="0.3 0.3 0.3 0"
   label="notification_panel"
   layout="topleft"
   left="0"
   name="notification_panel"
   top="0"
-  width="350">
+  	height="10"
+  width="305">
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
   <panel
+      border_visible="false"
+      drop_shadow="false"
+ bevel_style="none"
+ border_style="none"
+  border = "false"
+  border_drop_shadow_visible = "false"
+  drop_shadow_visible = "false"
     background_visible="true"
-    bg_alpha_color="0.3 0.3 0.3 0"
+  bg_alpha_color="0.3 0.3 0.3 0"
+  bg_opaque_color="0.3 0.3 0.3 0"
     follows="left|right|top"
-    height="100"
+    height="10"
     label="info_panel"
     layout="topleft"
     left="0"
     name="info_panel"
     top="0"
-    width="350">
-    <text
+    width="305">
+  <!--  <text
       border_visible="false"
       follows="left|right|top|bottom"
       font="SansSerif"
       height="90"
       layout="topleft"
-      left="45"
+      left="10"
       name="text_box"
       read_only="true"
       text_color="white"
-      top="5"
+      top="10"
       visible="false" 
       width="300"
       wrap="true"/>
@@ -47,40 +61,43 @@
       top="5"
       visible="false"
       width="300"
-      wrap="true"/>
+      wrap="true"/>  -->
     <text_editor
+    	h_pad="0"
+	v_pad="0"
       bg_readonly_color="0.0 0.0 0.0 0"
       border_visible="false"
+	  border = "false"
+	  border_drop_shadow_visible = "false"
+	  drop_shadow_visible = "false"
       embedded_items="false"
       enabled="false"
       follows="left|right|top|bottom"
       font="SansSerif"
-      height="90"
       layout="topleft"
-      left="45"
+      left="10"
       mouse_opaque="false"
       name="text_editor_box"
       read_only="true"
       tab_stop="false"
       text_color="white"
       text_readonly_color="white"
-      top="5"
+      top="10"
       visible="false"
-      width="300"
+      width="285"
       wrap="true"/>
   </panel>
   <panel
-    background_visible="true"
-    bg_alpha_color="0.3 0.3 0.3 0"
+    background_visible="false"
     follows="left|right|bottom"
-    height="40"
     label="control_panel"
     layout="topleft"
     left="0"
+    left_delta="-38"
     name="control_panel"
-    top_pad="0"
-    width="350">
+    top="20">
   </panel>
+  <!--
   <icon
     follows="left|top"
     height="32"
@@ -90,5 +107,5 @@
     mouse_opaque="false"
     name="info_icon"
     top="20"
-    width="32" />
+    width="32" />  -->
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 2e500fc2aa..5fe973883c 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -1,41 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
+<!-- All this does is establish the position of the "close" button on the toast. -->
+
 <floater
 	name="toast"
 	title=""
   visible="false"
   layout="topleft"
-	width="350"
-	height="40"
-  left="100"
-  top="500"
+	width="305"
+  left="0"
+  top="0"
   follows="right|bottom" 
-  bevel_style="in"
   can_minimize="false"
   can_tear_off="false"
   can_resize="false"
   can_drag_on_left="false"
   can_close="false"
   can_dock="false"  
+  border_visible = "false"
+  border_drop_shadow_visible = "false"
+  drop_shadow_visible = "false"
+  border = "false"
   >
 
+  <!--
   <text
    visible="false"
    follows="left|top|right|bottom"
    font="SansSerifBold"
-   height="28"
+   height="40"
    layout="topleft"
    left="60"
    name="toast_text"
    word_wrap="true"
    text_color="white"
-   top="10"
+   top="20"
    width="290">
     Toast text;
   </text>
   <icon
-    top="4" 
+    top="20" 
     left="10" 
     width="32" 
     height="32"
@@ -47,24 +52,24 @@
     image_name="notify_tip_icon.tga"
     mouse_opaque="true" 
     name="icon"
-  />
+  />-->
   <button
     layout="topleft"
-    top="-5" 
-    left="335" 
-    width="20" 
-    height="20" 
+    top="-6" 
+    left="293" 
+    width="17" 
+    height="17" 
     follows="top|right"
     visible="false" 
     enabled="true" 
-    mouse_opaque="true" 
+    mouse_opaque="false" 
     name="hide_btn" 
     label="" 
     tab_stop="false"
-    image_unselected="toast_hide_btn.tga" 
-    image_disabled="toast_hide_btn.tga"
-    image_selected="toast_hide_btn.tga" 
-    image_hover_selected="toast_hide_btn.tga"
-    image_disabled_selected="toast_hide_btn.tga"
+    image_unselected="windows/Toast_CloseBtn.png" 
+    image_disabled="windows/Toast_CloseBtn.png"
+    image_selected="windows/Toast_CloseBtn.png" 
+    image_hover_selected="windows/Toast_CloseBtn.png"
+    image_disabled_selected="windows/Toast_CloseBtn.png"
   />
 </floater> 
-- 
cgit v1.2.3