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 688e8aa6256f9efab6675b25218139c430a8ac3f..06e694f349d41f5deda3e2b5ac644d4e35291fcd 100644 (file)
--- 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
 
         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", "<filename>%1</filename> selected", name) :
                                         i18nc("@info:status", "<filename>%1</filename> selected (%2)",
                                               name, KIO::convertSize(totalFileSize));
             text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
                                         i18nc("@info:status", "<filename>%1</filename> selected (%2)",
                                               name, KIO::convertSize(totalFileSize));


@@ -881,7 +881,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
             }
         }
         break;
             }
         }
         break;

-        
+

     default:
         break;
     }
     default:
         break;
     }


@@ -1207,7 +1207,7 @@ void DolphinView::slotDirListerCompleted()
 void DolphinView::slotLoadingCompleted()
 {
     m_expanderActive = false;
 void DolphinView::slotLoadingCompleted()
 {
     m_expanderActive = false;

-    m_loadingDirectory = false; 
+    m_loadingDirectory = false;

 
     if (!m_activeItemUrl.isEmpty()) {
         // assure that the current item remains visible
 
     if (!m_activeItemUrl.isEmpty()) {
         // assure that the current item remains visible

diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index ae088786c14d7466383b76062acd2056fc9457fc..d8a9e190cd3a29c60f95d9dffc45cd43ba112058 100644 (file)
--- 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);
 
     // 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);
     nameLabel->setWordWrap(true);
     QFont font = nameLabel->font();
     font.setBold(true);