From 69833aff50b1d1d360ff5568314d347dd3df40f5 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 1 Apr 2010 13:35:25 +0300
Subject: drafted out edit outfit panel XUI layout as major part of EXT-6548
 Edit Outfit: Clean up XUI to allow all elements to fit properly in the panel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/143/

--HG--
branch : product-engine
---
 indra/newview/llpaneloutfitedit.cpp                |  13 +-
 indra/newview/llpaneloutfitedit.h                  |   4 +-
 .../skins/default/xui/en/panel_outfit_edit.xml     | 540 +++++++++++++--------
 .../default/xui/en/panel_outfits_inventory.xml     |   4 +-
 .../skins/default/xui/en/sidepanel_appearance.xml  |   9 +-
 5 files changed, 347 insertions(+), 223 deletions(-)

diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 421181dda1..ba22adc01c 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -62,7 +62,7 @@
 #include "llsidepanelappearance.h"
 #include "llwearablelist.h"
 
-static LLRegisterPanelClassWrapper<LLPanelOutfitEdit> t_look("panel_outfit_edit");
+static LLRegisterPanelClassWrapper<LLPanelOutfitEdit> t_outfit_edit("panel_outfit_edit");
 
 const U64 WEARABLE_MASK = (1LL << LLInventoryType::IT_WEARABLE);
 const U64 ATTACHMENT_MASK = (1LL << LLInventoryType::IT_ATTACHMENT) | (1LL << LLInventoryType::IT_OBJECT);
@@ -158,7 +158,9 @@ BOOL LLPanelOutfitEdit::postBuild()
 	// gInventory.isInventoryUsable() no longer needs to be tested per Richard's fix for race conditions between inventory and panels
 		
 	mLookName = getChild<LLTextBox>("curr_look_name"); 
-	
+
+	childSetCommitCallback("add_btn", boost::bind(&LLPanelOutfitEdit::showAddWearablesPanel, this), NULL);
+
 	/*
 	mLookContents->setDoubleClickCallback(onDoubleClickSpeaker, this);
 	mLookContents->setCommitOnSelectionChange(TRUE);
@@ -229,6 +231,11 @@ BOOL LLPanelOutfitEdit::postBuild()
 	return TRUE;
 }
 
+void LLPanelOutfitEdit::showAddWearablesPanel()
+{
+	childSetVisible("add_wearables_panel", childGetValue("add_btn"));
+}
+
 void LLPanelOutfitEdit::onTypeFilterChanged(LLUICtrl* ctrl)
 {
 	LLComboBox* type_filter = dynamic_cast<LLComboBox*>(ctrl);
@@ -500,7 +507,7 @@ void LLPanelOutfitEdit::displayLookInfo(const LLInventoryCategory* pLook)
 	if (mLookID != pLook->getUUID())
 	{
 		mLookID = pLook->getUUID();
-		mLookName->setText("Look: " + pLook->getName());
+		mLookName->setText(pLook->getName());
 		updateLookInfo();
 	}
 }
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 09ec51c056..5c00f84e0e 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -88,7 +88,9 @@ public:
 	/*virtual*/ void setParcelID(const LLUUID& parcel_id);
 		// Sends a request for data about the given parcel, which will
 		// only update the location if there is none already available.
-	
+
+	void showAddWearablesPanel();
+
 	void onTypeFilterChanged(LLUICtrl* ctrl);
 	void onSearchEdit(const std::string& string);
 	void onInventorySelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
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 d4924562fb..535e24f3d9 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Side tray Outfit Edit panel -->
 <panel
-  background_visible="true"
-  border="false"
-	height="570"
-	follows="all"
-	label="Look Info"
-	layout="topleft"
-	name="look_info"
-	width="320">
+ background_visible="true"
+ border="false"
+ height="600"
+ follows="all"
+ label="Outfit Edit"
+ layout="topleft"
+ left="0"
+ min_height="350"
+ name="outfit_edit"
+ top="0"
+ width="320">
+	
 	<panel.string
 		name="not_available">
 		(N\A)
@@ -16,218 +21,325 @@
 		name="unknown">
 		(unknown)
 	</panel.string>
