Start to break the lltextbox toast into its own toast class instead of mega-overloading the generic notification panel.
Tofu Linden
parent
2044179baf
commit
35962b54e0
|
|
@ -0,0 +1,214 @@
|
|||
/**
|
||||
* @file lltoastscripttextbox.cpp
|
||||
* @brief Panel for script llTextBox dialogs
|
||||
*
|
||||
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2010, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#include "llviewerprecompiledheaders.h"
|
||||
|
||||
#include "lltoastscripttextbox.h"
|
||||
|
||||
#include "llfocusmgr.h"
|
||||
|
||||
#include "llbutton.h"
|
||||
#include "lliconctrl.h"
|
||||
#include "llinventoryfunctions.h"
|
||||
#include "llnotifications.h"
|
||||
#include "llviewertexteditor.h"
|
||||
|
||||
#include "lluiconstants.h"
|
||||
#include "llui.h"
|
||||
#include "llviewercontrol.h"
|
||||
#include "lltrans.h"
|
||||
#include "llstyle.h"
|
||||
|
||||
#include "llglheaders.h"
|
||||
#include "llagent.h"
|
||||
#include "llavatariconctrl.h"
|
||||
#include "llfloaterinventory.h"
|
||||
#include "llinventorytype.h"
|
||||
|
||||
const S32 LLToastGroupNotifyPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT = 7;
|
||||
|
||||
LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification)
|
||||
: LLToastPanel(notification),
|
||||
mInventoryOffer(NULL)
|
||||
{
|
||||
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_notify_textbox.xml");
|
||||
const LLSD& payload = notification->getPayload();
|
||||
LLGroupData groupData;
|
||||
if (!gAgent.getGroupData(payload["group_id"].asUUID(),groupData))
|
||||
{
|
||||
llwarns << "Group notice for unknown group: " << payload["group_id"].asUUID() << llendl;
|
||||
}
|
||||
|
||||
//group icon
|
||||
LLIconCtrl* pGroupIcon = getChild<LLIconCtrl>("group_icon", TRUE);
|
||||
pGroupIcon->setValue(groupData.mInsigniaID);
|
||||
|
||||
//header title
|
||||
const std::string& from_name = payload["sender_name"].asString();
|
||||
std::stringstream from;
|
||||
from << from_name << "/" << groupData.mName;
|
||||
LLTextBox* pTitleText = getChild<LLTextBox>("title");
|
||||
pTitleText->setValue(from.str());
|
||||
|
||||
//message subject
|
||||
const std::string& subject = payload["subject"].asString();
|
||||
//message body
|
||||
const std::string& message = payload["message"].asString();
|
||||
|
||||
std::string timeStr = "["+LLTrans::getString("UTCTimeWeek")+"],["
|
||||
+LLTrans::getString("UTCTimeDay")+"] ["
|
||||
+LLTrans::getString("UTCTimeMth")+"] ["
|
||||
+LLTrans::getString("UTCTimeYr")+"] ["
|
||||
+LLTrans::getString("UTCTimeHr")+"]:["
|
||||
+LLTrans::getString("UTCTimeMin")+"]:["
|
||||
+LLTrans::getString("UTCTimeSec")+"] ["
|
||||
+LLTrans::getString("UTCTimeTimezone")+"]";
|
||||
const LLDate timeStamp = notification->getDate();
|
||||
LLDate notice_date = timeStamp.notNull() ? timeStamp : LLDate::now();
|
||||
LLSD substitution;
|
||||
substitution["datetime"] = (S32) notice_date.secondsSinceEpoch();
|
||||
LLStringUtil::format(timeStr, substitution);
|
||||
|
||||
LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
|
||||
pMessageText->clear();
|
||||
|
||||
LLStyle::Params style;
|
||||
LLFontGL* subject_font = LLFontGL::getFontByName(getString("subject_font"));
|
||||
if (subject_font)
|
||||
style.font = subject_font;
|
||||
pMessageText->appendText(subject, FALSE, style);
|
||||
|
||||
LLFontGL* date_font = LLFontGL::getFontByName(getString("date_font"));
|
||||
if (date_font)
|
||||
style.font = date_font;
|
||||
pMessageText->appendText(timeStr + "\n", TRUE, style);
|
||||
|
||||
style.font = pMessageText->getDefaultFont();
|
||||
pMessageText->appendText(message, TRUE, style);
|
||||
|
||||
//attachment
|
||||
BOOL hasInventory = payload["inventory_offer"].isDefined();
|
||||
|
||||
//attachment text
|
||||
LLTextBox * pAttachLink = getChild<LLTextBox>("attachment");
|
||||
//attachment icon
|
||||
LLIconCtrl* pAttachIcon = getChild<LLIconCtrl>("attachment_icon", TRUE);
|
||||
|
||||
//If attachment is empty let it be invisible and not take place at the panel
|
||||
pAttachLink->setVisible(hasInventory);
|
||||
pAttachIcon->setVisible(hasInventory);
|
||||
if (hasInventory) {
|
||||
pAttachLink->setValue(payload["inventory_name"]);
|
||||
|
||||
mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]);
|
||||
getChild<LLTextBox>("attachment")->setClickedCallback(boost::bind(
|
||||
&LLToastGroupNotifyPanel::onClickAttachment, this));
|
||||
|
||||
LLUIImagePtr attachIconImg = LLInventoryIcon::getIcon(mInventoryOffer->mType,
|
||||
LLInventoryType::IT_TEXTURE);
|
||||
pAttachIcon->setValue(attachIconImg->getName());
|
||||
}
|
||||
|
||||
//ok button
|
||||
LLButton* pOkBtn = getChild<LLButton>("btn_ok");
|
||||
pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this)));
|
||||
setDefaultBtn(pOkBtn);
|
||||
|
||||
S32 maxLinesCount;
|
||||
std::istringstream ss( getString("message_max_lines_count") );
|
||||
if (!(ss >> maxLinesCount))
|
||||
{
|
||||
maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT;
|
||||
}
|
||||
snapToMessageHeight(pMessageText, maxLinesCount);
|
||||
}
|
||||
|
||||
// virtual
|
||||
LLToastGroupNotifyPanel::~LLToastGroupNotifyPanel()
|
||||
{
|
||||
}
|
||||
|
||||
void LLToastGroupNotifyPanel::close()
|
||||
{
|
||||
// The group notice dialog may be an inventory offer.
|
||||
// If it has an inventory save button and that button is still enabled
|
||||
// Then we need to send the inventory declined message
|
||||
if(mInventoryOffer != NULL)
|
||||
{
|
||||
mInventoryOffer->forceResponse(IOR_DECLINE);
|
||||
mInventoryOffer = NULL;
|
||||
}
|
||||
|
||||
die();
|
||||
}
|
||||
|
||||
void LLToastGroupNotifyPanel::onClickOk()
|
||||
{
|
||||
LLSD response = mNotification->getResponseTemplate();
|
||||
mNotification->respond(response);
|
||||
close();
|
||||
}
|
||||
|
||||
void LLToastGroupNotifyPanel::onClickAttachment()
|
||||
{
|
||||
if (mInventoryOffer != NULL) {
|
||||
mInventoryOffer->forceResponse(IOR_ACCEPT);
|
||||
|
||||
LLTextBox * pAttachLink = getChild<LLTextBox> ("attachment");
|
||||
static const LLUIColor textColor = LLUIColorTable::instance().getColor(
|
||||
"GroupNotifyDimmedTextColor");
|
||||
pAttachLink->setColor(textColor);
|
||||
|
||||
LLIconCtrl* pAttachIcon =
|
||||
getChild<LLIconCtrl> ("attachment_icon", TRUE);
|
||||
pAttachIcon->setEnabled(FALSE);
|
||||
|
||||
//if attachment isn't openable - notify about saving
|
||||
if (!isAttachmentOpenable(mInventoryOffer->mType)) {
|
||||
LLNotifications::instance().add("AttachmentSaved", LLSD(), LLSD());
|
||||
}
|
||||
|
||||
mInventoryOffer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
//static
|
||||
bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type)
|
||||
{
|
||||
switch(type)
|
||||
{
|
||||
case LLAssetType::AT_LANDMARK:
|
||||
case LLAssetType::AT_NOTECARD:
|
||||
case LLAssetType::AT_IMAGE_JPEG:
|
||||
case LLAssetType::AT_IMAGE_TGA:
|
||||
case LLAssetType::AT_TEXTURE:
|
||||
case LLAssetType::AT_TEXTURE_TGA:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
/**
|
||||
* @file lltoastscripttextbox.h
|
||||
* @brief Panel for script llTextBox dialogs
|
||||
*
|
||||
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
|
||||
* Second Life Viewer Source Code
|
||||
* Copyright (C) 2010, Linden Research, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation;
|
||||
* version 2.1 of the License only.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifndef LL_LLTOASTSCRIPTTEXTBOX_H
|
||||
#define LL_LLTOASTSCRIPTTEXTBOX_H
|
||||
|
||||
#include "llfontgl.h"
|
||||
#include "lltoastpanel.h"
|
||||
#include "lldarray.h"
|
||||
#include "lltimer.h"
|
||||
#include "llviewermessage.h"
|
||||
#include "llnotificationptr.h"
|
||||
|
||||
class LLButton;
|
||||
|
||||
/**
|
||||
* Toast panel for group notification.
|
||||
*
|
||||
* Replaces class LLGroupNotifyBox.
|
||||
*/
|
||||
class LLToastGroupNotifyPanel
|
||||
: public LLToastPanel
|
||||
{
|
||||
public:
|
||||
void close();
|
||||
|
||||
static bool onNewNotification(const LLSD& notification);
|
||||
|
||||
|
||||
// Non-transient messages. You can specify non-default button
|
||||
// layouts (like one for script dialogs) by passing various
|
||||
// numbers in for "layout".
|
||||
LLToastGroupNotifyPanel(LLNotificationPtr& notification);
|
||||
|
||||
/*virtual*/ ~LLToastGroupNotifyPanel();
|
||||
protected:
|
||||
void onClickOk();
|
||||
void onClickAttachment();
|
||||
private:
|
||||
static bool isAttachmentOpenable(LLAssetType::EType);
|
||||
|
||||
static const S32 DEFAULT_MESSAGE_MAX_LINE_COUNT;
|
||||
|
||||
LLButton* mSaveInventoryBtn;
|
||||
|
||||
LLUUID mGroupID;
|
||||
LLOfferInfo* mInventoryOffer;
|
||||
};
|
||||
|
||||
// This view contains the stack of notification windows.
|
||||
//extern LLView* gGroupNotifyBoxView;
|
||||
|
||||
const S32 GROUP_LAYOUT_DEFAULT = 0;
|
||||
const S32 GROUP_LAYOUT_SCRIPT_DIALOG = 1;
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<panel
|
||||
background_visible="true"
|
||||
height="90"
|
||||
label="instant_message"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
name="panel_group_notify"
|
||||
top="0"
|
||||
width="305">
|
||||
<string
|
||||
name="message_max_lines_count"
|
||||
value="7" />
|
||||
<string
|
||||
name="subject_font"
|
||||
value="SANSSERIF_BIG" />
|
||||
<string
|
||||
name="date_font"
|
||||
value="SANSSERIF" />
|
||||
<panel
|
||||
background_visible="true"
|
||||
follows="top"
|
||||
height="30"
|
||||
label="header"
|
||||
layout="topleft"
|
||||
left="0"
|
||||
name="header"
|
||||
top="0"
|
||||
width="305">
|
||||
<icon
|
||||
follows="all"
|
||||
height="20"
|
||||
layout="topleft"
|
||||
left="5"
|
||||
mouse_opaque="true"
|
||||
name="group_icon"
|
||||
top="5"
|
||||
width="20" />
|
||||
<text
|
||||
follows="all"
|
||||
font="SansSerifBig"
|
||||
height="20"
|
||||
layout="topleft"
|
||||
left_pad="10"
|
||||
name="title"
|
||||
text_color="GroupNotifyTextColor"
|
||||
top="5"
|
||||
use_ellipses="true"
|
||||
value="Sender Name / Group Name"
|
||||
width="230" />
|
||||
</panel>
|
||||
<text_editor
|
||||
parse_urls="true"
|
||||
enabled="true"
|
||||
follows="all"
|
||||
height="0"
|
||||
layout="topleft"
|
||||
left="25"
|
||||
max_length="2147483647"
|
||||
name="message"
|
||||
parse_highlights="true"
|
||||
read_only="true"
|
||||
text_color="GroupNotifyTextColor"
|
||||
top="40"
|
||||
type="string"
|
||||
use_ellipses="true"
|
||||
value="message"
|
||||
width="270"
|
||||
word_wrap="true" >
|
||||
</text_editor>
|
||||
<icon
|
||||
bottom="60"
|
||||
follows="left|bottom|right"
|
||||
height="15"
|
||||
layout="topleft"
|
||||
left="25"
|
||||
mouse_opaque="true"
|
||||
name="attachment_icon"
|
||||
width="15" />
|
||||
<text
|
||||
bottom="60"
|
||||
follows="left|bottom|right"
|
||||
font="SansSerif"
|
||||
height="15"
|
||||
layout="topleft"
|
||||
left="45"
|
||||
name="attachment"
|
||||
text_color="GroupNotifyTextColor"
|
||||
value="Attachment"
|
||||
use_ellipses="true"
|
||||
width="250" />
|
||||
<button
|
||||
bottom="85"
|
||||
follows="bottom"
|
||||
height="20"
|
||||
label="OK"
|
||||
layout="topleft"
|
||||
right="-10"
|
||||
name="btn_ok"
|
||||
width="70" />
|
||||
</panel>
|
||||
Loading…
Reference in New Issue