Use case: categorized sorting is enabled, the current view mode is icons-view. When...

CCMAIL: ereslibre@gmail.com

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 8b36e4ec3c45b6e6c472c96ed2471c2bfe50f6db..6cf2c1a8242bf044afdc7b16ea8ff7223025fdbe 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -61,6 +61,7 @@ DolphinView::DolphinView(QWidget* parent,
     m_active(true),
     m_loadingDirectory(false),
     m_initializeColumnView(false),
     m_active(true),
     m_loadingDirectory(false),
     m_initializeColumnView(false),

+    m_storedCategorizedSorting(false),

     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),


@@ -172,7 +173,8 @@ void DolphinView::setMode(Mode mode)
     // Not all view modes support categorized sorting. Adjust the sorting model
     // if changing the view mode results in a change of the categorized sorting
     // capabilities.
     // Not all view modes support categorized sorting. Adjust the sorting model
     // if changing the view mode results in a change of the categorized sorting
     // capabilities.

-    const bool categorized = props.categorizedSorting() && supportsCategorizedSorting();
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();

     if (categorized != categorizedSorting()) {
         m_proxyModel->setCategorizedModel(categorized);
         m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
     if (categorized != categorizedSorting()) {
         m_proxyModel->setCategorizedModel(categorized);
         m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());


@@ -241,6 +243,7 @@ void DolphinView::setCategorizedSorting(bool categorized)
     props.setCategorizedSorting(categorized);
     props.save();
 
     props.setCategorizedSorting(categorized);
     props.save();
 

+    m_storedCategorizedSorting = categorized;

     m_proxyModel->setCategorizedModel(categorized);
     m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
 
     m_proxyModel->setCategorizedModel(categorized);
     m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
 


@@ -249,7 +252,14 @@ void DolphinView::setCategorizedSorting(bool categorized)
 
 bool DolphinView::categorizedSorting() const
 {
 
 bool DolphinView::categorizedSorting() const
 {

-    return m_proxyModel->isCategorizedModel();
+    // If all view modes would support categorized sorting, returning
+    // m_proxyModel->isCategorizedModel() would be the way to go. As
+    // currently only the icons view supports caterized sorting, we remember
+    // the stored view properties state in m_storedCategorizedSorting and
+    // return this state. The application takes care to disable the corresponding
+    // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate
+    // that this setting is not applied to the current view mode.
+    return m_storedCategorizedSorting;

 }
 
 bool DolphinView::supportsCategorizedSorting() const
 }
 
 bool DolphinView::supportsCategorizedSorting() const


@@ -618,7 +628,8 @@ void DolphinView::applyViewProperties(const KUrl& url)
         emit showHiddenFilesChanged();
     }
 
         emit showHiddenFilesChanged();
     }
 

-    const bool categorized = props.categorizedSorting() && supportsCategorizedSorting();
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();

     if (categorized != categorizedSorting()) {
         m_proxyModel->setCategorizedModel(categorized);
         m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
     if (categorized != categorizedSorting()) {
         m_proxyModel->setCategorizedModel(categorized);
         m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 99a5233e9ebab43d25f9120d71cd0738ac9d72fe..be02d776ef29279fd4913d250a7ee611ccf29e88 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -573,6 +573,7 @@ private:
     bool m_active;
     bool m_loadingDirectory;
     bool m_initializeColumnView;
     bool m_active;
     bool m_loadingDirectory;
     bool m_initializeColumnView;

+    bool m_storedCategorizedSorting;

     Mode m_mode;
 
     DolphinMainWindow* m_mainWindow;
     Mode m_mode;
 
     DolphinMainWindow* m_mainWindow;