X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c91365ab8d7582255aa0de8f403ec0787446a74f..abf17941f7:/src/dolphinview.cpp?ds=sidebyside

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index d1416c40a..86b864583 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -79,9 +79,18 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
+    connect(m_mainWindow, SIGNAL(activeViewChanged()),
+            this, SLOT(updateActivationState()));
+
     m_urlNavigator = new UrlNavigator(url, this);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
+            this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(requestActivation()));
+    connect(this, SIGNAL(contentsMoved(int, int)),
+            m_urlNavigator, SLOT(storeContentsPosition(int, int)));
 
     m_statusBar = new DolphinStatusBar(this);
 
@@ -112,8 +121,10 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_proxyModel->setSourceModel(m_dirModel);
 
     m_controller = new DolphinController(this);
-    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QPoint&)),
-            this, SLOT(openContextMenu(const QPoint&, const QPoint&)));
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
+            this, SLOT(openContextMenu(const QPoint&)));
+    connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QPoint&)),
+            this, SLOT(dropUrls(const KUrl::List&, const QPoint&)));
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
@@ -163,7 +174,7 @@ const KUrl& DolphinView::url() const
 
 bool DolphinView::isActive() const
 {
-    return (mainWindow()->activeView() == this);
+    return m_mainWindow->activeView() == this;
 }
 
 void DolphinView::setMode(Mode mode)
@@ -552,11 +563,6 @@ void DolphinView::reload()
     startDirLister(m_urlNavigator->url(), true);
 }
 
-void DolphinView::declareViewActive()
-{
-    mainWindow()->setActiveView( this );
-}
-
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
@@ -855,7 +861,7 @@ void DolphinView::changeNameFilter(const QString& nameFilter)
 #endif
 }
 
-void DolphinView::openContextMenu(const QPoint& pos, const QPoint& globalPos)
+void DolphinView::openContextMenu(const QPoint& pos)
 {
     KFileItem* item = 0;
 
@@ -864,10 +870,36 @@ void DolphinView::openContextMenu(const QPoint& pos, const QPoint& globalPos)
         item = fileItem(index);
     }
 
-    DolphinContextMenu contextMenu(this, item, globalPos);
+    DolphinContextMenu contextMenu(this, item);
     contextMenu.open();
 }
 
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const QPoint& pos)
+{
+    KFileItem* directory = 0;
+    const QModelIndex index = itemView()->indexAt(pos);
+    if (index.isValid()) {
+        KFileItem* item = fileItem(index);
+        assert(item != 0);
+        if (item->isDir()) {
+            // the URLs are dropped above a directory
+            directory = item;
+        }
+    }
+
+    const KUrl& destination = (directory == 0) ? url() :
+                                                 directory->url();
+    dropUrls(urls, destination);
+}
+
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const KUrl& destination)
+{
+    m_mainWindow->dropUrls(urls, destination);
+}
+
+
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
@@ -888,6 +920,16 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
+void DolphinView::emitContentsMoved()
+{
+    emit contentsMoved(contentsX(), contentsY());
+}
+
+void DolphinView::updateActivationState()
+{
+    m_urlNavigator->setActive(isActive());
+}
+
 void DolphinView::createView()
 {
     // delete current view
@@ -928,18 +970,10 @@ void DolphinView::createView()
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
             m_controller, SLOT(indicateSelectionChange()));
-}
-
-int DolphinView::columnIndex(Sorting sorting) const
-{
-    int index = 0;
-    switch (sorting) {
-        case SortByName: index = KDirModel::Name; break;
-        case SortBySize: index = KDirModel::Size; break;
-        case SortByDate: index = KDirModel::ModifiedTime; break;
-        default: assert(false);
-    }
-    return index;
+    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
+    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
 }
 
 void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)