From 66e407c1ca9287796e6588ae1df3304c7ac87b98 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 30 Apr 2010 17:04:24 +0300
Subject: Completed task EXT-6548 (Edit Outfit: correct XUI: update status
 string, add t-shirt icon etc.).

- Removed temporary "up", "down", "new" buttons.
- Fixed misc positions/dimensions/fonts/colors/images.

Reviewed by Mike at https://codereview.productengine.com/secondlife/r/343/

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp                |   3 -
 .../skins/default/xui/en/panel_cof_wearables.xml   |  15 ++-
 .../skins/default/xui/en/panel_outfit_edit.xml     | 109 +++++++++------------
 .../skins/default/xui/en/sidepanel_appearance.xml  |   2 +-
 4 files changed, 52 insertions(+), 77 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index dbccd243da..c5b32e288a 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -234,9 +234,6 @@ BOOL LLPanelOutfitEdit::postBuild()
 	mWearableListManager = new LLFilteredWearableListManager(
 		getChild<LLInventoryItemsList>("filtered_wearables_list"), ALL_ITEMS_MASK);
 		
-	childSetAction("move_closer_btn", boost::bind(&LLPanelOutfitEdit::moveWearable, this, true));
-	childSetAction("move_further_btn", boost::bind(&LLPanelOutfitEdit::moveWearable, this, false));
-
 	return TRUE;
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d8a8dbbea4..f878dd0b19 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -3,23 +3,22 @@
  background_visible="true"
  bg_alpha_color="DkGray"
  border="false"
- bottom="0"
  follows="all"
- height="200"
+ height="373"
  left="0"
  name="cof_wearables"
- width="313">
+ width="311">
     <accordion
      follows="all"
      height="373"
      layout="topleft"
-     left="3"
+     left="0"
      single_expansion="true"
      top="0"
      name="cof_wearables_accordion"
      background_visible="true"
      bg_alpha_color="DkGray2"
-     width="307">
+     width="311">
         <accordion_tab
          layout="topleft"
          name="tab_attachments"
@@ -32,7 +31,7 @@
              left="0"
              name="list_attachments"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
@@ -46,7 +45,7 @@
              left="0"
              name="list_clothing"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
@@ -60,7 +59,7 @@
              left="0"
              name="list_body_parts"
              top="0"
-             width="307" />
+             width="311" />
         </accordion_tab>
     </accordion>
 </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 73181392c9..bf554217a6 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -69,19 +69,21 @@
 
 <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
     <panel
+     background_visible="true"
+     bg_alpha_color="DkGray2"
      bevel_style="none"
      follows="top|left|right"
-     height="45"
+     height="40"
      label="bottom_panel"
      layout="topleft"
-     left="5"
+     left="6"
      name="header_panel"
      top_pad="5" 
-     width="300">
+     width="311">
         <icon
          follows="left|top"
          height="40"
-         image_name="t-shirt-image"
+         image_name="TabIcon_Appearance_Off"
          left="2"
          mouse_opaque="false"
          name="outfit_icon"
@@ -92,35 +94,35 @@
             <panel
              bevel_style="none"
              follows="top|right"
-             height="40"
+             height="38"
              label="bottom_panel"
              layout="topleft"
-             left_pad="10"
+             left_pad="5"
              name="outfit_name_and_status"
              top="2"
-             width="200">
+             width="270">
                 <text
                  follows="top|left|right"
-                 font="SansSerif"
+                 font="SansSerifSmallBold"
                  height="13"
                  layout="topleft"
                  name="status"
-                 text_color="Green"
-                 top="0"
-                 value="Editing..."
+                 text_color="EmphasisColor"
+                 top="2"
+                 value="Now editing..."
                  use_ellipses="true"
-                 width="275" /> 
+                 width="270" /> 
                 <text
                  follows="bottom|left|right"
-                 font="SansSerifHugeBold"
+                 font="SansSerifLargeBold"
                  height="26"
                  layout="topleft"
                  name="curr_outfit_name"
                  text_color="LtGray"
-                 top_pad="0"
+                 top_pad="2"
                  value="[Current Outfit]"
                  use_ellipses="true"
-                 width="275" /> 
+                 width="270" /> 
             </panel>
     </panel>
 
@@ -130,22 +132,22 @@
      animate="false"
      default_tab_group="2"
      follows="all"
-     height="470"
-     width="300"
+     height="495"
+     width="313"
      layout="topleft"
      orientation="vertical"
      name="im_panels"
      tab_group="1"
-     top_pad="10"
+     top_pad="5"
      left="5">
         <layout_panel
          layout="topleft"
-         follows="left|top|right"
+         follows="all"
          height="220"
          label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
-         width="300"
+         width="313"
          auto_resize="true"
          user_resize="true">
 
@@ -157,10 +159,10 @@
              follows="left|top|right|bottom"
              height="193"
              layout="topleft"
-             left="0"
+             left="1"
              name="cof_wearables_list"
              top="0"
-             width="300" /> 
+             width="311" />
 
           <panel
              background_visible="true"
@@ -171,8 +173,8 @@
              layout="topleft"
              left="0"
              name="edit_panel"
-             top_pad="0"
-             width="300">
+             top="193"
+             width="313">
                 <button
                  follows="bottom|left"
                  height="25"
@@ -198,49 +200,22 @@
                  name="add_btn"
                  top="1"
                  width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="new_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Movement_Forward_On"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="move_closer_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Movement_Backward_On"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="move_further_btn"
-                 top="1"
-                 width="31" />
+		        <icon
+		         follows="bottom|left|right"
+		         height="25"
+		         image_name="Toolbar_Middle_Off"
+		         layout="topleft"
+		         left_pad="1"
+		         name="dummy_icon"
+		         width="216"
+		         />
                 <button
                  follows="bottom|right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="TrashItem_Off"
                  image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
+                 image_unselected="Toolbar_Right_Off"
                  layout="topleft"
                  name="remove_from_outfit_btn"
                  right="-1"
@@ -256,7 +231,7 @@
          height="210" 
          min_height="210"
          name="add_wearables_panel"
-         width="300"
+         width="313"
          tab_group="2"
          user_resize="true"
          visible="false">
@@ -449,7 +424,7 @@
      height="30"
      layout="topleft"
      left="5"
-     top_pad="10"
+     top_pad="2"
      name="save_revert_button_bar"
      width="300">
         <button
@@ -459,14 +434,17 @@
          left="0"
          layout="topleft"
          name="save_btn"
-         width="145" />
+         top="0"
+         width="155" />
         <button
          follows="bottom|right"
          height="23"
          name="save_flyout_btn"
          label=""
+         layout="topleft"
          left_pad="-20"
          tab_stop="false"
+         top="0"
          image_selected="SegmentedBtn_Right_Selected_Press"
          image_unselected="SegmentedBtn_Right_Off"
          image_pressed="SegmentedBtn_Right_Press"
@@ -476,10 +454,11 @@
         <button
          follows="bottom|left|right"
          height="23"
-         left_pad="15"
+         left_pad="13"
          label="Revert"
          layout="topleft"
          name="revert_btn"
+         top="0"
          width="145" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 73650a19dc..00b3328bde 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -106,7 +106,7 @@ width="333">
    <panel
    class="panel_outfit_edit"
    filename="panel_outfit_edit.xml"
-   height="550"
+   height="565"
    follows="all"
    layout="topleft"
    left="5"
-- 
cgit v1.2.3