SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index df28a0858c5e71011538da7837e43f5aa39f34bc..d31dc11bae7510ef3c54b6aacef0ae834cabeb3c 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -7,23 +7,22 @@
 #include "dolphinitemlistview.h"
 
 #include "dolphin_compactmodesettings.h"
 #include "dolphinitemlistview.h"
 
 #include "dolphin_compactmodesettings.h"

+#include "dolphin_contentdisplaysettings.h"

 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphinfileitemlistwidget.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphinfileitemlistwidget.h"

-#include "kitemviews/kfileitemmodel.h"
-#include "kitemviews/kitemlistcontroller.h"
-#include "views/viewmodecontroller.h"
+#include "settings/viewmodes/viewmodesettings.h"

 #include "zoomlevelinfo.h"
 
 #include <KIO/PreviewJob>
 #include "zoomlevelinfo.h"
 
 #include <KIO/PreviewJob>

+#include <QtMath>

 
 

-
-DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) :
-    KFileItemListView(parent),
-    m_zoomLevel(0)
+DolphinItemListView::DolphinItemListView(QGraphicsWidget *parent)
+    : KFileItemListView(parent)
+    , m_zoomLevel(0)

 {
 {

-    updateFont();
+    DolphinItemListView::updateFont();

     updateGridSize();
 }
 
     updateGridSize();
 }
 


@@ -46,7 +45,7 @@ void DolphinItemListView::setZoomLevel(int level)
 
     m_zoomLevel = level;
 
 
     m_zoomLevel = level;
 

-    ViewModeSettings settings(viewMode());
+    ViewModeSettings settings(itemLayout());

     if (previewsShown()) {
         const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(level);
         settings.setPreviewSize(previewSize);
     if (previewsShown()) {
         const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(level);
         settings.setPreviewSize(previewSize);


@@ -63,20 +62,38 @@ int DolphinItemListView::zoomLevel() const
     return m_zoomLevel;
 }
 
     return m_zoomLevel;
 }
 

+void DolphinItemListView::setEnabledSelectionToggles(DolphinItemListView::SelectionTogglesEnabled selectionTogglesEnabled)
+{
+    m_selectionTogglesEnabled = selectionTogglesEnabled;
+    switch (m_selectionTogglesEnabled) {
+    case True:
+        return setEnabledSelectionToggles(true);
+    case False:
+        return setEnabledSelectionToggles(false);
+    case FollowSetting:
+        return setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+    }
+}
+

 void DolphinItemListView::readSettings()
 {
 void DolphinItemListView::readSettings()
 {

-    ViewModeSettings settings(viewMode());
-    settings.readConfig();
+    // We load the settings for all view modes now because we don't load them when the view mode changes.
+    IconsModeSettings::self()->load();
+    CompactModeSettings::self()->load();
+    DetailsModeSettings::self()->load();
+
+    ContentDisplaySettings::self()->load();

 
     beginTransaction();
 
 
     beginTransaction();
 

-    setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+    setEnabledSelectionToggles(m_selectionTogglesEnabled);
+    setHighlightEntireRow(itemLayoutHighlightEntireRow(itemLayout()));

     setSupportsItemExpanding(itemLayoutSupportsItemExpanding(itemLayout()));
 
     updateFont();
     updateGridSize();
 
     setSupportsItemExpanding(itemLayoutSupportsItemExpanding(itemLayout()));
 
     updateFont();
     updateGridSize();
 

-    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));

     setEnabledPlugins(globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()));
     setLocalFileSizePreviewLimit(globalConfig.readEntry("MaximumSize", 0));
     endTransaction();
     setEnabledPlugins(globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()));
     setLocalFileSizePreviewLimit(globalConfig.readEntry("MaximumSize", 0));
     endTransaction();


@@ -89,11 +106,16 @@ void DolphinItemListView::writeSettings()
     DetailsModeSettings::self()->save();
 }
 
     DetailsModeSettings::self()->save();
 }
 

-KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const
+KItemListWidgetCreatorBase *DolphinItemListView::defaultWidgetCreator() const

 {
     return new KItemListWidgetCreator<DolphinFileItemListWidget>();
 }
 
 {
     return new KItemListWidgetCreator<DolphinFileItemListWidget>();
 }
 

