From 68db6412c7177d0a8c6630c82760355578b39722 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 21 May 2010 19:16:15 +0300
Subject: EXT-6555 FIXED Made 'Add to outfits' and 'Edit outfit' panels
 visually connected to the buttons bar below

- Made 'Add to outfits' and 'Edit outfit' panels visually connected to the buttons bar below

Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/416/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_wearable.xml   | 99 ++++++++++++----------
 .../skins/default/xui/en/panel_outfit_edit.xml     | 21 +++--
 2 files changed, 71 insertions(+), 49 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 40fcc1d76c..71f740590b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -233,7 +233,7 @@ left="0"
 	 </panel>
 	 <panel
 		 follows="all"
-		 height="400"
+		 height="408"
 		 layout="topleft"
 		 left="0"
 		 name="edit_subpanel_container"
@@ -244,7 +244,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shape.xml"
 			 follows="all"
-			 height="400"
+			 height="408"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shape_panel"
@@ -254,7 +254,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_skin.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_skin_panel"
@@ -264,7 +264,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_hair.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_hair_panel"
@@ -274,7 +274,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_eyes.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_eyes_panel"
@@ -284,7 +284,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shirt.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shirt_panel"
@@ -294,7 +294,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_pants.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_pants_panel"
@@ -304,7 +304,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shoes.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shoes_panel"
@@ -314,7 +314,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_socks.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_socks_panel"
@@ -324,7 +324,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_jacket.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_jacket_panel"
@@ -334,7 +334,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_skirt.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_skirt_panel"
@@ -344,7 +344,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_gloves.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_gloves_panel"
@@ -354,7 +354,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_undershirt.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_undershirt_panel"
@@ -364,7 +364,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_underpants.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_underpants_panel"
@@ -374,7 +374,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_alpha.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_alpha_panel"
@@ -384,7 +384,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_tattoo.xml"
 			 follows="all"
-			 height="392"
+			 height="400"
 			 layout="topleft"
 			 left="0"
 			 name="edit_tattoo_panel"
@@ -393,58 +393,71 @@ left="0"
 			 width="333" />
 	 </panel>
      <panel
-        follows="left|right|bottom"
-        height="38"
+        follows="bottom|left|right"
+        height="25"
         label="gear_buttom_panel"
-        layout="bottom|left|right"
+        layout="topleft"
         left="0"
-        bottom="25"
         name="gear_buttom_panel"
+        top_pad="0"
         width="333">
         <button
             follows="bottom|left"
             tool_tip="Options"
-            height="18"
+            height="25"
+            image_hover_unselected="Toolbar_Left_Over"
             image_disabled="OptionsMenu_Disabled"
-            image_selected="OptionsMenu_Press"
-            image_unselected="OptionsMenu_Off"
+            image_overlay="OptionsMenu_Off"
+            image_selected="Toolbar_Left_Selected"
+            image_unselected="Toolbar_Left_Off"
             layout="topleft"
             left="10"
             name="friends_viewsort_btn"
-            top="10"
-            width="18" />
+            top="0"
+            width="31" />
         <button
             follows="bottom|left"
-            height="18"
-            image_selected="AddItem_Press"
-            image_unselected="AddItem_Off"
+            height="25"
+            image_hover_unselected="Toolbar_Middle_Over"
+            image_overlay="AddItem_Off"
+            image_selected="Toolbar_Middle_Selected"
+            image_unselected="Toolbar_Middle_Off"
             image_disabled="AddItem_Disabled"
             layout="topleft"
-            left_pad="10"
+            left_pad="1"
             name="add_btn"
             tool_tip="TODO"
-            width="18" />
+            width="31" />
+        <icon
+            follows="bottom|left|right"
+            height="25"
+            image_name="Toolbar_Middle_Off"
+            layout="topleft"
+            left_pad="1"
+            name="dummy_right_icon"
+            width="218" >
+        </icon>
         <button
-            follows="bottom|left"
-            height="18"
-            image_selected="TrashItem_Press"
-            image_unselected="TrashItem_Off"
+            follows="bottom|right"
+            height="25"
+            image_hover_unselected="Toolbar_Right_Over"
+            image_overlay="TrashItem_Off"
+            image_selected="Toolbar_Right_Selected"
+            image_unselected="Toolbar_Right_Off"
             image_disabled="TrashItem_Disabled"
             layout="topleft"
-            left_pad="10"
-            right="-10"
+            left_pad="1"
             name="del_btn"
             tool_tip="TODO"
-            top_delta="0"
-            width="18" />
+            width="31" />
      </panel>
 	 <panel
 		 follows="bottom|left|right"
-		 height="25"
-		 layout="bottom|left|right"
-		 left="0"
+		 height="23"
+		 layout="topleft"
+		 left="2"
 		 name="button_panel"
-		 bottom="5"
+		 top_pad="6"
 		 width="333" >
 		 <button
 			 follows="bottomleft"
@@ -462,6 +475,6 @@ left="0"
 			 label="Revert"
 			 left_pad="7"
 			 name="revert_button"
-			 width="153" />
+			 width="152" />
 	 </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 454a808f02..b473a7a282 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -310,13 +310,13 @@
 		             allow_multi_select="true"
 		             border="false"
 		             follows="left|top|right|bottom"
-		             height="130"
+		             height="140"
 		             layout="topleft"
 		             left="0"
 		             mouse_opaque="false"
 		             name="inventory_items"
 		             top_pad="5"
-		             width="311"
+		             width="310"
 		             visible="false"/>
 		            <panel
 		             name="filtered_wearables_panel"
@@ -325,7 +325,7 @@
 		             layout="topleft"
 		             follows="left|top|right|bottom"
 		             border="false"
-		             height="130"
+		             height="140"
 		             left="0"
 		             mouse_opaque="false"
 		             width="311"
@@ -336,8 +336,8 @@
 		              allow_select="true"
 		              layout="topleft"
 		              follows="all"
-		              width="311"
-		              height="130"
+		              width="310"
+		              height="140"
 		              left="0"
 		              top="0"/>
 		            </panel>
@@ -354,7 +354,7 @@
              left="0"
              name="add_wearables_button_bar"
              top_pad="0"
-             width="300">
+             width="313">
                 <button
                  follows="bottom|left"
                  height="25"
@@ -406,6 +406,15 @@
                  name="add_to_outfit_btn"
                  top="1"
                  width="31" />
+                <icon
+                 follows="bottom|left|right"
+                 height="25"
+                 image_name="Toolbar_Right_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="dummy_right_icon"
+                 width="184" >
+                 </icon>
             </panel>
         </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3