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

Fixed up GUI side of retroshare messages.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-02-04 17:55:59 +00:00
parent 8527a5e53f
commit 215e3386f2
9 changed files with 229 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

19
retroshare-gui/src/gui/ChatDialog.cpp
View file

@ -25,6 +25,7 @@
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsmsgs.h"
#include "chat/PopupChatDialog.h"
#include <sstream>
@ -111,15 +112,15 @@ int ChatDialog::loadInitMsg()
void ChatDialog::insertChat()
{
rsiface->lockData(); /* Lock Interface */
std::list<ChatInfo> newchat;
if (!rsMsgs->getNewChat(newchat))
{
return;
}
/* get a link to the table */
QTextEdit *msgWidget = ui.msgText;
std::list<ChatInfo> newchat = rsiface->getChatNew();
std::list<ChatInfo>::iterator it;
rsiface->unlockData(); /* Unlock Interface */
static std::string lastChatName("");
static int lastChatTime = 0;
@ -226,7 +227,7 @@ void ChatDialog::sendMsg()
//ci.messageFont = font;
//ci.messageColor = textColor;
rsicontrol -> ChatSend(ci);
rsMsgs -> ChatSend(ci);
lineWidget -> setText(QString(""));
/* redraw send list */
@ -272,8 +273,8 @@ void ChatDialog::insertSendList()
//item -> setFlags(Qt::ItemIsUserCheckable);
item -> setCheckState(0, Qt::Checked);
/**** NOT SELECTABLE AT THE MOMENT
if (it ->second.inChat)
if (rsicontrol->IsInChat(*it))
{
item -> setCheckState(0, Qt::Checked);
}
@ -281,7 +282,7 @@ void ChatDialog::insertSendList()
{
item -> setCheckState(0, Qt::Unchecked);
}
************/
/* add to the list */
items.append(item);
}