-	<panel
-		background_visible="true"
-		bevel_style="none"
-		follows="left|top|right|bottom"
-		height="530"
-		label="Outfit"
-		layout="topleft"
-		name="look_management_panel"
-		width="320">
-        <panel
-          follows="left|right|top"
-            header_visible="false"
-            layout="topleft"
-            min_height="300"
-            name="look_group"
-            title="Outfit Group"
-          top="0">
+
+
+    <button
+     follows="top|left"
+     height="23"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     left="5"
+     tab_stop="false"
+     top="2"
+     width="23" />
+    <text
+     follows="top|right"
+     font="SansSerifHugeBold"
+     height="26"
+     layout="topleft"
+     left_pad="20"
+     name="title"
+     text_color="LtGray"
+     top="0"
+     value="Edit Outfit"
+     use_ellipses="true"
+     width="275" /> 
+
+<!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" -->
+    <panel
+     bevel_style="none"
+     follows="top|left|right"
+     height="45"
+     label="bottom_panel"
+     layout="topleft"
+     left="5"
+     name="header_panel"
+     top_pad="5" 
+     width="300">
+        <icon
+         follows="left|top"
+         height="40"
+         image_name="t-shirt-image"
+         left="2"
+         mouse_opaque="false"
+         name="outfit_icon"
+         top="1"
+         scale_image="true"
+         visible="true"
+         width="35" />
             <panel
-                follows="left|right|top"
-                height="210"
-                layout="topleft"
-                top_pad="0"
-                name="look_info_group_bar"
-                width="295">
+             bevel_style="none"
+             follows="top|right"
+             height="40"
+             label="bottom_panel"
+             layout="topleft"
+             left_pad="10"
+             name="outfit_name_and_status"
+             top="2"
+             width="200">
                 <text
-                    type="string"
-                    length="1"
-                    follows="left|top"
-                    height="20"
-                    layout="topleft"
-                    mouse_opaque="false"
-                    name="curr_look_name"
-                    width="175">
-                    Look: [LOOK]
-                </text>
+                 follows="top|left|right"
+                 font="SansSerif"
+                 height="13"
+                 layout="topleft"
+                 name="status"
+                 text_color="Green"
+                 top="0"
+                 value="Editing..."
+                 use_ellipses="true"
+                 width="275" /> 
+                <text
+                 follows="bottom|left|right"
+                 font="SansSerifHugeBold"
+                 height="26"
+                 layout="topleft"
+                 name="curr_look_name"
+                 text_color="LtGray"
+                 top_pad="0"
+                 value="[Current Outfit]"
+                 use_ellipses="true"
+                 width="275" /> 
+            </panel>
+    </panel>
+
+
+<!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+    <layout_stack
+     animate="false"
+     default_tab_group="2"
+     follows="all"
+     height="470"
+     width="300"
+     layout="topleft"
+     orientation="vertical"
+     name="im_panels"
+     tab_group="1"
+     top_pad="10"
+     left="5">
+        <layout_panel
+         layout="topleft"
+         follows="left|top|right"
+         height="220"
+         label="IM Control Panel"
+         min_height="100"
+         name="outfit_wearables_panel"
+         width="300"
+         auto_resize="true"
+         user_resize="true">
+
+            <scroll_list
+             width="300"
+             column_padding="0"
+             draw_heading="false"
+             draw_stripes="false"
+             follows="left|top|right|bottom"
+             layout="topleft"
+             name="look_items_list"
+             search_column="1"
+             sort_column="2"
+             left="0"
+             height="193"
+             top="0">
+                <scroll_list.columns
+                 label="Look Item"
+                 name="look_item"
+                 width="285" />
+                <scroll_list.columns
+                 label="Outfit Item Sort"
+                 width="0"
+                 sort_column="look_item_sort"
+                 name="look_item_sort" />
+            </scroll_list>
+
+            <panel
+             background_visible="true"
+             bevel_style="none"
+             follows="bottom|left|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="edit_panel"
+             top_pad="0"
+             width="300">
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Left_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Left_Selected"
+                 image_unselected="Toolbar_Left_Off"
+                 layout="topleft"
+                 left="0"
+                 name="gear_menu_btn"
+                 top="1"
+                 width="31" />
                 <button
