Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-12-21 15:34:51 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-12-21 15:34:51 (GMT) |
| commit | 6c1e7d8a8339a849896566464bd9f1db33e3b3da (patch) | |
| tree | 4bd2b971785f54bc4c209f82136d9c6cfe5c45d1 | |
| parent | 9f4614d89fa3d69902b6f69d1cb775fc1c620431 (diff) | |
| download | swift-contrib-6c1e7d8a8339a849896566464bd9f1db33e3b3da.zip swift-contrib-6c1e7d8a8339a849896566464bd9f1db33e3b3da.tar.bz2 | |
Don't escape < for status widget
| -rw-r--r-- | Swift/QtUI/QtStatusWidget.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Swift/QtUI/QtStatusWidget.cpp b/Swift/QtUI/QtStatusWidget.cpp index 47f0afe..0e2731a 100644 --- a/Swift/QtUI/QtStatusWidget.cpp +++ b/Swift/QtUI/QtStatusWidget.cpp @@ -207,60 +207,58 @@ void QtStatusWidget::handleEditComplete() { emit onChangeStatusRequest(selectedStatusType_, statusText_); } void QtStatusWidget::handleEditCancelled() { editing_ = false; setStatusText(statusText_); viewMode(); } StatusShow::Type QtStatusWidget::getSelectedStatusShow() { return selectedStatusType_; } void QtStatusWidget::handleItemClicked(QListWidgetItem* item) { editing_ = false; selectedStatusType_ = static_cast<StatusShow::Type>(item->data(Qt::UserRole).toInt()); QString message = item->data(Qt::DisplayRole).toString(); newStatusText_ = message == getNoMessage() ? "" : message; statusEdit_->setText(newStatusText_); handleEditComplete(); } void QtStatusWidget::setNewToolTip() { if (connecting_) { statusTextLabel_->setToolTip(tr("Connecting")); } else { statusTextLabel_->setToolTip(P2QSTRING(statusShowTypeToFriendlyName(selectedStatusType_)) + ": " + statusTextLabel_->text()); } } void QtStatusWidget::setStatusText(const QString& text) { connectingMovie_->stop(); statusText_ = text; statusEdit_->setText(text); QString escapedText(text.isEmpty() ? getNoMessage() : text); - escapedText.replace("<","<"); -// statusTextLabel_->setText("<i>" + escapedText + "</i>"); statusTextLabel_->setText(escapedText); setNewToolTip(); } void QtStatusWidget::setConnecting() { connecting_ = true; statusIcon_->setMovie(connectingMovie_); connectingMovie_->start(); setNewToolTip(); } void QtStatusWidget::setStatusType(StatusShow::Type type) { connecting_ = false; selectedStatusType_ = icons_.contains(type) ? type : StatusShow::Online; statusIcon_->setPixmap(icons_[selectedStatusType_].pixmap(16, 16)); setNewToolTip(); } QString QtStatusWidget::getNoMessage() { return QString(tr("(No message)")); } } |