Remove reference to a slot which does not exist. Almost identical code can be found...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 59c2e5e3cd87c6477ddacc1044ff07f58c6ec395..379c238d97ae0d9fc20c92b28a9c20ec58aa72a0 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -81,10 +81,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
-    QClipboard* clipboard = QApplication::clipboard();
-    connect(clipboard, SIGNAL(dataChanged()),
-            this, SLOT(updateCutItems()));
-
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
@@ -139,11 +135,15 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(showErrorMessage(const QString&)));
     connect(m_view, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
+    connect(m_view, SIGNAL(itemTriggered(KFileItem)),
+            this, SLOT(slotItemTriggered(KFileItem)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));
 
     m_statusBar = new DolphinStatusBar(this, url);
+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+            m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&)));
 
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
@@ -189,12 +189,11 @@ bool DolphinViewContainer::isActive() const
 void DolphinViewContainer::renameSelectedItems()
 {
     DolphinViewContainer* view = m_mainWindow->activeViewContainer();
-    const KUrl::List urls = m_view->selectedUrls();
     const QList<KFileItem> items = m_view->selectedItems();
-    if (urls.count() > 1) {
+    if (items.count() > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(urls, items);
+        RenameDialog dialog(items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
@@ -213,10 +212,10 @@ void DolphinViewContainer::renameSelectedItems()
             Q_ASSERT(replaceIndex >= 0);
             int index = 1;
 
-            KUrl::List::const_iterator it = urls.begin();
-            KUrl::List::const_iterator end = urls.end();
+            QList<KFileItem>::const_iterator it = items.begin();
+            QList<KFileItem>::const_iterator end = items.end();
             while (it != end) {
-                const KUrl& oldUrl = *it;
+                const KUrl& oldUrl = (*it).url();
                 QString number;
                 number.setNum(index++);
 
@@ -234,12 +233,12 @@ void DolphinViewContainer::renameSelectedItems()
     } else {
         // Only one item has been selected for renaming. Use the custom
         // renaming mechanism from the views.
-        Q_ASSERT(urls.count() == 1);
+        Q_ASSERT(items.count() == 1);
 
         // TODO: Think about using KFileItemDelegate as soon as it supports editing.
         // Currently the RenameDialog is used, but I'm not sure whether inline renaming
         // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(urls, items);
+        RenameDialog dialog(items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
@@ -249,7 +248,7 @@ void DolphinViewContainer::renameSelectedItems()
             view->statusBar()->setMessage(dialog.errorString(),
                                           DolphinStatusBar::Error);
         } else {
-            const KUrl& oldUrl = urls.first();
+            const KUrl& oldUrl = items.first().url();
             KUrl newUrl = oldUrl;
             newUrl.setFileName(newName);
             m_mainWindow->rename(oldUrl, newUrl);
@@ -476,4 +475,33 @@ void DolphinViewContainer::activate()
     setActive(true);
 }
 
+void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
+{
+    // Prefer the local path over the URL.
+    bool isLocal;
+    KUrl url = item.mostLocalUrl(isLocal);
+
+    if (item.isDir()) {
+        m_view->setUrl(url);
+    } else if (item.isFile()) {
+        // allow to browse through ZIP and tar files
+        KMimeType::Ptr mime = item.mimeTypePtr();
+        if (mime->is("application/zip")) {
+            url.setProtocol("zip");
+            m_view->setUrl(url);
+        } else if (mime->is("application/x-tar") ||
+                   mime->is("application/x-tarz") ||
+                   mime->is("application/x-bzip-compressed-tar") ||
+                   mime->is("application/x-compressed-tar") ||
+                   mime->is("application/x-tzo")) {
+            url.setProtocol("tar");
+            m_view->setUrl(url);
+        } else {
+            item.run();
+        }
+    } else {
+        item.run();
+    }
+}
+
 #include "dolphinviewcontainer.moc"