-                    follows="left|top"
-                    height="20"
-                    label="Wear"
-                    layout="topleft"
-                    name="wear_look_btn"
-                    left_pad="5"
-                    top_pad="-24"
-                    width="65" />
+                 is_toggle="true"
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="1"
+                 name="add_btn"
+                 top="1"
+                 width="31" />
                 <button
-                    follows="left|top"
-                    height="20"
-                    layout="topleft"
-                    left_pad="5"
-                    name="back_btn"
-                    width="20" />
+                 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|right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 name="trash_btn"
+                 right="-1"
+                 top="1"
+                 width="31" />
             </panel>
-        </panel>
+        </layout_panel>
+
+
+        <layout_panel
+         auto_resize="true"
+         default_tab_group="3"
+         height="250" 
+         min_height="120"
+         name="add_wearables_panel"
+         width="300"
+         tab_group="2"
+         user_resize="true">
+
+            <text
+             follows="top|left|right"
+             font="SansSerifBold"
+             height="13"
+             layout="topleft"
+             left="5"
+             name="status"
+             text_color="LtGray"
+             top="5"
+             value="Add Wearables"
+             use_ellipses="true"
+             width="275" />
+
+            <filter_editor
+             background_image="TextField_Search_Off"
+             follows="left|top|right"
+             font="SansSerif"
+             label="Filter"
+             layout="topleft"
+             left="5"
+             width="290"
+             height="20"
+             name="look_item_filter"
+             text_color="black"
+             text_pad_left="25" />
+
+            <inventory_panel
+             allow_multi_select="true"
+             border="false"
+             follows="left|top|right|bottom"
+             height="176"
+             layout="topleft"
+             left="0"
+             mouse_opaque="false"
+             name="inventory_items"
+             top_pad="5"
+             width="300"/>
 
-        <panel
-            follows="left|right|top"
-          height="200"
-          layout="topleft"
-          name="outfit_display"
-          top_pad="10"
-          width="320">
-          
-              <scroll_list
-                  width="285"
-                  column_padding="0"
-                  draw_heading="false"
-                  draw_stripes="false"
-                  follows="left|top|bottom|right"
-                  layout="topleft"
-                  name="look_items_list"
-                  search_column="1"
-                  sort_column="2"
-                  left="0"
-                  height="200"
-                  top_pad="0">
-                  <scroll_list.columns
-                      label="Look Item"
-                      name="look_item"
-                      width="285" />
-                  <scroll_list.columns
-                      label="Outfit Item Sort"
-                      width="0"
-                      sort_column="look_item_sort"
-                      name="look_item_sort" />
-              </scroll_list>
-              <button
-                  follows="left|top|right"
-                  height="20"
-                  label="-"
-                  left_pad="0"
-                  layout="topleft"
-                  name="edit_wearable_btn"
-                  width="20" />
-        </panel>
-        <panel
-          follows="all"
-            header_visible="false"
-            min_height="100"
-          left="0"
-            name="inventory_group"
-            title="My Inventory"
-          top_pad="10"
-          width="230">
             <panel
