Fix font settings issue

The font settings have been ignored currently because of the transition to the new view-engine.

The patch is based on the work of Janardhan Reddy and has been extended by the helper class ViewModeSettings.

BUG: 288395
FIXED-IN: 4.8.0

4 files changed, 58 insertions, 55 deletions

diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp
index 0f2af9855..870043bc4 100644
--- a/src/views/dolphinitemlistcontainer.cpp
+++ b/src/views/dolphinitemlistcontainer.cpp
@@ -52,6 +52,7 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister,
     m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
     controller()->setView(m_fileItemListView);
 
+    updateFont();
     updateGridSize();
 }
 
@@ -104,23 +105,13 @@ void DolphinItemListContainer::setZoomLevel(int level)
 
     m_zoomLevel = level;
 
+    ViewModeSettings settings(viewMode());
     if (previewsShown()) {
         const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(level);
-
-        switch (itemLayout()) {
-        case KFileItemListView::IconsLayout:   IconsModeSettings::setPreviewSize(previewSize); break;
-        case KFileItemListView::CompactLayout: CompactModeSettings::setPreviewSize(previewSize); break;
-        case KFileItemListView::DetailsLayout: DetailsModeSettings::setPreviewSize(previewSize); break;
-        default: Q_ASSERT(false); break;
-        }
+        settings.setPreviewSize(previewSize);
     } else {
         const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(level);
-        switch (itemLayout()) {
-        case KFileItemListView::IconsLayout:   IconsModeSettings::setIconSize(iconSize); break;
-        case KFileItemListView::CompactLayout: CompactModeSettings::setIconSize(iconSize); break;
-        case KFileItemListView::DetailsLayout: DetailsModeSettings::setIconSize(iconSize); break;
-        default: Q_ASSERT(false); break;
-        }
+        settings.setIconSize(iconSize);
     }
 
     updateGridSize();
@@ -158,6 +149,7 @@ void DolphinItemListContainer::setItemLayout(KFileItemListView::Layout layout)
         break;
     }
 
+    updateFont();
     updateGridSize();
     endTransaction();
 }
@@ -177,26 +169,21 @@ void DolphinItemListContainer::endTransaction()
     m_fileItemListView->endTransaction();
 }
 
+void DolphinItemListContainer::refresh()
+{
+    ViewModeSettings settings(viewMode());
+    settings.readConfig();
+
+    updateFont();
+    updateGridSize();
+}
+
 void DolphinItemListContainer::updateGridSize()
 {
-    // Calculate the size of the icon
-    int iconSize;
-    if (previewsShown()) {
-        switch (itemLayout()) {
-        case KFileItemListView::IconsLayout:   iconSize = IconsModeSettings::previewSize(); break;
-        case KFileItemListView::CompactLayout: iconSize = CompactModeSettings::previewSize(); break;
-        case KFileItemListView::DetailsLayout: iconSize = DetailsModeSettings::previewSize(); break;
-        default: Q_ASSERT(false); break;
-        }
-    } else {
-        switch (itemLayout()) {
-        case KFileItemListView::IconsLayout:   iconSize = IconsModeSettings::iconSize(); break;
-        case KFileItemListView::CompactLayout: iconSize = CompactModeSettings::iconSize(); break;
-        case KFileItemListView::DetailsLayout: iconSize = DetailsModeSettings::iconSize(); break;
-        default: Q_ASSERT(false); break;
-        }
-    }
+    const ViewModeSettings settings(viewMode());
 
+    // Calculate the size of the icon
+    const int iconSize = previewsShown() ? settings.previewSize() : settings.iconSize();
     m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(QSize(iconSize, iconSize));
     KItemListStyleOption styleOption = m_fileItemListView->styleOption();
 
@@ -236,4 +223,35 @@ void DolphinItemListContainer::updateGridSize()
     m_fileItemListView->setItemSize(QSizeF(itemWidth, itemHeight));
 }
 
+void DolphinItemListContainer::updateFont()
+{
+    KItemListStyleOption styleOption = m_fileItemListView->styleOption();
+
+    const ViewModeSettings settings(viewMode());
+
+    QFont font(settings.fontFamily(), qRound(settings.fontSize()));
+    font.setItalic(settings.italicFont());
+    font.setWeight(settings.fontWeight());
+    font.setPointSizeF(settings.fontSize());
+
+    styleOption.font = font;
+    styleOption.fontMetrics = QFontMetrics(font);
+
+    m_fileItemListView->setStyleOption(styleOption);
+}
+
+ViewModeSettings::ViewMode DolphinItemListContainer::viewMode() const
+{
+    ViewModeSettings::ViewMode mode;
+
+    switch (itemLayout()) {
+    case KFileItemListView::IconsLayout:   mode = ViewModeSettings::IconsMode; break;
+    case KFileItemListView::CompactLayout: mode = ViewModeSettings::CompactMode; break;
+    case KFileItemListView::DetailsLayout: mode = ViewModeSettings::DetailsMode; break;
+    default: Q_ASSERT(false); break;
+    }
+
+    return mode;
+}
+
 #include "dolphinitemlistcontainer.moc"
diff --git a/src/views/dolphinitemlistcontainer.h b/src/views/dolphinitemlistcontainer.h
index 9cf4bff3f..d91b96a34 100644
--- a/src/views/dolphinitemlistcontainer.h
+++ b/src/views/dolphinitemlistcontainer.h
@@ -22,6 +22,7 @@
 
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kitemlistcontainer.h>
+#include <settings/viewmodes/viewmodesettings.h>
 
 #include <libdolphin_export.h>
 
@@ -63,8 +64,16 @@ public:
     void beginTransaction();
     void endTransaction();
 
+    /**
+     * Refreshs the view by reapplying the (changed) viewmode settings.
+     */
+    void refresh();
+
 private:
     void updateGridSize();
+    void updateFont();
+
+    ViewModeSettings::ViewMode viewMode() const;
 
 private:
     int m_zoomLevel;
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index fdca4cf86..f2dcbaf85 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -445,15 +445,9 @@ void DolphinView::stopLoading()
 
 void DolphinView::refresh()
 {
-    const bool oldActivationState = m_active;
-    const int oldZoomLevel = zoomLevel();
-    m_active = true;
-
+    m_container->refresh();
     applyViewProperties();
     reload();
-
-    setActive(oldActivationState);
-    updateZoomLevel(oldZoomLevel);
 }
 
 void DolphinView::setNameFilter(const QString& nameFilter)
@@ -1244,16 +1238,6 @@ void DolphinView::pasteToUrl(const KUrl& url)
     KonqOperations::doPaste(this, url);
 }
 
-void DolphinView::updateZoomLevel(int oldZoomLevel)
-{
-    Q_UNUSED(oldZoomLevel);
- /*   const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
-    if (oldZoomLevel != newZoomLevel) {
-        m_viewModeController->setZoomLevel(newZoomLevel);
-        emit zoomLevelChanged(newZoomLevel);
-    }*/
-}
-
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
     KUrl::List urls;
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index b8a1077f7..fa0baa61e 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -695,14 +695,6 @@ private:
     void pasteToUrl(const KUrl& url);
 
     /**
-     * Checks whether the current item view has the same zoom level
-     * as \a oldZoomLevel. If this is not the case, the zoom level
-     * of the controller is updated and a zoomLevelChanged() signal
-     * is emitted.
-     */
-    void updateZoomLevel(int oldZoomLevel);
-
-    /**
      * Returns a list of URLs for all selected items. The list is
      * simplified, so that when the URLs are part of different tree
      * levels, only the parent is returned.