little fix that brings everything into order

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index eb702393ad306cd6720f6c0585097cdbb2f210be..876e037f5d8330258b1dcd1f309076f09a0cf11a 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -89,8 +89,10 @@ DolphinView::DolphinView(QWidget* parent,
 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
-    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const KUrl&)),
-            this, SLOT(openContextMenu(const QPoint&, const KUrl&)));
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
+            this, SLOT(openContextMenu(const QPoint&)));
     connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)),
             this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&, QWidget*)));
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
@@ -463,18 +465,11 @@ void DolphinView::triggerItem(const QModelIndex& index)
         return;
     }
 
-    // Prefer the local path over the URL. This assures that the
-    // volume space information is correct. Assuming that the URL is media:/sda1,
-    // and the local path is /windows/C: For the URL the space info is related
-    // to the root partition (and hence wrong) and for the local path the space
-    // info is related to the windows partition (-> correct).
-    const QString localPath(item->localPath());
-    KUrl url;
-    if (localPath.isEmpty()) {
-        url = item->url();
-    } else {
-        url = localPath;
-    }
+    // The stuff below should be moved to ViewContainer and be just a signal?
+
+    // Prefer the local path over the URL.
+    bool isLocal;
+    KUrl url = item->mostLocalUrl(isLocal);
 
     if (item->isDir()) {
         setUrl(url);
@@ -546,9 +541,9 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
     if (!url.isValid()) {
         const QString location(url.pathOrUrl());
         if (location.isEmpty()) {
-            emit errorMessage(i18n("The location is empty."));
+            emit errorMessage(i18nc("@info:status", "The location is empty."));
         } else {
-            emit errorMessage(i18n("The location '%1' is invalid.", location));
+            emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));
         }
         return;
     }
@@ -698,7 +693,7 @@ void DolphinView::changeSelection(const KFileItemList& selection)
                                          | QItemSelectionModel::Current);
 }
 
-void DolphinView::openContextMenu(const QPoint& pos, const KUrl& url)
+void DolphinView::openContextMenu(const QPoint& pos)
 {
     KFileItem* item = 0;
 
@@ -707,7 +702,7 @@ void DolphinView::openContextMenu(const QPoint& pos, const KUrl& url)
         item = fileItem(index);
     }
 
-    emit requestContextMenu(item, url);
+    emit requestContextMenu(item, url());
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
@@ -801,13 +796,13 @@ void DolphinView::showHoverInformation(const QModelIndex& index)
 
     const KFileItem* item = fileItem(index);
     if (item != 0) {
-        emit requestItemInfo(item->url());
+        emit requestItemInfo(*item);
     }
 }
 
 void DolphinView::clearHoverInformation()
 {
-    emit requestItemInfo(KUrl());
+    emit requestItemInfo(KFileItem());
 }