mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-12 16:43:17 -04:00
Fixed up GUI side of retroshare messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
8527a5e53f
commit
215e3386f2
9 changed files with 229 additions and 225 deletions
retroshare-gui/src/gui
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue