From: Sebastian Trueg Date: Thu, 14 Jan 2010 18:14:10 +0000 (+0000) Subject: Use KFileItem::text() instead of name() for pretty printed filenames X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/313cacd4489ba4525409c6f1851bee8ff9829e83 Use KFileItem::text() instead of name() for pretty printed filenames svn path=/trunk/KDE/kdebase/apps/; revision=1074761 --- diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 688e8aa62..06e694f34 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -550,7 +550,7 @@ QString DolphinView::statusBarText() const if (folderCount + fileCount == 1) { // if only one item is selected, show the filename - const QString name = list.first().name(); + const QString name = list.first().text(); text = (folderCount == 1) ? i18nc("@info:status", "%1 selected", name) : i18nc("@info:status", "%1 selected (%2)", name, KIO::convertSize(totalFileSize)); @@ -881,7 +881,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) } } break; - + default: break; } @@ -1207,7 +1207,7 @@ void DolphinView::slotDirListerCompleted() void DolphinView::slotLoadingCompleted() { m_expanderActive = false; - m_loadingDirectory = false; + m_loadingDirectory = false; if (!m_activeItemUrl.isEmpty()) { // assure that the current item remains visible diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp index ae088786c..d8a9e190c 100644 --- a/src/tooltips/tooltipmanager.cpp +++ b/src/tooltips/tooltipmanager.cpp @@ -252,7 +252,7 @@ QWidget* ToolTipManager::createTipContent(const QPixmap& pixmap) const // add item name QLabel* nameLabel = new QLabel(tipContent); - nameLabel->setText(m_item.name()); + nameLabel->setText(m_item.text()); nameLabel->setWordWrap(true); QFont font = nameLabel->font(); font.setBold(true);