use DBus interface instead of KRun::runCommand()

[dolphin.git] / src / dolphincontroller.cpp

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index 57d4a76fb6cad74dfda5749248caf840ed3b56bb..375eb44035736f06e5394be24098efc5a9b3ba0b 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -22,6 +22,8 @@
 #include <kdirmodel.h>
 #include <QAbstractProxyModel>
 #include <QApplication>
+#include <QClipboard>
+#include <QDir>
 
 DolphinController::DolphinController(DolphinView* dolphinView) :
     QObject(dolphinView),
@@ -55,9 +57,11 @@ void DolphinController::setItemView(QAbstractItemView* view)
 
     m_itemView = view;
 
-    // TODO: this is a workaround until  Qt-issue 176832 has been fixed
-    connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
-            this, SLOT(updateOpenTabState()));
+    if (m_itemView != 0) {
+        // TODO: this is a workaround until  Qt-issue 176832 has been fixed
+        connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
+                this, SLOT(updateOpenTabState()));
+    }
 }
 
 void DolphinController::triggerUrlChangeRequest(const KUrl& url)
@@ -133,6 +137,20 @@ void DolphinController::handleKeyPressEvent(QKeyEvent* event)
     }
 }
 
+void DolphinController::replaceUrlByClipboard()
+{
+    const QClipboard* clipboard = QApplication::clipboard();
+    QString text;
+    if (clipboard->mimeData(QClipboard::Selection)->hasText()) {
+        text = clipboard->mimeData(QClipboard::Selection)->text();
+    } else if (clipboard->mimeData(QClipboard::Clipboard)->hasText()) {
+        text = clipboard->mimeData(QClipboard::Clipboard)->text();
+    }
+    if (!text.isEmpty() && QDir::isAbsolutePath(text)) {
+        m_dolphinView->setUrl(KUrl(text));
+    }
+}
+
 KFileItem DolphinController::itemForIndex(const QModelIndex& index) const
 {
     Q_ASSERT(m_itemView != 0);
@@ -158,7 +176,7 @@ void DolphinController::triggerItem(const QModelIndex& index)
     } else {
         m_itemView->clearSelection();
         if (!openTab) {
-            emit itemEntered(item);
+            emit itemEntered(KFileItem());
         }
     }
 }