Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Resolve "Remove lock option from item menu in guild inventory"

Browse Source
merge-requests/24/merge
Nuno Gonçalves (Ulukyn) 3 years ago
parent b6781af51e
commit 17c9dd061a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File

21
ryzom/client/src/interface_v3/action_handler_item.cpp
Unescape Escape View File

@ -208,7 +208,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
{ {
if(_CurrItemSheet && !WindowName.empty()) if(_CurrItemSheet && !WindowName.empty())
{ {
const CItemSheet *pIS = _CurrItemSheet->asItemSheet(); const CItemSheet *pIS = _CurrItemSheet->asItemSheet();
if ((pIS != NULL) && ITEMFAMILY::isTextCustomizable(pIS->Family) ) if ((pIS != NULL) && ITEMFAMILY::isTextCustomizable(pIS->Family) )
{ {
@ -342,7 +342,7 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
// ******************************************************************************************** // ********************************************************************************************
void CInterfaceItemEdition::CItemEditionWindow::end() void CInterfaceItemEdition::CItemEditionWindow::end()
{ {
CDBCtrlSheet *pCSItem = _CurrItemSheet; CDBCtrlSheet *pCSItem = _CurrItemSheet;
std::string windowName = WindowName; std::string windowName = WindowName;
if(pCSItem && !windowName.empty()) if(pCSItem && !windowName.empty())
@ -371,7 +371,7 @@ void CInterfaceItemEdition::CItemEditionWindow::end()
editBoxShort->setActive(false); editBoxShort->setActive(false);
editShort->setActive(false); editShort->setActive(false);
editBoxLarge->setActive(false); editBoxLarge->setActive(false);
editLarge->setActive(false); editLarge->setActive(false);
display->setActive(false); display->setActive(false);
editButtons->setActive(false); editButtons->setActive(false);
closeButton->setActive(false); closeButton->setActive(false);
@ -413,7 +413,7 @@ void CInterfaceItemEdition::CItemEditionWindow::validate()
textValid = editLarge->getActive(); textValid = editLarge->getActive();
text = editBoxLarge->getInputString(); text = editBoxLarge->getInputString();
} }
if (textValid) if (textValid)
{ {
CBitMemStream out; CBitMemStream out;
@ -1722,7 +1722,7 @@ void CItemMenuInBagInfoWaiter::infoReceived()
void CItemMenuInBagInfoWaiter::infoValidated(CDBCtrlSheet* ctrlSheet) void CItemMenuInBagInfoWaiter::infoValidated(CDBCtrlSheet* ctrlSheet)
{ {
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
// get the dialog stack // get the dialog stack
CInterfaceGroup* pMenu = dynamic_cast<CInterfaceGroup*>( CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag") ); CInterfaceGroup* pMenu = dynamic_cast<CInterfaceGroup*>( CWidgetManager::getInstance()->getElementFromId("ui:interface:item_menu_in_bag") );
if(!pMenu) return; if(!pMenu) return;
@ -2036,7 +2036,7 @@ class CHandlerItemMenuCheck : public IActionHandler
if (pMoveSubMenu) pMoveSubMenu->setActive(false); if (pMoveSubMenu) pMoveSubMenu->setActive(false);
} }
if (bIsLockedByOwner) if (bIsLockedByOwner)
{ {
if (pLockUnlock) pLockUnlock->setHardText("uimUnlockItem"); if (pLockUnlock) pLockUnlock->setHardText("uimUnlockItem");
// Cannot drop/destroy if locked by owner // Cannot drop/destroy if locked by owner
@ -2049,7 +2049,8 @@ class CHandlerItemMenuCheck : public IActionHandler
} }
// Only show lock menu item if inventory contains the info // Only show lock menu item if inventory contains the info
if (pLockUnlock) pLockUnlock->setActive(pCS->canOwnerLock()); if (invId!=INVENTORIES::guild)
if (pLockUnlock) pLockUnlock->setActive(pCS->canOwnerLock());
// **** Gray Entries // **** Gray Entries
@ -2206,7 +2207,7 @@ class CHandlerItemMenuBaseCheck : public IActionHandler
CViewTextMenu *pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy")); CViewTextMenu *pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
CViewTextMenu *pLockUnlock = dynamic_cast<CViewTextMenu*>(pMenu->getView("lockunlock")); CViewTextMenu *pLockUnlock = dynamic_cast<CViewTextMenu*>(pMenu->getView("lockunlock"));
if (pCS->getLockedByOwner()) if (pCS->getLockedByOwner())
{ {
pLockUnlock->setHardText("uimUnlockItem"); pLockUnlock->setHardText("uimUnlockItem");
// Cannot destroy if locked by owner // Cannot destroy if locked by owner
@ -2363,7 +2364,7 @@ class CHandlerItemTextDisplay : public IActionHandler
std::string const& windowName = sParams; std::string const& windowName = sParams;
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CDBCtrlSheet *pCSItem = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal()); CDBCtrlSheet *pCSItem = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
if (pCSItem == NULL || windowName.empty()) if (pCSItem == NULL || windowName.empty())
return; return;
const CItemSheet *pIS = pCSItem->asItemSheet(); const CItemSheet *pIS = pCSItem->asItemSheet();
@ -2384,7 +2385,7 @@ class CHandlerItemTextEdition : public IActionHandler
std::string const& windowName = sParams; std::string const& windowName = sParams;
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CDBCtrlSheet *pCSItem = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal()); CDBCtrlSheet *pCSItem = dynamic_cast<CDBCtrlSheet*>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
if (pCSItem == NULL || windowName.empty()) if (pCSItem == NULL || windowName.empty())
return; return;
CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, true); CInterfaceItemEdition::getInstance()->setCurrWindow(pCSItem, windowName, true);

Write Preview
Loading…
Cancel
Save