X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=gui%2Fchannelwidget.cpp;h=8aeb5926b67bb9e39be5f2b5e8cdb56163b935d9;hb=959e81d7ff35673870505331c012107cf67a5ab9;hp=09879361a2d8491efcaad8f379ae2efee6ccb8de;hpb=3b9bdf4f134a8c4399fef776911434aa2b76f934;p=quassel.git diff --git a/gui/channelwidget.cpp b/gui/channelwidget.cpp index 09879361..8aeb5926 100644 --- a/gui/channelwidget.cpp +++ b/gui/channelwidget.cpp @@ -38,8 +38,13 @@ ChannelWidget::ChannelWidget(QString netname, QString bufname, QString own, QWid ui.topicEdit->hide(); ui.chanSettingsButton->hide(); } + connect(ui.nickTree, SIGNAL(itemExpanded(QTreeWidgetItem *)), this, SLOT(itemExpansionChanged(QTreeWidgetItem*))); + connect(ui.nickTree, SIGNAL(itemCollapsed(QTreeWidgetItem *)), this, SLOT(itemExpansionChanged(QTreeWidgetItem*))); connect(ui.inputEdit, SIGNAL(returnPressed()), this, SLOT(enterPressed())); - //ui.inputEdit->setFocus(); + connect(this, SIGNAL(nickListChanged(QStringList)), ui.inputEdit, SLOT(updateNickList(QStringList))); + ui.inputEdit->setFocus(); + + opsExpanded = voicedExpanded = usersExpanded = true; // Define standard colors stdCol = "black"; @@ -52,10 +57,15 @@ ChannelWidget::ChannelWidget(QString netname, QString bufname, QString own, QWid kickCol = "firebrick"; nickCol = "magenta"; + completer = 0; } void ChannelWidget::enterPressed() { - emit sendInput(networkName(), bufferName(), ui.inputEdit->text()); + QStringList lines = ui.inputEdit->text().split('\n', QString::SkipEmptyParts); + foreach(QString msg, lines) { + if(msg.isEmpty()) continue; + emit sendInput(networkName(), bufferName(), msg); + } ui.inputEdit->clear(); } @@ -77,55 +87,52 @@ void ChannelWidget::recvMessage(Message msg) { break; case Message::Join: c = joinCol; - s = QString(tr("--> %1 (%2@%3) has joined %4")).arg(nick).arg(user).arg(host).arg(bufferName()); + 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()); + 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); + if(victim == ui.ownNick->currentText()) victim = tr("you"); QString kickmsg = msg.msg.section(" ", 1); - s = QString(tr("--> %1 has kicked %2 from %3")).arg(nick).arg(victim).arg(bufferName()); + 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); + 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); + 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; + case Message::Mode: + c = serverCol; + if(nick.isEmpty()) s = tr("*** User mode: %1").arg(msg.msg); + else s = tr("*** Mode %1 by %2").arg(msg.msg).arg(nick); break; default: c = stdCol; n = QString("[%1]").arg(msg.sender); s = msg.msg; break; } + s.replace('&', "&"); s.replace('<', "<"); s.replace('>', ">"); QString html = QString("
[%1] | ")
.arg(msg.timeStamp.toLocalTime().toString("hh:mm:ss")).arg("darkblue");
if(!n.isEmpty())
html += QString("%1 | ")
- .arg(n).arg("mediumseagreen");
- html += QString("%1 | ""
%1 | %2 | %3 |
[12:13] | [nickname] | This is the Message! |
[12:13] | [nick] | This is the Message! |
[12:13] | [looongnickname] | This is the Message! |
[12:13] | [nickname] | This is the Message! |