diff options
Diffstat (limited to 'indra/newview/llnotificationlistitem.cpp')
| -rw-r--r-- | indra/newview/llnotificationlistitem.cpp | 192 |
1 files changed, 161 insertions, 31 deletions
diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp index 7f0e3460b1..f280dc0ed3 100644 --- a/indra/newview/llnotificationlistitem.cpp +++ b/indra/newview/llnotificationlistitem.cpp @@ -37,9 +37,13 @@ LLNotificationListItem::LLNotificationListItem(const Params& p) : LLPanel(p), mParams(p), mTitleBox(NULL), - mCloseBtn(NULL) + mExpandBtn(NULL), + mCondenseBtn(NULL), + mCloseBtn(NULL), + mCondensedViewPanel(NULL), + mExpandedViewPanel(NULL), + mMainPanel(NULL) { - mID = p.notification_id; mNotificationName = p.notification_name; } @@ -47,13 +51,42 @@ BOOL LLNotificationListItem::postBuild() { BOOL rv = LLPanel::postBuild(); mTitleBox = getChild<LLTextBox>("notification_title"); + mTitleBoxExp = getChild<LLTextBox>("notification_title_exp"); + mNoticeTextExp = getChild<LLTextBox>("notification_text_exp"); + mTimeBox = getChild<LLTextBox>("notification_time"); + mTimeBoxExp = getChild<LLTextBox>("notification_time_exp"); + mExpandBtn = getChild<LLButton>("expand_btn"); + mCondenseBtn = getChild<LLButton>("condense_btn"); mCloseBtn = getChild<LLButton>("close_btn"); + mCloseBtnExp = getChild<LLButton>("close_expanded_btn"); + mVerticalStack = getChild<LLLayoutStack>("item_vertical_stack"); mTitleBox->setValue(mParams.title); + mTitleBoxExp->setValue(mParams.title); + mNoticeTextExp->setValue(mParams.title); + mTimeBox->setValue(buildNotificationDate(mParams.time_stamp)); + mTimeBoxExp->setValue(buildNotificationDate(mParams.time_stamp)); + mExpandBtn->setClickedCallback(boost::bind(&LLNotificationListItem::onClickExpandBtn,this)); + mCondenseBtn->setClickedCallback(boost::bind(&LLNotificationListItem::onClickCondenseBtn,this)); + + //mCloseBtn and mCloseExpandedBtn share the same callback mCloseBtn->setClickedCallback(boost::bind(&LLNotificationListItem::onClickCloseBtn,this)); + mCloseBtnExp->setClickedCallback(boost::bind(&LLNotificationListItem::onClickCloseBtn,this)); + + mCondensedViewPanel = getChild<LLPanel>("layout_panel_condensed_view"); + mExpandedViewPanel = getChild<LLPanel>("layout_panel_expanded_view"); + mMainPanel = getChild<LLPanel>("main_panel"); + + std::string expanded_heigt_str = getString("item_expanded_height"); + std::string condensed_heigt_str = getString("item_condensed_height"); + + mExpandedHeight = (S32)atoi(expanded_heigt_str.c_str()); + mCondensedHeight = (S32)atoi(condensed_heigt_str.c_str()); + + setExpanded(FALSE); return rv; } @@ -90,10 +123,9 @@ void LLNotificationListItem::onClickCloseBtn() BOOL LLNotificationListItem::handleMouseDown(S32 x, S32 y, MASK mask) { BOOL res = LLPanel::handleMouseDown(x, y, mask); - if(!mCloseBtn->getRect().pointInRect(x, y)) //if(!mCloseBtn->getRect().pointInRect(x, y)) //if(!mCloseBtn->getLocalRect().pointInRect(x, y)) - mOnItemClick(this); + //mOnItemClick(this); return res; } @@ -134,6 +166,36 @@ std::set<std::string> LLNotificationListItem::getTransactionTypes() return LLTransactionNotificationListItem::getTypes(); } +void LLNotificationListItem::onClickExpandBtn() +{ + setExpanded(TRUE); +} + +void LLNotificationListItem::onClickCondenseBtn() +{ + setExpanded(FALSE); +} + +void setPanelSize(LLView* panel, S32 width, S32 height, BOOL called_from_parent) +{ + LLRect rect = panel->getRect(); + panel->reshape(width, height, called_from_parent); +} + +void LLNotificationListItem::setExpanded(BOOL value) +{ + mCondensedViewPanel->setVisible(!value); + mExpandedViewPanel->setVisible(value); + if (value) + { + setPanelSize(this, 331, mExpandedHeight, FALSE); + } + else + { + setPanelSize(this, 331, mCondensedHeight, FALSE); + } +} + std::set<std::string> LLInviteNotificationListItem::getTypes() { std::set<std::string> types; @@ -179,11 +241,21 @@ LLInviteNotificationListItem::LLInviteNotificationListItem(const Params& p) BOOL LLInviteNotificationListItem::postBuild() { BOOL rv = LLNotificationListItem::postBuild(); + mGroupIcon = getChild<LLGroupIconCtrl>("group_icon"); + mGroupIconExp = getChild<LLGroupIconCtrl>("group_icon_exp"); + mGroupNameBoxExp = getChild<LLTextBox>("group_name_exp"); + mGroupIcon->setValue(mParams.group_id); - mGroupIcon->setVisible(TRUE); - mGroupID = mParams.group_id; - mSenderBox = getChild<LLTextBox>("sender_resident"); + mGroupIconExp->setValue(mParams.group_id); + + mGroupIcon->setVisible(TRUE); + mGroupIconExp->setVisible(TRUE); + + mGroupId = mParams.group_id; + + mSenderBox = getChild<LLTextBox>("sender_resident"); + mSenderBoxExp = getChild<LLTextBox>("sender_resident_exp"); if (!mParams.sender.empty()) { LLStringUtil::format_map_t string_args; @@ -191,48 +263,106 @@ BOOL LLInviteNotificationListItem::postBuild() std::string sender_text = getString("sender_resident_text", string_args); mSenderBox->setValue(sender_text); mSenderBox->setVisible(TRUE); + mSenderBoxExp->setValue(sender_text); + mSenderBoxExp->setVisible(TRUE); } else { - mSenderBox->setVisible(FALSE); - } + mSenderBox->setVisible(FALSE); + mSenderBoxExp->setVisible(FALSE); + } + + LLSD value(mParams.group_id); + setGroupId(value); + return rv; } +void LLInviteNotificationListItem::changed(LLGroupChange gc) +{ + if (GC_PROPERTIES == gc) + { + updateFromCache(); + } +} + +bool LLInviteNotificationListItem::updateFromCache() +{ + LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(mGroupId); + if (!group_data) return false; + if (!group_data->mName.empty()) + { + LLStringUtil::format_map_t string_args; + string_args["[GROUP_NAME]"] = llformat("%s", group_data->mName.c_str()); + std::string group_name = getString("group_name_text", string_args); + mGroupNameBoxExp->setValue(group_name); + mGroupNameBoxExp->setVisible(TRUE); + } + else + { + mGroupNameBoxExp->setValue(LLStringUtil::null); + } + return true; +} + +void LLInviteNotificationListItem::setGroupId(const LLUUID& value) +{ + LLGroupMgr* gm = LLGroupMgr::getInstance(); + if (mGroupId.notNull()) + { + gm->removeObserver(this); + } + + mID = mGroupId; // set LLGroupMgrObserver::mID to make callbacks work + + // Check if cache already contains image_id for that group + if (!updateFromCache()) + { + gm->addObserver(this); + gm->sendGroupPropertiesRequest(mGroupId); + } +} + LLTransactionNotificationListItem::LLTransactionNotificationListItem(const Params& p) : LLNotificationListItem(p), - mTransactionIcon(NULL) + mTransactionIcon(NULL) { - buildFromFile("panel_notification_list_item.xml"); + buildFromFile("panel_notification_list_item.xml"); } BOOL LLTransactionNotificationListItem::postBuild() { - BOOL rv = LLNotificationListItem::postBuild(); - if (mParams.notification_name == "PaymentReceived") - { - mTransactionIcon = getChild<LLIconCtrl>("incoming_transaction_icon"); - } - else if (mParams.notification_name == "PaymentSent") - { - mTransactionIcon = getChild<LLIconCtrl>("outcoming_transaction_icon"); - } - if(mTransactionIcon) - mTransactionIcon->setVisible(TRUE); - return rv; + BOOL rv = LLNotificationListItem::postBuild(); + if (mParams.notification_name == "PaymentReceived") + { + mTransactionIcon = getChild<LLIconCtrl>("incoming_transaction_icon"); + mTransactionIconExp = getChild<LLIconCtrl>("incoming_transaction_icon_exp"); + } + else if (mParams.notification_name == "PaymentSent") + { + mTransactionIcon = getChild<LLIconCtrl>("outcoming_transaction_icon"); + mTransactionIconExp = getChild<LLIconCtrl>("outcoming_transaction_icon_exp"); + } + if(mTransactionIcon) + mTransactionIcon->setVisible(TRUE); + if(mTransactionIconExp) + mTransactionIconExp->setVisible(TRUE); + return rv; } LLSystemNotificationListItem::LLSystemNotificationListItem(const Params& p) : LLNotificationListItem(p), - mSystemNotificationIcon(NULL) + mSystemNotificationIcon(NULL) { - buildFromFile("panel_notification_list_item.xml"); + buildFromFile("panel_notification_list_item.xml"); } BOOL LLSystemNotificationListItem::postBuild() { - BOOL rv = LLNotificationListItem::postBuild(); - mSystemNotificationIcon = getChild<LLIconCtrl>("system_notification_icon"); - if (mSystemNotificationIcon) - mSystemNotificationIcon->setVisible(TRUE); - return rv; + BOOL rv = LLNotificationListItem::postBuild(); + mSystemNotificationIcon = getChild<LLIconCtrl>("system_notification_icon"); + mSystemNotificationIconExp = getChild<LLIconCtrl>("system_notification_icon_exp"); + if (mSystemNotificationIcon) + mSystemNotificationIcon->setVisible(TRUE); + if (mSystemNotificationIconExp) + mSystemNotificationIconExp->setVisible(TRUE); + return rv; } - |