Step 1 of 2 to fix the issue that reloading of a directory resets the contents positi...

svn path=/trunk/KDE/kdebase/apps/; revision=644237

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 163da54dda1b143a9c069dd5ea3a9d5d4f8a97f4..34bd6f688d71601cfc8c281e5bed492ccf473d26 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -59,6 +59,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
                          bool showHiddenFiles) :
     QWidget(parent),
     m_showProgress(false),
+    m_blockContentsMovedSignal(false),
     m_mode(mode),
     m_iconSize(0),
     m_folderCount(0),
@@ -731,6 +732,7 @@ void DolphinView::updateItemCount()
 
     updateStatusBar();
 
+    m_blockContentsMovedSignal = false;
     QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
 }
 
@@ -821,6 +823,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
         m_statusBar->setProgress(0);
     }
 
+    m_blockContentsMovedSignal = true;
     m_dirLister->stop();
     m_dirLister->openUrl(url, false, reload);
 }
@@ -1000,8 +1003,6 @@ void DolphinView::dropUrls(const KUrl::List& urls,
     const KUrl& destination = (directory == 0) ? url() :
                                                  directory->url();
 
-    kDebug() << "DolphinView::dropUrls() - destination: " << destination.prettyUrl() << endl;
-
     dropUrls(urls, destination);
 }
 
@@ -1034,7 +1035,9 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::emitContentsMoved()
 {
-    emit contentsMoved(contentsX(), contentsY());
+    if (!m_blockContentsMovedSignal) {
+        emit contentsMoved(contentsX(), contentsY());
+    }
 }
 
 void DolphinView::updateActivationState()

diff --git a/src/dolphinview.h b/src/dolphinview.h
index fd47e1fae24df9f7bab0e159077ceecc955db5af..e00cc98f27f4e4260ca2d369cfc08c208e6c299c 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -543,6 +543,7 @@ private:
 
 private:
     bool m_showProgress;
+    bool m_blockContentsMovedSignal;
     Mode m_mode;
 
     int m_iconSize;