Assure that the "From Here (...)" button contains always a useful content also for...

svn path=/trunk/KDE/kdebase/apps/; revision=1200307

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 7c2d152640a8d509e59f496012925b692bf44f4e..b265ea99a6c1ad1e42f04d50f24e67576f3cd06b 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -82,8 +82,18 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.averageCharWidth() * 15;
-    const QString fileName = metrics.elidedText(url.fileName(), Qt::ElideMiddle, maxWidth);
-    m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", fileName));
+
+    QString location = url.fileName();
+    if (location.isEmpty()) {
+        if (url.isLocalFile()) {
+            location = QLatin1String("/");
+        } else {
+            location = url.protocol() + QLatin1String(" - ") + url.host();
+        }
+    }
+
+    const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
+    m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));
 }
 
 KUrl DolphinSearchBox::searchPath() const