#include "channelwidget.h"
#include "guiproxy.h"
+#include "global.h"
+#include "util.h"
#include <QtGui>
#include <iostream>
//ui.inputEdit->setFocus();
// Define standard colors
- stdCol = QColor("black");
- noticeCol = QColor("darkblue");
- serverCol = QColor("darkblue");
- errorCol = QColor("red");
- joinCol = QColor("green");
- quitCol = QColor("firebrick");
- partCol = QColor("firebrick");
-
+ stdCol = "black";
+ noticeCol = "darkblue";
+ serverCol = "darkblue";
+ errorCol = "red";
+ joinCol = "green";
+ quitCol = "firebrick";
+ partCol = "firebrick";
+ kickCol = "firebrick";
+ nickCol = "magenta";
+
}
void ChannelWidget::enterPressed() {
}
void ChannelWidget::recvMessage(Message msg) {
- QString s;
- QColor c = stdCol;
+ QString s, n;
+ QString c = stdCol;
+ QString user = userFromMask(msg.sender);
+ QString host = hostFromMask(msg.sender);
+ QString nick = nickFromMask(msg.sender);
switch(msg.type) {
case Message::Msg:
- c = stdCol; s = QString("<%1> %2").arg(msg.sender).arg(msg.msg);
+ c = stdCol; n = QString("<%1>").arg(nick); s = msg.msg;
break;
case Message::Server:
c = serverCol; s = msg.msg;
c = errorCol; s = msg.msg;
break;
case Message::Join:
- c = joinCol; s = msg.msg;
+ c = joinCol;
+ s = QString(tr("--> %1 (%2@%3) has joined %4")).arg(nick).arg(user).arg(host).arg(bufferName());
+ break;
+ case Message::Part:
+ c = partCol;
+ s = QString(tr("<-- %1 (%2@%3) has left %4")).arg(nick).arg(user).arg(host).arg(bufferName());
+ if(!msg.msg.isEmpty()) s = QString("%1 (%2)").arg(s).arg(msg.msg);
+ break;
+ case Message::Kick:
+ { c = kickCol;
+ QString victim = msg.msg.section(" ", 0, 0);
+ QString kickmsg = msg.msg.section(" ", 1);
+ s = QString(tr("--> %1 has kicked %2 from %3")).arg(nick).arg(victim).arg(bufferName());
+ if(!kickmsg.isEmpty()) s = QString("%1 (%2)").arg(s).arg(kickmsg);
+ }
+ break;
+ case Message::Quit:
+ c = quitCol;
+ s = QString(tr("<-- %1 (%2@%3) has quit")).arg(nick).arg(user).arg(host);
+ if(!msg.msg.isEmpty()) s = QString("%1 (%2)").arg(s).arg(msg.msg);
+ break;
+ case Message::Nick:
+ c = nickCol;
+ if(nick == msg.msg) s = QString(tr("<-> You are now known as %1")).arg(msg.msg);
+ else s = QString(tr("<-> %1 is now known as %2")).arg(nick).arg(msg.msg);
break;
default:
- c = stdCol; s = QString("[%1] %2").arg(msg.sender).arg(msg.msg);
+ c = stdCol; n = QString("[%1]").arg(msg.sender); s = msg.msg;
break;
}
- ui.chatWidget->setTextColor(c);
- ui.chatWidget->insertPlainText(QString("[%2] %1\n").arg(s).arg(msg.timeStamp.toLocalTime().toString("hh:mm:ss")));
+ QString html = QString("<table cellspacing=0 cellpadding=0><tr>"
+ "<td width=50><div style=\"color:%2;\">[%1]</div></td>")
+ .arg(msg.timeStamp.toLocalTime().toString("hh:mm:ss")).arg("darkblue");
+ if(!n.isEmpty())
+ html += QString("<td width=100><div align=right style=\"white-space:nowrap;margin-left:6px;color:%2;\">%1</div></td>")
+ .arg(n).arg("mediumseagreen");
+ html += QString("<td><div style=\"margin-left:6px;color:%2;\">%1</div></td>""</tr></table>")
+ .arg(s).arg(c);
+ ui.chatWidget->append(html);
+ //ui.chatWidget->append(QString("<table border=1 cellspacing=0 cellpadding=0><tr><td>%1</td><td width=100 style=border-right-width:1px;><div style=margin-left:8px; margin-right:8px;>%2</div></td><td style=color:firebrick> %3</td></tr></table>")
+ //.arg(msg.timeStamp.toLocalTime().toString("hh:mm:ss")).arg(nick).arg(s));
+ //ui.chatWidget->setTextColor(stdCol);
+ //ui.chatWidget->append(QString("[%1] ").arg(msg.timeStamp.toLocalTime().toString("hh:mm:ss")));
+ //ui.chatWidget->setTextColor(c);
+ //ui.chatWidget->append(s + "\n");
//ui.chatWidget->insertHtml(QString("<table><tr><td>[12:13]</td><td width=20><div align=right>[nickname]</div></td><td>This is the Message!</td></tr>"
// "<tr><td>[12:13]</td><td><div align=right>[nick]</div></td><td>This is the Message!</td></tr>"
// "<tr><td>[12:13]</td><td><div align=right>[looongnickname]</div></td><td>This is the Message!</td></tr>"
updateNickList();
}
+void ChannelWidget::renameNick(QString oldnick, QString newnick) {
+ QVariant v = nicks.take(oldnick);
+ nicks[newnick] = v;
+ updateNickList();
+}
+
void ChannelWidget::removeNick(QString nick) {
nicks[nick].toMap().remove(nick);
updateNickList();
connect(guiProxy, SIGNAL(csSetNicks(QString, QString, QStringList)), this, SLOT(setNicks(QString, QString, QStringList)));
connect(guiProxy, SIGNAL(csNickAdded(QString, QString, VarMap)), this, SLOT(addNick(QString, QString, VarMap)));
connect(guiProxy, SIGNAL(csNickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString)));
+ connect(guiProxy, SIGNAL(csNickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString)));
connect(guiProxy, SIGNAL(csNickUpdated(QString, QString, VarMap)), this, SLOT(updateNick(QString, QString, VarMap)));
connect(guiProxy, SIGNAL(csOwnNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString)));
connect(this, SIGNAL(sendInput( QString, QString, QString )), guiProxy, SLOT(gsUserInput(QString, QString, QString)));
ChannelWidget * IrcWidget::getBuffer(QString net, QString buf) {
QString key = net + buf;
if(!buffers.contains(key)) {
- ChannelWidget *cw = new ChannelWidget(net, buf, ownNick);
+ ChannelWidget *cw = new ChannelWidget(net, buf, ownNick[net]);
connect(cw, SIGNAL(sendInput(QString, QString, QString)), this, SLOT(userInput(QString, QString, QString)));
ui.tabWidget->addTab(cw, net+buf);
ui.tabWidget->setCurrentWidget(cw);
}
void IrcWidget::recvStatusMsg(QString net, QString msg) {
- recvMessage(net, "", QString("[STATUS] %1").arg(msg));
+ recvMessage(net, "", Message(Message::Server, QString("[STATUS] %1").arg(msg)));
}
}
void IrcWidget::addNick(QString net, QString nick, VarMap props) {
- nicks[net].toMap()[nick] = props;
+ VarMap netnicks = nicks[net].toMap();
+ netnicks[nick] = props;
+ nicks[net] = netnicks;
VarMap chans = props["Channels"].toMap();
QStringList c = chans.keys();
foreach(QString bufname, c) {
}
}
+void IrcWidget::renameNick(QString net, QString oldnick, QString newnick) {
+ VarMap netnicks = nicks[net].toMap();
+ qDebug() << "renNICK:"<<oldnick<<newnick;
+ Q_ASSERT(netnicks.contains(oldnick));
+ QStringList chans = netnicks[oldnick].toMap()["Channels"].toMap().keys(); qDebug() << "l:" << chans;
+ foreach(QString c, chans) {
+ qDebug() << net << c;
+ getBuffer(net, c)->renameNick(oldnick, newnick);
+ }
+ QVariant v = netnicks.take(oldnick);
+ netnicks[newnick] = v;
+ nicks[net] = netnicks;
+}
+
void IrcWidget::updateNick(QString net, QString nick, VarMap props) {
QStringList oldchans = nicks[net].toMap()[nick].toMap()["Channels"].toMap().keys();
QStringList newchans = props["Channels"].toMap().keys();
foreach(QString c, oldchans) {
if(!newchans.contains(c)) getBuffer(net, c)->removeNick(nick);
}
- nicks[net].toMap()[nick] = props;
+ VarMap netnicks = nicks[net].toMap();
+ netnicks[nick] = props;
+ nicks[net] = netnicks;
}
void IrcWidget::removeNick(QString net, QString nick) {
foreach(QString bufname, chans.keys()) {
getBuffer(net, bufname)->removeNick(nick);
}
- qDebug() << nicks;
- nicks[net].toMap().remove(nick);
- qDebug() << nicks;
+ VarMap netnicks = nicks[net].toMap();
+ netnicks.remove(nick);
+ nicks[net] = netnicks;
}
void IrcWidget::setOwnNick(QString net, QString nick) {
- ownNick = nick;
+ ownNick[net] = nick;
foreach(ChannelWidget *cw, buffers.values()) {
if(cw->networkName() == net) cw->setOwnNick(nick);
}
projects / quassel.git / blobdiff