#include "networkmodel.h"
#include <QAbstractItemView>
+#include <QTextDocument> // for Qt::escape()
#include "buffermodel.h"
+#include "buffersettings.h"
#include "client.h"
-#include "signalproxy.h"
-#include "network.h"
+#include "clientsettings.h"
#include "ircchannel.h"
-
-#include "buffersettings.h"
-
-#include "util.h" // get rid of this (needed for isChannelName)
+#include "network.h"
+#include "signalproxy.h"
/*****************************************
* Network Items
QString NetworkItem::toolTip(int column) const {
Q_UNUSED(column);
- QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
- toolTip.append(tr("Server: %1").arg(currentServer()));
+ QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
+ toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
toolTip.append(tr("Users: %1").arg(nickCount()));
if(_network) {
Q_UNUSED(column);
QStringList toolTip;
- toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+ toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
if(isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
}
- BufferSettings s;
- bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+ ItemViewSettings s;
+ bool showTopic = s.displayTopicInTooltip();
if(showTopic) {
QString _topic = topic();
if(_topic != "") {
_topic = stripFormatCodes(_topic);
- _topic.replace(QString("<"), QString("<"));
- _topic.replace(QString(">"), QString(">"));
+ _topic = Qt::escape(_topic);
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
QList<QVariant >NetworkModel::defaultHeader() {
QList<QVariant> data;
- data << tr("Buffer") << tr("Topic") << tr("Nick Count");
+ data << tr("Chat") << tr("Topic") << tr("Nick Count");
return data;
}