[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/plasma/applets/folderview
From:       Fredrik Höglund <fredrik () kde ! org>
Date:       2010-10-12 20:59:24
Message-ID: 20101012205924.6292DAC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185295 by fredrik:

Fix the model being dynamically sorted when the view is set to unsorted.
Based on a patch by Jason Harvey <kdebgz.9.almoff@spamgourmet.com>.

BUG: 227157
FIXED-IN: 4.5.3


 M  +7 -1      folderview.cpp  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp #1185294:1185295
@@ -356,7 +356,7 @@
     m_model->setMimeTypeFilterList(m_filterFilesMimeList);
     m_model->setFileNameFilter(m_filterFiles);
     m_model->setSortDirectoriesFirst(m_sortDirsFirst);
-    m_model->setDynamicSortFilter(true);
+    m_model->setDynamicSortFilter(m_sortColumn != -1);
     m_model->sort(m_sortColumn != -1 ? m_sortColumn : KDirModel::Name, Qt::AscendingOrder);
 
     DirLister *lister = new DirLister(this);
@@ -475,8 +475,10 @@
         if (m_sortColumn != -1) {
             m_model->invalidate();
             m_model->sort(m_sortColumn, Qt::AscendingOrder);
+            m_model->setDynamicSortFilter(true);
         } else if (m_iconView) {
             m_iconView->setCustomLayout(true);
+            m_model->setDynamicSortFilter(false);
         }
         updateSortActionsState();
     }
@@ -816,8 +818,10 @@
         if (m_sortColumn != -1) {
             m_model->invalidate();
             m_model->sort(m_sortColumn, Qt::AscendingOrder);
+            m_model->setDynamicSortFilter(true);
         } else if (m_iconView) {
             m_iconView->setCustomLayout(true);
+            m_model->setDynamicSortFilter(false);
         }
         updateSortActionsState();
         cg.writeEntry("sortColumn", m_sortColumn);
@@ -1690,6 +1694,7 @@
     if (column != m_sortColumn) {
         m_model->invalidate();
         m_model->sort(column, Qt::AscendingOrder);
+        m_model->setDynamicSortFilter(true);
         m_sortColumn = column;
         config().writeEntry("sortColumn", m_sortColumn);
         emit configNeedsSaving();
@@ -1790,6 +1795,7 @@
     // If the user has rearranged the icons, the view is no longer sorted
     if (m_sortColumn != -1) {
         m_sortColumn = -1;
+        m_model->setDynamicSortFilter(false);
         updateSortActionsState();
         config().writeEntry("sortColumn", m_sortColumn);
         emit configNeedsSaving();
[prev in list] [next in list] [prev in thread] [next in thread]