From 671625695fc44adc430a7ddf3be158ce26a61cc6 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 2 Jun 2010 20:46:16 +0300
Subject: EXT-6726 WIP Added more menus to the Appearance SP.

Done:
- Implemented creating new wearables via My Outfits gear menu.
- Implemented renaming/removing/editing an outfit via My Outfits context menu.
- Implemented "Attach to..." / "Attach to HUD..." context submenus.

- Now disabling (instead of hiding) irrelevant wearable context menu items.
- Added "Take Off / Detach" context menu item that's shown for clothes and attachments.
  Useful if you selected a bunch of items and want to take them all off.

- Fixed taking off an outfit
  (not all wearables were taken off because of a wrong inventory collector).
- Fixed crash when editing a skirt
  (reference to a missing string).

- In LLWearableItemsList::ContextMenu::updateItemsVisibility renamed variables
  and introduced MASK_UNKNOWN per Nyx's request.

Known issues:
- "Attach to..." context menus may be displayed partially off-screen
  (there is the same bug in the inventory panel).
- The way we invoke wearable editing panel after the wearable gets created
  is currently a hack.

TODO:
- Wear / take off / rename / delete an outfit via My Outfits gear menu
  (currently not implemented because of missing selection support in My Outfits).
- Add "Create new..." to body part / clothing context menu in Edit Outfit.
- Add "Create new..." submenus to the Edit Outfit gear menu.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/466/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_cof_attachment.xml   |   8 --
 .../skins/default/xui/en/menu_outfit_gear.xml      | 160 +++++++++++++++++++--
 .../skins/default/xui/en/menu_outfit_tab.xml       |  27 +++-
 .../default/xui/en/menu_wearable_list_item.xml     |  34 +++--
 .../newview/skins/default/xui/en/notifications.xml |  22 +++
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 6 files changed, 222 insertions(+), 30 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
index b422d87938..c402100fb1 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
@@ -10,12 +10,4 @@
          function="Attachment.Detach"
          parameter="detach"/>
     </menu_item_call>
-    <context_menu
-     label="Attach to"
-     layout="topleft"
-     name="attach_to" />
-    <context_menu
-     label="Attach to HUD"
-     layout="topleft"
-     name="attach_to_hud" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index dfc72b557c..3cae12e30c 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -7,8 +7,7 @@
      layout="topleft"
      name="wear">
         <on_click
-         function="Gear.OnClick"
-         parameter="wear"/>
+         function="Gear.Wear" />
         <on_enable
          function="Gear.OnEnable"
          parameter="wear" />
@@ -18,20 +17,164 @@
      layout="topleft"
      name="take_off">
         <on_click
-         function="Gear.OnClick"
-         parameter="take_off"/>
+         function="Gear.TakeOff" />
         <on_enable
          function="Gear.OnEnable"
          parameter="take_off" />
     </menu_item_call>
+
+            <menu_item_separator />
+            <!-- copied (with minor modifications) from menu_inventory_add.xml -->
+            <!--  *TODO: generate dynamically? -->
+            <menu
+             height="175"
+             label="New Clothes"
+             layout="topleft"
+             left_delta="0"
+             mouse_opaque="false"
+             name="New Clothes"
+             top_pad="514"
+             width="125">
+                <menu_item_call
+                 label="New Shirt"
+                 layout="topleft"
+                 name="New Shirt">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="shirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Pants"
+                 layout="topleft"
+                 name="New Pants">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="pants" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Shoes"
+                 layout="topleft"
+                 name="New Shoes">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="shoes" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Socks"
+                 layout="topleft"
+                 name="New Socks">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="socks" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Jacket"
+                 layout="topleft"
+                 name="New Jacket">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="jacket" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Skirt"
+                 layout="topleft"
+                 name="New Skirt">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="skirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Gloves"
+                 layout="topleft"
+                 name="New Gloves">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="gloves" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Undershirt"
+                 layout="topleft"
+                 name="New Undershirt">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="undershirt" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Underpants"
+                 layout="topleft"
+                 name="New Underpants">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="underpants" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Alpha"
+                 layout="topleft"
+                 name="New Alpha">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="alpha" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Tattoo"
+                 layout="topleft"
+                 name="New Tattoo">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="tattoo" />
+                </menu_item_call>
+            </menu>
+            <menu
+             height="85"
+             label="New Body Parts"
+             layout="topleft"
+             left_delta="0"
+             mouse_opaque="false"
+             name="New Body Parts"
+             top_pad="514"
+             width="118">
+                <menu_item_call
+                 label="New Shape"
+                 layout="topleft"
+                 name="New Shape">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="shape" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Skin"
+                 layout="topleft"
+                 name="New Skin">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="skin" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Hair"
+                 layout="topleft"
+                 name="New Hair">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="hair" />
+                </menu_item_call>
+                <menu_item_call
+                 label="New Eyes"
+                 layout="topleft"
+                 name="New Eyes">
+                    <menu_item_call.on_click
+                     function="Gear.Create"
+                     parameter="eyes" />
+                </menu_item_call>
+            </menu>
+            <!-- copied from menu_inventory_add.xml -->
+
     <menu_item_separator />
     <menu_item_call
      label="Rename"
      layout="topleft"
      name="rename">
         <on_click
