projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Greatly simplify the wrap point computation
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
f04b843
..
fbf84c4
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-21,16
+21,15
@@
#include "networkmodel.h"
#include <QAbstractItemView>
#include "networkmodel.h"
#include <QAbstractItemView>
+#include <QTextDocument> // for Qt::escape()
#include "buffermodel.h"
#include "buffermodel.h"
+#include "buffersettings.h"
#include "client.h"
#include "client.h"
-#include "signalproxy.h"
-#include "network.h"
+#include "clientsettings.h"
#include "ircchannel.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
/*****************************************
* Network Items
@@
-191,8
+190,8
@@
void NetworkItem::setCurrentServer(const QString &serverName) {
QString NetworkItem::toolTip(int column) const {
Q_UNUSED(column);
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) {
toolTip.append(tr("Users: %1").arg(nickCount()));
if(_network) {
@@
-479,7
+478,7
@@
QString ChannelBufferItem::toolTip(int column) const {
Q_UNUSED(column);
QStringList toolTip;
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()));
if(isActive()) {
//TODO: add channel modes
toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
@@
-489,14
+488,13
@@
QString ChannelBufferItem::toolTip(int column) const {
toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
}
toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
}
-
Buffer
Settings s;
- bool showTopic = s.
value("DisplayTopicInTooltip", QVariant(false)).toBool
();
+
ItemView
Settings s;
+ bool showTopic = s.
displayTopicInTooltip
();
if(showTopic) {
QString _topic = topic();
if(_topic != "") {
_topic = stripFormatCodes(_topic);
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));
}
toolTip.append(QString("<font size='-2'> </font>"));
toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
}
@@
-829,7
+827,7
@@
NetworkModel::NetworkModel(QObject *parent)
QList<QVariant >NetworkModel::defaultHeader() {
QList<QVariant> data;
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;
}
return data;
}