Remove the preserving of the selected items in reload(), this is already covered

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index f5ba63d1ee41511cb06f43353dd90180c527c6f3..bf806055bf79cb62014eb0d74d2e1b82d92877e3 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -29,6 +29,7 @@
 #include <QGraphicsSceneDragDropEvent>
 #include <QTimer>
 #include <QScrollBar>
 #include <QGraphicsSceneDragDropEvent>
 #include <QTimer>
 #include <QScrollBar>

+#include <QPixmapCache>

 #include <QPointer>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <QPointer>
 #include <QMenu>
 #include <QVBoxLayout>


@@ -453,10 +454,6 @@ void DolphinView::reload()
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
 
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
 

-    const KFileItemList itemList = selectedItems();
-    m_selectedUrls.clear();
-    m_selectedUrls = itemList.urlList();
-

     setUrl(url());
     loadDirectory(url(), true);
 
     setUrl(url());
     loadDirectory(url(), true);
 


@@ -584,7 +581,6 @@ void DolphinView::setUrl(const QUrl& url)
 
     clearSelection();
 
 
     clearSelection();
 

-    emit urlAboutToBeChanged(url);

     m_url = url;
 
     hideToolTip();
     m_url = url;
 
     hideToolTip();


@@ -731,6 +727,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
     switch (event->type()) {
     case QEvent::PaletteChange:
         updatePalette();
     switch (event->type()) {
     case QEvent::PaletteChange:
         updatePalette();

+        QPixmapCache::clear();

         break;
 
     case QEvent::KeyPress:
         break;
 
     case QEvent::KeyPress:


@@ -1021,7 +1018,7 @@ void DolphinView::slotItemHovered(int index)
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 

-        m_toolTipManager->showToolTip(item, itemRect);
+        m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle());

     }
 
     emit requestItemInfo(item);
     }
 
     emit requestItemInfo(item);


@@ -1210,6 +1207,9 @@ void DolphinView::restoreState(QDataStream& stream)
     // Restore the current item that had the keyboard focus
     stream >> m_currentItemUrl;
 
     // Restore the current item that had the keyboard focus
     stream >> m_currentItemUrl;
 

+    // Restore the previously selected items
+    stream >> m_selectedUrls;
+

     // Restore the view position
     stream >> m_restoredContentsPosition;
 
     // Restore the view position
     stream >> m_restoredContentsPosition;
 


@@ -1234,6 +1234,9 @@ void DolphinView::saveState(QDataStream& stream)
         stream << QUrl();
     }
 
         stream << QUrl();
     }
 

+    // Save the selected urls
+    stream << selectedItems().urlList();
+

     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();
     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
     const qreal y = m_container->verticalScrollBar()->value();