Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index e2ccc7ff1477cf6bcc6810beb4f6c8947e555470..9575ffba702f33de6cea6df8962135b147b1c181 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -101,6 +101,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_scrollToCurrentItem(false),
     m_restoredContentsPosition(),
     m_selectedUrls(),
     m_scrollToCurrentItem(false),
     m_restoredContentsPosition(),
     m_selectedUrls(),

+    m_clearSelectionBeforeSelectingNewItems(false),

     m_versionControlObserver(0)
 {
     m_topLayout = new QVBoxLayout(this);
     m_versionControlObserver(0)
 {
     m_topLayout = new QVBoxLayout(this);


@@ -342,10 +343,12 @@ int DolphinView::itemsCount() const
 KFileItemList DolphinView::selectedItems() const
 {
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 KFileItemList DolphinView::selectedItems() const
 {
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

-    const QSet<int> selectedIndexes = selectionManager->selectedItems();
+    QList<int> selectedIndexes = selectionManager->selectedItems().toList();
+
+    qSort(selectedIndexes);

 
     KFileItemList selectedItems;
 
     KFileItemList selectedItems;

-    QSetIterator<int> it(selectedIndexes);
+    QListIterator<int> it(selectedIndexes);

     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(m_model->fileItem(index));
     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(m_model->fileItem(index));


@@ -599,6 +602,8 @@ void DolphinView::setUrl(const KUrl& url)
         return;
     }
 
         return;
     }
 

+    clearSelection();
+

     emit urlAboutToBeChanged(url);
     m_url = url;
 
     emit urlAboutToBeChanged(url);
     m_url = url;
 


@@ -629,6 +634,7 @@ void DolphinView::invertSelection()
 
 void DolphinView::clearSelection()
 {
 
 void DolphinView::clearSelection()
 {

+    m_selectedUrls.clear();

     m_container->controller()->selectionManager()->clearSelection();
 }
 
     m_container->controller()->selectionManager()->clearSelection();
 }
 


@@ -788,29 +794,34 @@ void DolphinView::slotItemsActivated(const QSet<int>& indexes)
 {
     Q_ASSERT(indexes.count() >= 2);
 
 {
     Q_ASSERT(indexes.count() >= 2);
 

-    KFileItemList items;
-
-    QSetIterator<int> it(indexes);
-    while (it.hasNext()) {
-        const int index = it.next();
-        items.append(m_model->fileItem(index));
-    }
-
-    if (items.count() > 5) {
-        QString question = QString("Are you sure you want to open %1 items?").arg(items.count());
+    if (indexes.count() > 5) {
+        QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());

         const int answer = KMessageBox::warningYesNo(this, question);
         if (answer != KMessageBox::Yes) {
             return;
         }
     }
 
         const int answer = KMessageBox::warningYesNo(this, question);
         if (answer != KMessageBox::Yes) {
             return;
         }
     }
 

-    foreach (const KFileItem& item, items) {
-        if (item.isDir()) {
+    KFileItemList items;
+    items.reserve(indexes.count());
+
+    QSetIterator<int> it(indexes);
+    while (it.hasNext()) {
+        const int index = it.next();
+        KFileItem item = m_model->fileItem(index);
+
+        if (item.isDir()) { // Open folders in new tabs

             emit tabRequested(item.url());
         } else {
             emit tabRequested(item.url());
         } else {

-            emit itemActivated(item);
+            items.append(item);

         }
     }
         }
     }

+
+    if (items.count() == 1) {
+        emit itemActivated(items.first());
+    } else if (items.count() > 1) {
+        emit itemsActivated(items);
+    }

 }
 
 void DolphinView::slotItemMiddleClicked(int index)
 }
 
 void DolphinView::slotItemMiddleClicked(int index)


@@ -847,7 +858,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     nepomukRunning = (Nepomuk2::ResourceManager::instance()->initialized());
     if (nepomukRunning) {
         KConfig config("nepomukserverrc");
     nepomukRunning = (Nepomuk2::ResourceManager::instance()->initialized());
     if (nepomukRunning) {
         KConfig config("nepomukserverrc");

-        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
+        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", true);

     }
 #endif
 
     }
 #endif
 


@@ -1012,14 +1023,16 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->buttons(),
                          event->modifiers());
 
                          event->buttons(),
                          event->modifiers());
 

