Merge branch 'release/21.08'

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 57ed73a3a6488ab5032599722a1fc19ac76514e6..9c85303fdf157b7746b342999dbe8a7a027e8bcd 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -7,7 +7,9 @@
 
 #include "dolphinview.h"
 
+#include "dolphin_compactmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
+#include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinitemlistview.h"
 #include "dolphinnewfilemenuobserver.h"
@@ -463,18 +465,6 @@ bool DolphinView::sortFoldersFirst() const
     return m_model->sortDirectoriesFirst();
 }
 
-void DolphinView::setSortHiddenLast(bool hiddenLast)
-{
-    if (sortHiddenLast() != hiddenLast) {
-        updateSortHiddenLast(hiddenLast);
-    }
-}
-
-bool DolphinView::sortHiddenLast() const
-{
-    return m_model->sortHiddenLast();
-}
-
 void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)
 {
     const QList<QByteArray> previousRoles = roles;
@@ -1385,17 +1375,6 @@ void DolphinView::updateSortFoldersFirst(bool foldersFirst)
     Q_EMIT sortFoldersFirstChanged(foldersFirst);
 }
 
-void DolphinView::updateSortHiddenLast(bool hiddenLast)
-{
-    ViewProperties props(viewPropertiesUrl());
-    props.setSortHiddenLast(hiddenLast);
-
-    m_model->setSortHiddenLast(hiddenLast);
-
-    Q_EMIT sortHiddenLastChanged(hiddenLast);
-}
-
-
 QPair<bool, QString> DolphinView::pasteInfo() const
 {
     const QMimeData *mimeData = QApplication::clipboard()->mimeData();
@@ -1531,16 +1510,30 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh
 
 void DolphinView::resetZoomLevel()
 {
-    ViewModeSettings::ViewMode mode;
-
+    // TODO : Switch to using ViewModeSettings after MR #256 is merged
+    int defaultIconSize = KIconLoader::SizeSmall;
     switch (m_mode) {
-    case IconsView:     mode = ViewModeSettings::IconsMode;   break;
-    case CompactView:   mode = ViewModeSettings::CompactMode; break;
-    case DetailsView:   mode = ViewModeSettings::DetailsMode; break;
+    case IconsView:
+        IconsModeSettings::self()->useDefaults(true);
+        defaultIconSize = IconsModeSettings::iconSize();
+        IconsModeSettings::self()->useDefaults(false);
+        break;
+    case DetailsView:
+        DetailsModeSettings::self()->useDefaults(true);
+        defaultIconSize = DetailsModeSettings::iconSize();
+        DetailsModeSettings::self()->useDefaults(false);
+        break;
+    case CompactView:
+        CompactModeSettings::self()->useDefaults(true);
+        defaultIconSize = CompactModeSettings::iconSize();
+        CompactModeSettings::self()->useDefaults(false);
+        break;
+    default:
+        Q_ASSERT(false);
+        break;
     }
-    const ViewModeSettings settings(mode);
-    const QSize iconSize = QSize(settings.iconSize(), settings.iconSize());
-    setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(iconSize));
+
+    setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(QSize(defaultIconSize, defaultIconSize)));
 }
 
 void DolphinView::observeCreatedItem(const QUrl& url)
@@ -1926,12 +1919,6 @@ void DolphinView::applyViewProperties(const ViewProperties& props)
         Q_EMIT sortFoldersFirstChanged(sortFoldersFirst);
     }
 
-    const bool sortHiddenLast = props.sortHiddenLast();
-    if (sortHiddenLast != m_model->sortHiddenLast()) {
-        m_model->setSortHiddenLast(sortHiddenLast);
-        Q_EMIT sortHiddenLastChanged(sortHiddenLast);
-    }
-
     const QList<QByteArray> visibleRoles = props.visibleRoles();
     if (visibleRoles != m_visibleRoles) {
         const QList<QByteArray> previousVisibleRoles = m_visibleRoles;