-         function="Gear.OnClick"
-         parameter="rename"/>
+         function="Gear.Rename" />
         <on_enable
          function="Gear.OnEnable"
          parameter="rename" />
@@ -41,10 +184,9 @@
      layout="topleft"
      name="delete_outfit">
         <on_click
-         function="Gear.OnClick"
-         parameter="delete_outfit"/>
+         function="Gear.Delete" />
         <on_enable
          function="Gear.OnEnable"
-         parameter="delete_outfit" />
+         parameter="delete" />
     </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 8f3e62157a..67559638d9 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -8,6 +8,9 @@
      name="wear_replace">
         <on_click
          function="Outfit.WearReplace" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="wear_replace" />
     </menu_item_call>
     <menu_item_call
      label="Wear - Add to Current Outfit"
@@ -15,13 +18,29 @@
      name="wear_add">
         <on_click
          function="Outfit.WearAdd" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="wear_add" />
     </menu_item_call>
     <menu_item_call
-     label="Take Off - Remove Current Outfit"
+     label="Take Off - Remove from Current Outfit"
      layout="topleft"
      name="take_off">
         <on_click
          function="Outfit.TakeOff" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="take_off" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit Outfit"
+     layout="topleft"
+     name="edit">
+        <on_click
+         function="Outfit.Edit" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="edit" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call
@@ -30,6 +49,9 @@
      name="rename">
         <on_click
          function="Outfit.Rename" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="rename" />
     </menu_item_call>
     <menu_item_call
      label="Delete Outfit"
@@ -37,5 +59,8 @@
      name="delete">
         <on_click
          function="Outfit.Delete" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="delete" />
     </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 7ea7eaade5..46aca54eee 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -8,6 +8,13 @@
         <on_click
          function="Wearable.Wear" />
     </menu_item_call>
+    <menu_item_call
+     label="Take Off / Detach"
+     layout="topleft"
+     name="take_off_or_detach">
+        <on_click
+         function="Wearable.TakeOffDetach" />
+    </menu_item_call>
     <menu_item_call
      label="Detach"
      layout="topleft"
@@ -15,16 +22,14 @@
         <on_click
          function="Attachment.Detach" />
     </menu_item_call>
-<!-- *TODO: implement the submenus
-    <menu
-     label="Attach to"
+    <context_menu
+     label="Attach to  ▶"
      layout="topleft"
-     name="attach_to" />
-    <menu
-     label="Attach to HUD"
+     name="wearable_attach_to" />
+    <context_menu
+     label="Attach to HUD  ▶"
      layout="topleft"
-     name="attach_to_hud" />
--->
+     name="wearable_attach_to_hud" />
     <menu_item_call
      label="Object Profile"
      layout="topleft"
@@ -37,16 +42,14 @@
      layout="topleft"
      name="take_off">
         <on_click
-         function="Clothing.TakeOff"
-         parameter="take_off"/>
+         function="Clothing.TakeOff" />
     </menu_item_call>
     <menu_item_call
      label="Edit"
      layout="topleft"
      name="edit">
         <on_click
-         function="Wearable.Edit"
-         parameter="edit"/>
+         function="Wearable.Edit" />
     </menu_item_call>
     <menu_item_call
      label="Show Original"
@@ -55,4 +58,11 @@
         <on_click
          function="Wearable.ShowOriginal" />
     </menu_item_call>
+    <menu_item_call
+     label="Create New"
+     layout="topleft"
+     name="create_new">
+        <on_click
+         function="Wearable.CreateNew" />
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2590924b58..5ead756d20 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2068,6 +2068,28 @@ Would you be my friend?
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   label="Rename Outfit"
+   name="RenameOutfit"
+   type="alertmodal">
+    New outfit name:
+    <form name="form">
+      <input name="new_name" type="text">
+        [NAME]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="Offer"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="RemoveFromFriends"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2d424e7ab2..9d7079a495 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1830,6 +1830,7 @@ Clears (deletes) the media and all params from the given face.
 
   <!-- Wearable List-->
   <string name="NewWearable">New [WEARABLE_ITEM]</string>
+  <string name="CreateNewWearable">Create [WEARABLE_TYPE]</string>
   
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
-- 
cgit v1.2.3