-    const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
+    QString error;
+    KonqOperations* op = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent, error);

     if (!error.isEmpty()) {
         emit errorMessage(error);
     }
 
     if (!error.isEmpty()) {
         emit errorMessage(error);
     }
 

-    if (destUrl == url()) {
+    if (op && destUrl == url()) {

         // Mark the dropped urls as selected.
         // Mark the dropped urls as selected.

-        markPastedUrlsAsSelected(event->mimeData());
+        m_clearSelectionBeforeSelectingNewItems = true;
+        connect(op, SIGNAL(urlPasted(KUrl)), this, SLOT(slotUrlPasted(KUrl)));

     }
 }
 
     }
 }
 


@@ -1055,6 +1068,11 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons
     }
 }
 
     }
 }
 

+void DolphinView::slotAboutToCreate(const KUrl::List& urls)
+{
+    m_selectedUrls << urls;
+}
+

 void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
 {
     const int currentCount = current.count();
 void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
 {
     const int currentCount = current.count();


@@ -1179,8 +1197,11 @@ QString DolphinView::viewPropertiesContext() const
 
 void DolphinView::observeCreatedItem(const KUrl& url)
 {
 
 void DolphinView::observeCreatedItem(const KUrl& url)
 {

-    markUrlAsCurrent(url);
-    markUrlsAsSelected(QList<KUrl>() << url);
+    if (m_active) {
+        clearSelection();
+        markUrlAsCurrent(url);
+        markUrlsAsSelected(QList<KUrl>() << url);
+    }

 }
 
 void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 }
 
 void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)


@@ -1220,20 +1241,27 @@ void DolphinView::updateViewState()
     }
 
     if (!m_selectedUrls.isEmpty()) {
     }
 
     if (!m_selectedUrls.isEmpty()) {

-        clearSelection();
-

         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

+
+        if (m_clearSelectionBeforeSelectingNewItems) {
+            selectionManager->clearSelection();
+            m_clearSelectionBeforeSelectingNewItems = false;
+        }
+

         QSet<int> selectedItems = selectionManager->selectedItems();
 
         QSet<int> selectedItems = selectionManager->selectedItems();
 

-        foreach (const KUrl& url, m_selectedUrls) {
-            const int index = m_model->index(url);
+        QList<KUrl>::iterator it = m_selectedUrls.begin();
+        while (it != m_selectedUrls.end()) {
+            const int index = m_model->index(*it);

             if (index >= 0) {
                 selectedItems.insert(index);
             if (index >= 0) {
                 selectedItems.insert(index);

+                it = m_selectedUrls.erase(it);
+            } else {
+                 ++it;

             }
         }
 
         selectionManager->setSelectedItems(selectedItems);
             }
         }
 
         selectionManager->setSelectedItems(selectedItems);

-        m_selectedUrls.clear();

     }
 }
 
     }
 }
 


@@ -1502,8 +1530,11 @@ void DolphinView::applyModeToView()
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {

-    markPastedUrlsAsSelected(QApplication::clipboard()->mimeData());
-    KonqOperations::doPaste(this, url);
+    KonqOperations* op = KonqOperations::doPasteV2(this, url);
+    if (op) {
+        m_clearSelectionBeforeSelectingNewItems = true;
+        connect(op, SIGNAL(aboutToCreate(KUrl::List)), this, SLOT(slotAboutToCreate(KUrl::List)));
+    }

 }
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 }
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const


@@ -1531,17 +1562,6 @@ QMimeData* DolphinView::selectionMimeData() const
     return m_model->createMimeData(selectedIndexes);
 }
 
     return m_model->createMimeData(selectedIndexes);
 }
 

-void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
-{
-    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
-    KUrl::List destUrls;
-    foreach (const KUrl& source, sourceUrls) {
-        KUrl destination(url().url() + '/' + source.fileName());
-        destUrls << destination;
-    }
-    markUrlsAsSelected(destUrls);
-}
-

 void DolphinView::updateWritableState()
 {
     const bool wasFolderWritable = m_isFolderWritable;
 void DolphinView::updateWritableState()
 {
     const bool wasFolderWritable = m_isFolderWritable;