Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-06 08:05:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for empty recipient and empty subject in MessageComposer.

Browse source 
Added context menu for empty trash in MessagesDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-10-29 20:57:23 +00:00
parent 64709b8ae0
commit 89ca27ef66
7 changed files with 115 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -954,11 +954,12 @@ void MessageComposer::insertHtmlText(std::string msg)
void MessageComposer::sendMessage()
{
sendMessage_internal(false);
close();
if (sendMessage_internal(false)) {
close();
}
}
void MessageComposer::sendMessage_internal(bool bDraftbox)
bool MessageComposer::sendMessage_internal(bool bDraftbox)
{
/* construct a message */
MessageInfo mi;
@ -966,6 +967,13 @@ void MessageComposer::sendMessage_internal(bool bDraftbox)
mi.title = ui.titleEdit->text().toStdWString();
mi.msg = ui.msgText->toHtml().toStdWString();
/* check for existing title */
if (bDraftbox == false && mi.title.empty()) {
if (QMessageBox::warning(this, tr("RetroShare"), tr("Do you want to send the message without a subject ?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
return false; // Don't send with an empty subject
}
}
for(std::list<FileInfo>::const_iterator it(_recList.begin()); it != _recList.end(); ++it)
if (it -> inRecommend)
mi.files.push_back(*it);
@ -1055,10 +1063,16 @@ void MessageComposer::sendMessage_internal(bool bDraftbox)
// use new message id
m_sDraftMsgId = mi.msgId;
} else {
/* check for the recipient */
if (mi.msgto.empty()) {
QMessageBox::warning(this, tr("RetroShare"), tr("Please insert at least one recipient."), QMessageBox::Ok);
return false; // Don't send with no recipient
}
rsMsgs->MessageSend(mi);
}
ui.msgText->document()->setModified(false);
return true;
}
void MessageComposer::cancelMessage()