livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up CoF context menu in appearance floater

Ansariel 2017-02-06 14:01:20 +01:00
parent 76fe127f76
commit cf6f34037c
10 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llpanelwearing.cpp
View File

@ -127,10 +127,9 @@ protected:
{
LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
// registrar.add("Wearing.Edit", boost::bind(&edit_outfit));
registrar.add("Wearing.Edit", boost::bind(&edit_outfit));
// [SL:KB] - Patch: Inventory-AttachmentEdit - Checked: 2010-09-04 (Catznip-2.2.0a) | Added: Catznip-2.1.2a
registrar.add("Wearing.EditItem", boost::bind(handleMultiple, edit_item, mUUIDs));
registrar.add("Wearing.EditOutfit", boost::bind(&edit_outfit));
// [/SL:KB]
registrar.add("Wearing.ShowOriginal", boost::bind(show_item_original, mUUIDs.front()));
registrar.add("Wearing.TakeOff",
@ -196,10 +195,6 @@ protected:
bool allow_detach = !bp_selected && !clothes_selected && attachments_selected;
bool allow_take_off = !bp_selected && clothes_selected && !attachments_selected;
// [SL:KB] - Patch: Inventory-AttachmentEdit - Checked: 2010-09-04 (Catznip-2.2.0a) | Added: Catznip-2.1.2a
menu->setItemVisible("edit_item", bp_selected || clothes_selected || attachments_selected);
menu->setItemEnabled("edit_item", 1 == mUUIDs.size());
// [/SL:KB]
menu->setItemVisible("take_off", allow_take_off);
menu->setItemVisible("detach", allow_detach);
// [SL:KB] - Patch: Inventory-AttachmentEdit - Checked: 2010-09-04 (Catznip-2.2.0a) | Added: Catznip-2.1.2a
@ -211,7 +206,11 @@ protected:
// [/RLVa:KB]
menu->setItemVisible("edit_outfit_separator", allow_take_off || allow_detach);
menu->setItemVisible("show_original", mUUIDs.size() == 1);
menu->setItemVisible("edit_item", FALSE);
// menu->setItemVisible("edit_item", FALSE);
// [SL:KB] - Patch: Inventory-AttachmentEdit - Checked: 2010-09-04 (Catznip-2.2.0a) | Added: Catznip-2.1.2a
menu->setItemVisible("edit_item", bp_selected || clothes_selected || attachments_selected);
menu->setItemEnabled("edit_item", 1 == mUUIDs.size());
// [/SL:KB]
}
};
@ -241,6 +240,9 @@ protected:
{
menu->setItemVisible("take_off", FALSE);
menu->setItemVisible("detach", TRUE);
// [SL:KB] - Patch: Inventory-AttachmentEdit - Checked: 2010-09-04 (Catznip-2.2.0a) | Added: Catznip-2.1.2a
menu->setItemVisible("take_off_or_detach", FALSE);
// [/SL:KB]
menu->setItemVisible("edit_outfit_separator", TRUE);
menu->setItemVisible("show_original", FALSE);
menu->setItemVisible("edit_item", TRUE);

1
indra/newview/skins/default/xui/de/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Bearbeiten" name="edit_item"/>
<menu_item_call label="Ausziehen" name="take_off"/>
<menu_item_call label="Abnehmen" name="detach"/>
<menu_item_call label="Ausziehen / Abnehmen" name="take_off_or_detach"/>

21
indra/newview/skins/default/xui/en/menu_wearing_tab.xml
View File

@ -2,13 +2,6 @@
<context_menu
layout="topleft"
name="Wearing">
<menu_item_call
label="Edit"
layout="topleft"
name="edit_item">
<on_click
function="Wearing.EditItem" />
</menu_item_call>
<menu_item_call
label="Take Off"
layout="topleft"
@ -34,13 +27,6 @@
<menu_item_separator
layout="topleft"
name="edit_outfit_separator" />
<menu_item_call
label="Edit Outfit"
layout="topleft"
name="edit">
<on_click
function="Wearing.EditOutfit" />
</menu_item_call>
<menu_item_call
label="Edit"
layout="topleft"
@ -55,4 +41,11 @@
<on_click
function="Wearing.ShowOriginal" />
</menu_item_call>
<menu_item_call
label="Edit Outfit"
layout="topleft"
name="edit">
<on_click
function="Wearing.Edit" />
</menu_item_call>
</context_menu>

1
indra/newview/skins/default/xui/es/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Editar" name="edit_item"/>
<menu_item_call label="Quitarme" name="take_off"/>
<menu_item_call label="Quitar" name="detach"/>
<menu_item_call label="Quitarme / Quitar" name="take_off_or_detach"/>

1
indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Modifier" name="edit_item"/>
<menu_item_call label="Retirer" name="take_off"/>
<menu_item_call label="Détacher" name="detach"/>
<menu_item_call label="Retirer / Détacher" name="take_off_or_detach"/>

1
indra/newview/skins/default/xui/it/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Modifica" name="edit_item"/>
<menu_item_call label="Togli" name="take_off"/>
<menu_item_call label="Stacca" name="detach"/>
<menu_item_call label="Togli / Stacca" name="take_off_or_detach"/>

1
indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="編集" name="edit_item"/>
<menu_item_call label="取り外す" name="take_off"/>
<menu_item_call label="取り外す" name="detach"/>
<menu_item_call label="取り外す" name="take_off_or_detach"/>

1
indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Edytuj" name="edit_item"/>
<menu_item_call label="Zdejmij" name="take_off"/>
<menu_item_call label="Odłącz" name="detach"/>
<menu_item_call label="Zdejmij/Odłącz" name="take_off_or_detach"/>

1
indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Editar" name="edit_item"/>
<menu_item_call label="Tirar" name="take_off"/>
<menu_item_call label="Tirar" name="detach"/>
<menu_item_call label="Tirar" name="take_off_or_detach"/>

1
indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Wearing">
<menu_item_call label="Редактировать" name="edit_item"/>
<menu_item_call label="Снять" name="take_off"/>
<menu_item_call label="Отсоединить" name="detach"/>
<menu_item_call label="Снять/Отсоединить" name="take_off_or_detach"/>