-                follows="left|right|top"
-                height="270"
-                name="lower_look_accordion"
-                width="295">
-                <panel
-                    follows="left|right|top"
-                    height="20"
-                    layout="topleft"
-                    name="inventory_bar"
-                    width="295">
-                    <text
-                        type="string"
-                        length="1"
-                        follows="left|top"
-                        height="20"
-                        layout="topleft"
-                        mouse_opaque="false"
-                        name="inventory_info_text"
-                        width="100">
-                        My Inventory
-                    </text>
-                    <combo_box
-                        follows="left"
-                        height="20"
-                        layout="topleft"
-                        left_pad="0"
-                        top_pad="-24"
-                        name="inventory_filter"
-                        tool_tip="Only show the selected inventory types"
-                        width="185" />
-                </panel>
-                <panel
-                    follows="left|right|top"
-                    height="20"
-                    layout="topleft"
-                    name="look_item_filter_bar"
-                    width="295">
-                    <filter_editor
-                        background_image="TextField_Search_Off"
-                        follows="left|top|right"
-                        font="SansSerif"
-                        label="Outfit Item Filter"
-                        layout="topleft"
-                        left="0"
-                        top_pad="0"
-                        width="270"
-                        height="20"
-                        name="look_item_filter"
-                        text_color="black"
-                        text_pad_left="25" />
-                </panel>
-                <panel
-                    follows="all"
-                    height="230"
-                    layout="topleft"
-                    name="inventory_panel"
-                    width="285">
-                    <inventory_panel
-                        allow_multi_select="true"
-                        border="true"
-                        follows="left|top|right|bottom"
-                        height="230"
-                        mouse_opaque="false"
-                        name="inventory_items"
-                        width="285"/>
-                </panel>
+             background_visible="true"
+             bevel_style="none"
+             follows="left|right|bottom"
+             height="27"
+             label="add_wearables_button_bar"
+             layout="topleft"
+             left="0"
+             name="add_wearables_button_bar"
+             top_pad="0"
+             width="300">
+                <button
+                 follows="bottom|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Left_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Left_Selected"
+                 image_unselected="Toolbar_Left_Off"
+                 layout="topleft"
+                 left="0"
+                 name="wearables_gear_menu_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"
+                 label="F"
+                 layout="topleft"
+                 left_pad="1"
+                 name="folder_view_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"
+                 label="L"
+                 layout="topleft"
+                 left_pad="1"
+                 name="list_view_btn"
+                 top="1"
+                 width="31" />
             </panel>
-        </panel>
-	</panel>
-	<panel
-		follows="left|right|bottom"
-		height="30"
-		layout="topleft"
-		left="5"
-		top_pad="0"
-		name="button_bar"
-		width="295">
-		<button
-			follows="top|left|right"
-			height="25"
-			label="Add"
-			left="0"
-			layout="topleft"
-			name="add_item_btn"
-			width="90" />
-		<button
-			follows="left|right"
-			height="25"
-			left_pad="0"
-			label="Remove"
-			layout="topleft"
-			name="remove_item_btn"
-			width="90" />
-		<button
-			follows="top|left|right"
-			height="25"
-			label="UP"
-			left_pad="0"
-			layout="topleft"
-			name="up_btn"
-			width="55" />
-		<button
-			follows="left|top|right"
-			height="25"
-			label="DOWN"
-			left_pad="0"
-			layout="topleft"
-			name="down_btn"
-			width="60" />
-	</panel>
+        </layout_panel>
+    </layout_stack>
+
+    <panel
+     follows="left|right|bottom"
+     height="30"
+     layout="topleft"
+     left="5"
+     top_pad="10"
+     name="save_revert_button_bar"
+     width="300">
+        <button
+         follows="bottom|left|right"
+         height="23"
+         label="Save"
+         left="0"
+         layout="topleft"
+         name="save_btn"
+         width="145" />
+        <button
+         follows="bottom|left|right"
+         height="23"
+         left_pad="15"
+         label="Revert"
+         layout="topleft"
+         name="revert_btn"
+         width="145" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 66ef373168..b297ec1988 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -119,13 +119,13 @@
 	 <button
 	  follows="bottom|left"
 		height="23" 
-		label="M" 
+		label="Edit Outfit" 
 		layout="topleft"
         right="-140"
 		name="look_edit_btn"
         top="26"
         visible="false" 
-		width="20" />
+		width="50" />
 	 </panel>
        
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 735635f1a0..20a1de59fc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -104,12 +104,15 @@ width="333">
    <panel
    class="panel_outfit_edit"
    filename="panel_outfit_edit.xml"
+   height="550"
    follows="all"
    layout="topleft"
-   left="0"
+   left="5"
+   min_height="410"
    name="panel_outfit_edit"
-   top="35"
-   visible="false" />
+   top="5"
+   visible="false" 
+   width="320"/>
    <panel
    class="panel_edit_wearable"
    filename="panel_edit_wearable.xml"
-- 
cgit v1.2.3