95
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -20,13 +20,13 @@
****************************************************************/
#include "rshare.h"
#include "MessagesDialog.h"
#include "msgs/ChanMsgDialog.h"
#include "gui/toaster/MessageToaster.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsmsgs.h"
#include <sstream>
#include <QContextMenuEvent>
@ -232,17 +232,13 @@ void MessagesDialog::getcurrentrecommended()
void MessagesDialog::getallrecommended()
{
/* get Message */
rsiface->lockData(); /* Lock Interface */
const MessageInfo *mi =
rsiface->getMessage(mCurrCertId, mCurrMsgId);
if (!mi)
MessageInfo msgInfo;
if (!rsMsgs -> getMessage(mCurrMsgId, msgInfo))
{
rsiface->unlockData(); /* Unlock Interface */
return;
}
const std::list<FileInfo> &recList = mi->files;
const std::list<FileInfo> &recList = msgInfo.files;
std::list<FileInfo>::const_iterator it;
std::list<std::string> fnames;
@ -256,8 +252,6 @@ void MessagesDialog::getallrecommended()
sizes.push_back(it->size);
}
rsiface->unlockData(); /* Unlock Interface */
/* now do requests */
std::list<std::string>::const_iterator fit;
std::list<std::string>::const_iterator hit;
@ -266,7 +260,7 @@ void MessagesDialog::getallrecommended()
for(fit = fnames.begin(), hit = hashes.begin(), sit = sizes.begin();
fit != fnames.end(); fit++, hit++, sit++)
{
rsicontrol -> FileRequest(*fit, *hit, *sit, "");
//rsicontrol -> FileRequest(*fit, *hit, *sit, "");
}
}
@ -279,17 +273,16 @@ void MessagesDialog::changeBox( int newrow )
void MessagesDialog::insertMessages()
{
rsiface->lockData(); /* Lock Interface */
std::list<MsgInfoSummary> msgList;
std::list<MsgInfoSummary>::const_iterator it;
std::list<MessageInfo>::const_iterator it;
const std::list<MessageInfo> &msgs = rsiface->getMessages();
rsMsgs -> getMessageSummaries(msgList);
/* get a link to the table */
QTreeWidget *msgWidget = ui.msgWidget;
/* get the MsgId of the current one ... */
std::string cid;
std::string mid;
@ -323,7 +316,7 @@ void MessagesDialog::insertMessages()
}
QList<QTreeWidgetItem *> items;
for(it = msgs.begin(); it != msgs.end(); it++)
for(it = msgList.begin(); it != msgList.end(); it++)
{
/* check the message flags, to decide which
* group it should go in...
@ -373,9 +366,7 @@ void MessagesDialog::insertMessages()
// From ....
{
std::ostringstream out;
out << it -> srcname;
item -> setText(1, QString::fromStdString(out.str()));
item -> setText(1, QString::fromStdString(rsPeers->getPeerName(it->srcId)));
}
// Subject
@ -388,7 +379,7 @@ void MessagesDialog::insertMessages()
item -> setText(3, QString::fromStdString(out.str()));
}
item -> setText(4, QString::fromStdString(it->id));
item -> setText(4, QString::fromStdString(it->srcId));
item -> setText(5, QString::fromStdString(it->msgId));
if ((oldSelected) && (mid == it->msgId))
{
@ -419,8 +410,6 @@ void MessagesDialog::insertMessages()
{
msgWidget->setCurrentItem(newSelected);
}
rsiface->unlockData(); /* UnLock Interface */
}
void MessagesDialog::updateMessages( QTreeWidgetItem * item, int column )
@ -435,7 +424,7 @@ void MessagesDialog::insertMsgTxtAndFiles()
/* Locate the current Message */
QTreeWidget *msglist = ui.msgWidget;
//std::cerr << "MessagesDialog::insertMsgTxtAndFiles()" << std::endl;
std::cerr << "MessagesDialog::insertMsgTxtAndFiles()" << std::endl;
/* get its Ids */
@ -463,23 +452,21 @@ void MessagesDialog::insertMsgTxtAndFiles()
mid = qtwi -> text(5).toStdString();
}
std::cerr << "MessagesDialog::insertMsgTxtAndFiles() mid:" << mid << std::endl;
/* Save the Data.... for later */
mCurrCertId = cid;
mCurrMsgId = mid;
/* get Message */
rsiface->lockData(); /* Lock Interface */
const MessageInfo *mi = NULL;
mi = rsiface->getMessage(cid, mid);
if (!mi)
MessageInfo msgInfo;
if (!rsMsgs -> getMessage(mid, msgInfo))
{
rsiface->unlockData(); /* Unlock Interface */
std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl;
return;
}
const std::list<FileInfo> &recList = mi->files;
const std::list<FileInfo> &recList = msgInfo.files;
std::list<FileInfo>::const_iterator it;
/* get a link to the table */
@ -521,60 +508,60 @@ void MessagesDialog::insertMsgTxtAndFiles()
/* add the items in! */
tree->insertTopLevelItems(0, items);
/* add the Msg */
std::list<PersonInfo>::const_iterator pit;
/* iterate through the sources */
std::list<std::string>::const_iterator pit;
QString msgTxt;
for(pit = mi->msgto.begin(); pit != mi->msgto.end(); pit++)
for(pit = msgInfo.msgto.begin(); pit != msgInfo.msgto.end(); pit++)
{
msgTxt += QString::fromStdString(pit->name);
msgTxt += QString::fromStdString(*pit);
msgTxt += " <";
msgTxt += QString::fromStdString(pit->id);
msgTxt += QString::fromStdString(rsPeers->getPeerName(*pit));
msgTxt += ">, ";
}
if (mi->msgcc.size() > 0)
if (msgInfo.msgcc.size() > 0)
msgTxt += "\nCc: ";
for(pit = mi->msgcc.begin(); pit != mi->msgcc.end(); pit++)
for(pit = msgInfo.msgcc.begin(); pit != msgInfo.msgcc.end(); pit++)
{
msgTxt += QString::fromStdString(pit->name);
msgTxt += QString::fromStdString(*pit);
msgTxt += " <";
msgTxt += QString::fromStdString(pit->id);
msgTxt += QString::fromStdString(rsPeers->getPeerName(*pit));
msgTxt += ">, ";
}
if (mi->msgbcc.size() > 0)
if (msgInfo.msgbcc.size() > 0)
msgTxt += "\nBcc: ";
for(pit = mi->msgbcc.begin(); pit != mi->msgbcc.end(); pit++)
for(pit = msgInfo.msgbcc.begin(); pit != msgInfo.msgbcc.end(); pit++)
{
msgTxt += QString::fromStdString(pit->name);
msgTxt += QString::fromStdString(*pit);
msgTxt += " <";
msgTxt += QString::fromStdString(pit->id);
msgTxt += QString::fromStdString(rsPeers->getPeerName(*pit));
msgTxt += ">, ";
}
{
QDateTime qtime;
qtime.setTime_t(mi->ts);
qtime.setTime_t(msgInfo.ts);
QString timestamp = qtime.toString("yyyy-MM-dd hh:mm:ss");
ui.dateText-> setText(timestamp);
}
ui.toText->setText(msgTxt);
ui.fromText->setText(QString::fromStdString(mi->srcname));
ui.fromText->setText(QString::fromStdString(rsPeers->getPeerName(msgInfo.srcId)));
ui.subjectText->setText(QString::fromStdWString(mi -> title));
ui.msgText->setText(QString::fromStdWString(mi->msg));
ui.subjectText->setText(QString::fromStdWString(msgInfo.title));
ui.msgText->setText(QString::fromStdWString(msgInfo.msg));
{
std::ostringstream out;
out << "(" << mi->count << " Files)";
out << "(" << msgInfo.count << " Files)";
ui.filesText->setText(QString::fromStdString(out.str()));
}
rsiface->unlockData(); /* Unlock Interface */
std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Msg Displayed OK!" << std::endl;
/* finally mark message as read! */
rsicontrol -> MessageRead(mid);
rsMsgs -> MessageRead(mid);
}
@ -608,7 +595,7 @@ void MessagesDialog::removemessage()
return;
}
rsicontrol -> MessageDelete(mid);
rsMsgs -> MessageDelete(mid);
return;
}
@ -625,7 +612,7 @@ void MessagesDialog::markMsgAsRead()
return;
}
rsicontrol -> MessageRead(mid);
rsMsgs -> MessageRead(mid);
return;
}