+bool DolphinItemListView::itemLayoutHighlightEntireRow(ItemLayout layout) const
+{
+    return layout == DetailsLayout && DetailsModeSettings::highlightEntireRow();
+}
+

 bool DolphinItemListView::itemLayoutSupportsItemExpanding(ItemLayout layout) const
 {
     return layout == DetailsLayout && DetailsModeSettings::expandableFolders();
 bool DolphinItemListView::itemLayoutSupportsItemExpanding(ItemLayout layout) const
 {
     return layout == DetailsLayout && DetailsModeSettings::expandableFolders();


@@ -115,8 +137,7 @@ void DolphinItemListView::onPreviewsShownChanged(bool shown)
     updateGridSize();
 }
 
     updateGridSize();
 }
 

-void DolphinItemListView::onVisibleRolesChanged(const QList<QByteArray>& current,
-                                                const QList<QByteArray>& previous)
+void DolphinItemListView::onVisibleRolesChanged(const QList<QByteArray> &current, const QList<QByteArray> &previous)

 {
     KFileItemListView::onVisibleRolesChanged(current, previous);
     updateGridSize();
 {
     KFileItemListView::onVisibleRolesChanged(current, previous);
     updateGridSize();


@@ -124,15 +145,12 @@ void DolphinItemListView::onVisibleRolesChanged(const QList<QByteArray>& current
 
 void DolphinItemListView::updateFont()
 {
 
 void DolphinItemListView::updateFont()
 {

-    const ViewModeSettings settings(viewMode());
+    const ViewModeSettings settings(itemLayout());

 
     if (settings.useSystemFont()) {
         KItemListView::updateFont();
     } else {
 
     if (settings.useSystemFont()) {
         KItemListView::updateFont();
     } else {

-        QFont font(settings.fontFamily(), qRound(settings.fontSize()));
-        font.setItalic(settings.italicFont());
-        font.setWeight(settings.fontWeight());
-        font.setPointSizeF(settings.fontSize());
+        QFont font(settings.viewFont());

 
         KItemListStyleOption option = styleOption();
         option.font = font;
 
         KItemListStyleOption option = styleOption();
         option.font = font;


@@ -144,7 +162,7 @@ void DolphinItemListView::updateFont()
 
 void DolphinItemListView::updateGridSize()
 {
 
 void DolphinItemListView::updateGridSize()
 {

-    const ViewModeSettings settings(viewMode());
+    const ViewModeSettings settings(itemLayout());

 
     // Calculate the size of the icon
     const int iconSize = previewsShown() ? settings.previewSize() : settings.iconSize();
 
     // Calculate the size of the icon
     const int iconSize = previewsShown() ? settings.previewSize() : settings.iconSize();


@@ -163,11 +181,15 @@ void DolphinItemListView::updateGridSize()
 
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {
 
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {

-        const int minItemWidth = 48;
-        itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64;
-
-        if (itemWidth < iconSize + padding * 2) {
-            itemWidth = iconSize + padding * 2;
+        // an exponential factor based on zoom, 0 -> 1, 4 -> 1.36 8 -> ~1.85, 16 -> 3.4
+        auto zoomFactor = qExp(m_zoomLevel / 13.0);
+        // 9 is the average char width for 10pt Noto Sans, making fontFactor =1
+        // by each pixel the font gets larger the factor increases by 1/9
+        auto fontFactor = option.fontMetrics.averageCharWidth() / 9.0;
+        itemWidth = 48 + IconsModeSettings::textWidthIndex() * 64 * fontFactor * zoomFactor;
+
+        if (itemWidth < iconSize + padding * 2 * zoomFactor) {
+            itemWidth = iconSize + padding * 2 * zoomFactor;

         }
 
         itemHeight = padding * 3 + iconSize + option.fontMetrics.lineSpacing();
         }
 
         itemHeight = padding * 3 + iconSize + option.fontMetrics.lineSpacing();


@@ -216,19 +238,4 @@ void DolphinItemListView::updateGridSize()
     endTransaction();
 }
 
     endTransaction();
 }
 

-ViewModeSettings::ViewMode DolphinItemListView::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:                               mode = ViewModeSettings::IconsMode;
-                                           Q_ASSERT(false);
-                                           break;
-    }
-
-    return mode;
-}
-
+#include "moc_dolphinitemlistview.cpp"