From 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 14 Jan 2010 14:44:43 -0800
Subject: Backed out changeset f34a69c2af56

(this backs-out my backout, now that I'm happy the original merge works okay :))
---
 .../default/xui/en/widgets/chiclet_im_adhoc.xml    | 22 ++++++++--------
 .../default/xui/en/widgets/chiclet_im_group.xml    | 23 ++++++++---------
 .../default/xui/en/widgets/chiclet_im_p2p.xml      | 18 ++++++-------
 .../skins/default/xui/en/widgets/chiclet_offer.xml | 14 +++++-----
 .../default/xui/en/widgets/chiclet_script.xml      | 14 +++++-----
 .../default/xui/en/widgets/gesture_combo_box.xml   | 30 ----------------------
 .../default/xui/en/widgets/gesture_combo_list.xml  | 21 +++++++++++++++
 .../default/xui/en/widgets/location_input.xml      | 18 +++++++------
 8 files changed, 74 insertions(+), 86 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml

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

diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index af0d338256..693c43f141 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_adhoc
- font="SansSerif"
  height="25"
  name="im_adhoc_chiclet"
  show_speaker="false"
@@ -12,15 +11,14 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_adhoc.avatar_icon
      follows="left|top|bottom"
      height="22"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22"/>
+     width="22" />
     <chiclet_im_adhoc.unread_notifications
-     font="SansSerif"
      font_halign="center"
      height="25"
      left="25"
@@ -29,13 +27,13 @@
      text_color="white"
      v_pad="5"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_adhoc.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_Chiclet"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index b1988a2d20..f4fc58701c 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_group
- font="SansSerif"
  height="25"
  name="im_group_chiclet"
  show_speaker="false"
@@ -12,17 +11,17 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_group.group_icon
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="22"
+     height="18"
+  bottom_pad="4"
      mouse_opaque="true"
      name="group_icon"
-     width="22"/>
+     width="18" />
     <chiclet_im_group.unread_notifications
      height="25"
-     font="SansSerif"
      font_halign="center"
      left="25"
      mouse_opaque="false"
@@ -32,11 +31,11 @@
      visible="false"
      width="20"/>
     <chiclet_im_group.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_Chiclet"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 52fbce0de7..535113f717 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_p2p
- font="SansSerif"
  height="25"
  name="im_p2p_chiclet"
  show_speaker="false"
@@ -18,10 +17,9 @@
      height="22"
      mouse_opaque="true"
      name="avatar_icon"
-     width="22"/>
+     width="22" />
     <chiclet_im_p2p.unread_notifications
      height="25"
-     font="SansSerif"
      font_halign="center"
      left="25"
      mouse_opaque="false"
@@ -31,11 +29,11 @@
      visible="false"
      width="20"/>
     <chiclet_im_p2p.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_Chiclet"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_p2p>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 33f85a964c..86bea9be50 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_offer
- font="SansSerif"
  height="25"
  name="offer_chiclet"
  width="25">
  <chiclet_offer.icon
-  default_icon="Generic_Object_Small" 
+  default_icon="Generic_Object_Small"
   follows="all"
-  height="22"
+  height="20"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="22"/>
+  bottom_pad="2"
+  width="20" />
  <chiclet_offer.new_message_icon
-  bottom="12"
-  height="13"
+  bottom="11"
+  height="14"
   image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="13" />
+  width="14" />
 </chiclet_offer>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 560c8e6ea5..b1f9f5b0e8 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
- font="SansSerif"
  height="25"
  name="script_chiclet"
  width="25">
  <chiclet_script.icon
   follows="all"
-  height="22"
-  image_name="Generic_Object_Small" 
+  height="20"
+  image_name="Generic_Object_Small"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="22"/>
+  width="20"
+  bottom_pad="2" />
  <chiclet_script.new_message_icon
-  bottom="12"
-  height="13"
+  bottom="11"
+  height="14"
   image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="13" />
+  width="14" />
 </chiclet_script>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
deleted file mode 100644
index 4229f34c09..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<gesture_combo_box
-           label="Gestures" 
-           list_position="below"
-           max_chars="20"
-           follows="right|top">
-  <gesture_combo_box.combo_button name="Combobox Button"
-                          label=""
-                          hover_glow_amount="0.15"
-                          scale_image="true"
-                          image_unselected="ComboButton_Off"
-                          image_selected="ComboButton_Selected"
-                          image_disabled="ComboButton_Disabled"
-                          image_disabled_selected="ComboButton_Disabled_Selected" />
-  <gesture_combo_box.drop_down_button name="Drop Down Button"
-                              label=""
-                              halign="center"
-                              hover_glow_amount="0.15"
-                              scale_image="true"
-                 image_selected="PushButton_Selected_Press"
-                 image_pressed="PushButton_Press"
-		 image_pressed_selected="PushButton_Selected_Press"
-                              image_unselected="PushButton_Off"
-                              image_disabled="PushButton_Disabled"
-                              image_disabled_selected="PushButton_Selected_Disabled" />
-  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
-                                scroll_bar_bg_visible="false" />
-  <gesture_combo_box.combo_editor name="Combo Text Entry"
-                          select_on_focus="true" />
-</gesture_combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
new file mode 100644
index 0000000000..808683864d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<gesture_combo_list
+    follows="right|top">
+    <gesture_combo_list.combo_button
+     name="Combolist Button"
+     label=""
+     layout="topleft"
+     halign="center"
+     hover_glow_amount="0.15"
+     mouse_opaque="false"
+     scale_image="true"
+     image_selected="PushButton_Selected_Press"
+     image_pressed="PushButton_Press"
+     image_pressed_selected="PushButton_Selected_Press"
+     image_unselected="PushButton_Off"
+     image_disabled="PushButton_Disabled"
+     image_disabled_selected="PushButton_Selected_Disabled" />
+    <gesture_combo_list.combo_list 
+     bg_writeable_color="MenuDefaultBgColor"
+     scroll_bar_bg_visible="false" />
+</gesture_combo_list>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 67bb7c1896..1c0a8ba7c5 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -96,7 +96,7 @@
     name="damage_icon"
     width="14"
     height="13"
-    top="22"
+    top="25"
     left="2"
     follows="right|top"
     image_name="Parcel_Damage_Dark"
@@ -112,17 +112,19 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-
-  <combo_button name="Location History"
-                          label=""
-                          pad_right="0"/>
-  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
+  <combo_button
+		name="Location History"
+                label=""
+                pad_right="0"/>
+  <combo_list
+	      bg_writeable_color="MenuDefaultBgColor"
+	      page_lines="10"
               scroll_bar_bg_visible="true" />
   <combo_editor name="Combo Text Entry"
-                text_pad_left="22"
+                text_pad_left="27"
                 select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
                 border_style="line"
-                border.border_thickness="0"/>
+                border.border_thickness="0" />
 </location_input>
-- 
cgit v1.2.3