4
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -21,7 +21,6 @@
#include <QtGui>
#include "rshare.h"
#include "PopupChatDialog.h"
#include <QTextCodec>
@ -31,6 +30,7 @@
#include <QTextList>
#include "rsiface/rspeers.h"
#include "rsiface/rsmsgs.h"
/* Define the format used for displaying the date and time */
@ -300,7 +300,7 @@ void PopupChatDialog::sendChat()
ci.rsid = dialogId;
ci.name = dialogName;
rsicontrol -> ChatSend(ci);
rsMsgs -> ChatSend(ci);
lineWidget -> setText(QString(""));
/* redraw send list */

2
retroshare-gui/src/gui/chat/PopupChatDialog.h
View file

@ -34,6 +34,8 @@ class QAction;
class QTextEdit;
class QTextCharFormat;
class ChatInfo;
class PopupChatDialog : public QMainWindow
{
Q_OBJECT

55
retroshare-gui/src/gui/msgs/ChanMsgDialog.cpp
View file

@ -24,6 +24,7 @@
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include "rsiface/rsmsgs.h"
#include <sstream>
@ -171,12 +172,9 @@ void ChanMsgDialog::insertSendList()
item -> setText(1, QString::fromStdString(detail.id));
item -> setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
//item -> setCheckState(0, Qt::Checked);
//
item -> setCheckState(0, Qt::Unchecked);
#if 0
if (it -> second.inMsg)
if (rsicontrol->IsInMsg(detail.id))
{
item -> setCheckState(0, Qt::Checked);
}
@ -184,7 +182,6 @@ void ChanMsgDialog::insertSendList()
{
item -> setCheckState(0, Qt::Unchecked);
}
#endif
/* add to the list */
items.append(item);
@ -372,7 +369,6 @@ void ChanMsgDialog::insertMsgText(std::string msg)
void ChanMsgDialog::sendMessage()
{
rsiface->lockData(); /* Lock Interface */
/* construct a message */
@ -380,8 +376,8 @@ void ChanMsgDialog::sendMessage()
mi.title = ui.titleEdit->text().toStdWString();
mi.msg = ui.msgText->toPlainText().toStdWString();
/* filled in later */
//mi.msgId = rand();
rsiface->lockData(); /* Lock Interface */
const std::list<FileInfo> &recList = rsiface->getRecommendList();
std::list<FileInfo>::const_iterator it;
@ -393,38 +389,25 @@ void ChanMsgDialog::sendMessage()
}
}
std::list<std::string> persons;
std::list<std::string>::iterator it3;
#if 0
/* get a list of people to send it to */
std::map<RsCertId,NeighbourInfo>::const_iterator it2;
const std::map<RsCertId,NeighbourInfo> &friends =
rsiface->getFriendMap();
for(it2 = friends.begin(); it2 != friends.end(); it2++)
{
/* send to all listed + ourselves */
if ((it2 -> second.inMsg)
|| (it2 -> second.connectString == "Yourself"))
{
std::ostringstream out;
out << it2 -> second.id;
persons.push_back(out.str());
}
}
#endif
rsiface->unlockData(); /* UnLock Interface */
/* send message */
for(it3 = persons.begin(); it3 != persons.end(); it3++)
/* get the ids from the send list */
std::list<std::string> peers;
std::list<std::string> msgto;
std::list<std::string>::iterator iit;
rsPeers->getFriendList(peers);
for(iit = peers.begin(); iit != peers.end(); iit++)
{
mi.id = *it3;
rsicontrol -> MessageSend(mi);
if (rsicontrol->IsInMsg(*iit))
{
mi.msgto.push_back(*iit);
}
}
rsMsgs->MessageSend(mi);
close();
return;
}