use DBus interface instead of KRun::runCommand()

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 1ed8b6b82740e1ca5357b15a23cd5967b2d5c566..6d4801aeaa372c1baeba15e4008fe8026c7b59d6 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -92,9 +92,7 @@ DolphinColumnView::~DolphinColumnView()
 QModelIndex DolphinColumnView::indexAt(const QPoint& point) const
 {
     foreach (DolphinColumnWidget* column, m_columns) {
-        const QPoint topLeft = column->frameGeometry().topLeft();
-        const QPoint adjustedPoint(point.x() - topLeft.x(), point.y() - topLeft.y());
-        const QModelIndex index = column->indexAt(adjustedPoint);
+        const QModelIndex index = column->indexAt(columnPosition(column, point));
         if (index.isValid()) {
             return index;
         }
@@ -103,6 +101,18 @@ QModelIndex DolphinColumnView::indexAt(const QPoint& point) const
     return QModelIndex();
 }
 
+KFileItem DolphinColumnView::itemAt(const QPoint& point) const
+{
+    foreach (DolphinColumnWidget* column, m_columns) {
+        KFileItem item = column->itemAt(columnPosition(column, point));
+        if (!item.isNull()) {
+            return item;
+        }
+    }
+
+    return KFileItem();
+}
+
 void DolphinColumnView::scrollTo(const QModelIndex& index, ScrollHint hint)
 {
     activeColumn()->scrollTo(index, hint);
@@ -180,7 +190,7 @@ void DolphinColumnView::showColumn(const KUrl& url)
                 QList<DolphinColumnWidget*>::iterator start = m_columns.begin() + columnIndex;
                 QList<DolphinColumnWidget*>::iterator end = m_columns.end();
                 for (QList<DolphinColumnWidget*>::iterator it = start; it != end; ++it) {
-                    (*it)->deleteLater();
+                    deleteColumn(*it);
                 }
                 m_columns.erase(start, end);
 
@@ -254,6 +264,11 @@ void DolphinColumnView::editItem(const KFileItem& item)
     activeColumn()->editItem(item);
 }
 
+KFileItemList DolphinColumnView::selectedItems() const
+{
+    return activeColumn()->selectedItems();
+}
+
 void DolphinColumnView::selectAll()
 {
     activeColumn()->selectAll();
@@ -579,7 +594,7 @@ void DolphinColumnView::removeAllColumns()
     QList<DolphinColumnWidget*>::iterator start = m_columns.begin() + 1;
     QList<DolphinColumnWidget*>::iterator end = m_columns.end();
     for (QList<DolphinColumnWidget*>::iterator it = start; it != end; ++it) {
-        (*it)->deleteLater();
+        deleteColumn(*it);
     }
     m_columns.erase(start, end);
     m_index = 0;
@@ -587,4 +602,21 @@ void DolphinColumnView::removeAllColumns()
     assureVisibleActiveColumn();
 }
 
+QPoint DolphinColumnView::columnPosition(DolphinColumnWidget* column, const QPoint& point) const
+{
+    const QPoint topLeft = column->frameGeometry().topLeft();
+    return QPoint(point.x() - topLeft.x(), point.y() - topLeft.y());
+}
+
+void DolphinColumnView::deleteColumn(DolphinColumnWidget* column)
+{
+    if (column != 0) {
+        if (m_controller->itemView() == column) {
+            m_controller->setItemView(0);
+        }
+        column->disconnect();
+        column->deleteLater();
+    }   
+}
+
 #include "dolphincolumnview.moc"