Fix visual artefacts for tooltips, if compositing has been disabled. Thanks to Maciej...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 3cfeccfdeecfcdc2c944b49524bb0cadbe73bb06..73a0c63c3072761c1091775a37268f798ec7122a 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -49,7 +49,7 @@
 #include <ktoggleaction.h>
 #include <kurl.h>
 
-#include "additionalinfomanager.h"
+#include "additionalinfoaccessor.h"
 #include "dolphinmodel.h"
 #include "dolphincolumnviewcontainer.h"
 #include "dolphinviewcontroller.h"
@@ -972,16 +972,17 @@ void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList&
 
 void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
 {
-    const AdditionalInfoManager& infoManager = AdditionalInfoManager::instance();
+    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
 
     const KFileItemDelegate::InformationList checkedInfos = m_viewAccessor.itemDelegate()->showInformation();
-    const KFileItemDelegate::InformationList infos = infoManager.keys();
+    const KFileItemDelegate::InformationList infos = infoAccessor.keys();
 
     const bool enable = (m_mode == DolphinView::DetailsView) ||
                         (m_mode == DolphinView::IconsView);
 
     foreach (const KFileItemDelegate::Information& info, infos) {
-        QAction* action = collection->action(infoManager.actionCollectionName(info));
+        const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType);
+        QAction* action = collection->action(name);
         Q_ASSERT(action != 0);
         action->setEnabled(enable);
         action->setChecked(checkedInfos.contains(info));
@@ -1104,7 +1105,8 @@ void DolphinView::slotDirListerCompleted()
 
     if (!m_newFileNames.isEmpty()) {
         // select all newly added items created by a paste operation or
-        // a drag & drop operation
+        // a drag & drop operation, and clear the previous selection
+        m_viewAccessor.itemView()->clearSelection();
         const int rowCount = m_viewAccessor.proxyModel()->rowCount();
         QItemSelection selection;
         for (int row = 0; row < rowCount; ++row) {
@@ -1544,8 +1546,10 @@ KDirLister* DolphinView::ViewAccessor::dirLister() const
 
 void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 {
-    emit redirection(oldUrl, newUrl);
-    m_viewModeController->redirectToUrl(newUrl); // #186947
+    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
+        emit redirection(oldUrl, newUrl);
+        m_viewModeController->redirectToUrl(newUrl); // #186947
+    }
 }
 
 void DolphinView::restoreContentsPosition()