From: Weng Xuetian Date: Fri, 25 Jan 2013 21:07:33 +0000 (-0500) Subject: escape the existing text instead of set to plain text X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2045a64ec61adcd57fcf6b9313f2b004df713d71?ds=inline escape the existing text instead of set to plain text @info indicates it's rich text and will be added tag by kdelibs, so just escape the text that will be set to label for KDE/4.10 REVIEW: 108584 BUG: 313992 --- diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 9b0dd0092..0c4c62fc7 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -105,7 +105,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : QFont font = m_nameLabel->font(); font.setBold(true); m_nameLabel->setFont(font); - m_nameLabel->setTextFormat(Qt::PlainText); m_nameLabel->setAlignment(Qt::AlignHCenter); m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); @@ -164,7 +163,7 @@ void InformationPanelContent::showItem(const KFileItem& item) const KUrl itemUrl = item.url(); const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty(); if (!applyPlace(itemUrl)) { - setNameLabelText(item.text()); + setNameLabelText(Qt::escape(item.text())); if (isSearchUrl) { // in the case of a search-URL the URL is not readable for humans // (at least not useful to show in the Information Panel) @@ -362,7 +361,7 @@ bool InformationPanelContent::applyPlace(const KUrl& url) for (int i = 0; i < count; ++i) { const PlacesItem* item = m_placesItemModel->placesItem(i); if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) { - setNameLabelText(item->text()); + setNameLabelText(Qt::escape(item->text())); m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128)); return true; }