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

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 8e1a191082dece7997388f05469b434a589fcded..f0fad1976e81122444ed912a2c9c5ecc19faee4d 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -73,7 +73,7 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_NEPOMUK
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_NEPOMUK

-    #include <Nepomuk/ResourceManager>
+    #include <Nepomuk2/ResourceManager>

 #endif
 
 namespace {
 #endif
 
 namespace {


@@ -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);


@@ -154,6 +155,7 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
 
     connect(m_model, SIGNAL(directoryLoadingStarted()),       this, SLOT(slotDirectoryLoadingStarted()));
     connect(m_model, SIGNAL(directoryLoadingCompleted()),     this, SLOT(slotDirectoryLoadingCompleted()));
 
     connect(m_model, SIGNAL(directoryLoadingStarted()),       this, SLOT(slotDirectoryLoadingStarted()));
     connect(m_model, SIGNAL(directoryLoadingCompleted()),     this, SLOT(slotDirectoryLoadingCompleted()));

+    connect(m_model, SIGNAL(directoryLoadingCanceled()),      this, SIGNAL(directoryLoadingCanceled()));

     connect(m_model, SIGNAL(directoryLoadingProgress(int)),   this, SIGNAL(directoryLoadingProgress(int)));
     connect(m_model, SIGNAL(directorySortingProgress(int)),   this, SIGNAL(directorySortingProgress(int)));
     connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
     connect(m_model, SIGNAL(directoryLoadingProgress(int)),   this, SIGNAL(directoryLoadingProgress(int)));
     connect(m_model, SIGNAL(directorySortingProgress(int)),   this, SIGNAL(directorySortingProgress(int)));
     connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),


@@ -341,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));


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

+    clearSelection();
+

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


@@ -628,31 +634,32 @@ void DolphinView::invertSelection()
 
 void DolphinView::clearSelection()
 {
 
 void DolphinView::clearSelection()
 {

+    m_selectedUrls.clear();

     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {
     const KFileItemList items = selectedItems();
     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {
     const KFileItemList items = selectedItems();

-     if (items.isEmpty()) {
-         return;
-     }
-
-     if (items.count() == 1 && GeneralSettings::renameInline()) {
-         const int index = m_model->index(items.first());
-         m_view->editRole(index, "text");
-     } else {
-         RenameDialog* dialog = new RenameDialog(this, items);
-         dialog->setAttribute(Qt::WA_DeleteOnClose);
-         dialog->show();
-         dialog->raise();
-         dialog->activateWindow();
-     }
-
-     // Assure that the current index remains visible when KFileItemModel
-     // will notify the view about changed items (which might result in
-     // a changed sorting).
-     m_assureVisibleCurrentIndex = true;
+    if (items.isEmpty()) {
+        return;
+    }
+
+    if (items.count() == 1 && GeneralSettings::renameInline()) {
+        const int index = m_model->index(items.first());
+        m_view->editRole(index, "text");
+    } else {
+        RenameDialog* dialog = new RenameDialog(this, items);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+        dialog->raise();
+        dialog->activateWindow();
+    }
+
+    // Assure that the current index remains visible when KFileItemModel
+    // will notify the view about changed items (which might result in
+    // a changed sorting).
+    m_assureVisibleCurrentIndex = true;

 }
 
 void DolphinView::trashSelectedItems()
 }
 
 void DolphinView::trashSelectedItems()


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

+    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;
+        }
+    }
+

     KFileItemList items;
     KFileItemList items;

+    items.reserve(indexes.count());

 
     QSetIterator<int> it(indexes);
     while (it.hasNext()) {
         const int index = it.next();
 
     QSetIterator<int> it(indexes);
     while (it.hasNext()) {
         const int index = it.next();

-        items.append(m_model->fileItem(index));
-    }
+        KFileItem item = m_model->fileItem(index);

 
 

-    foreach (const KFileItem& item, items) {
-        if (item.isDir()) {
+        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)


@@ -835,10 +855,10 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     bool nepomukRunning = false;
     bool indexingEnabled = false;
 #ifdef HAVE_NEPOMUK
     bool nepomukRunning = false;
     bool indexingEnabled = false;
 #ifdef HAVE_NEPOMUK

-    nepomukRunning = (Nepomuk::ResourceManager::instance()->initialized());
+    nepomukRunning = (Nepomuk2::ResourceManager::instance()->initialized());

     if (nepomukRunning) {
         KConfig config("nepomukserverrc");
     if (nepomukRunning) {
         KConfig config("nepomukserverrc");

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

     }
 #endif
 
     }
 #endif
 


@@ -1170,8 +1190,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)


@@ -1211,20 +1234,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();

     }
 }
 
     }
 }
 


@@ -1531,6 +1561,7 @@ void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
         destUrls << destination;
     }
     markUrlsAsSelected(destUrls);
         destUrls << destination;
     }
     markUrlsAsSelected(destUrls);

+    m_clearSelectionBeforeSelectingNewItems = true;

 }
 
 void DolphinView::updateWritableState()
 }
 
 void DolphinView::updateWritableState()