X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/71819c80bb79229da4c4a9c5fc57ae7fab3fd0d4..ca7aaecbdbddb27f7442e69d2770b97b4307f338:/src/columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index aa84fc398..e59492a92 100644
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -22,6 +22,8 @@
 #include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_columnmodesettings.h"
+#include "iconsizegroupbox.h"
+#include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -37,9 +39,7 @@
 
 ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     ViewSettingsPageBase(parent),
-    m_smallIconSize(0),
-    m_mediumIconSize(0),
-    m_largeIconSize(0),
+    m_iconSizeGroupBox(0),
     m_fontRequester(0),
     m_columnWidthSlider(0)
 {
@@ -49,6 +49,32 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
 
     setSpacing(spacing);
     setMargin(margin);
+    
+    // Create "Icon" properties
+    m_iconSizeGroupBox = new IconSizeGroupBox(this);
+    m_iconSizeGroupBox->setSizePolicy(sizePolicy);
+    
+    const int min = ZoomLevelInfo::minimumLevel();
+    const int max = ZoomLevelInfo::maximumLevel();
+    m_iconSizeGroupBox->setDefaultSizeRange(min, max);
+    m_iconSizeGroupBox->setPreviewSizeRange(min, max);
+    
+    connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
+            this, SIGNAL(changed()));
+    connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),
+            this, SIGNAL(changed()));
+
+    // create "Text" properties
+    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
+    textBox->setSizePolicy(sizePolicy);
+
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
+    m_fontRequester = new DolphinFontRequester(textBox);
+    connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
+
+    QHBoxLayout* textLayout = new QHBoxLayout(textBox);
+    textLayout->addWidget(fontLabel);
+    textLayout->addWidget(m_fontRequester);
 
     // create "Column Width" properties
     QGroupBox* columnWidthBox = new QGroupBox(i18nc("@title:group", "Column Width"), this);
@@ -68,39 +94,6 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     columnWidthLayout->addWidget(m_columnWidthSlider);
     columnWidthLayout->addWidget(largeLabel);
 
-    // Create 'Icon' properties
-    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);
-    iconSizeBox->setSizePolicy(sizePolicy);
-
-    m_smallIconSize  = new QRadioButton(i18nc("@option:radio Icon Size", "Small"), this);
-    m_mediumIconSize = new QRadioButton(i18nc("@option:radio Icon Size", "Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18nc("@option:radio Icon Size", "Large"), this);
-    connect(m_smallIconSize,  SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_mediumIconSize, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_largeIconSize,  SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-
-    QButtonGroup* iconSizeGroup = new QButtonGroup(this);
-    iconSizeGroup->addButton(m_smallIconSize);
-    iconSizeGroup->addButton(m_mediumIconSize);
-    iconSizeGroup->addButton(m_largeIconSize);
-
-    QHBoxLayout* iconSizeLayout = new QHBoxLayout(iconSizeBox);
-    iconSizeLayout->addWidget(m_smallIconSize);
-    iconSizeLayout->addWidget(m_mediumIconSize);
-    iconSizeLayout->addWidget(m_largeIconSize);
-
-    // create "Text" properties
-    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
-    textBox->setSizePolicy(sizePolicy);
-
-    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
-    m_fontRequester = new DolphinFontRequester(textBox);
-    connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
-
-    QHBoxLayout* textLayout = new QHBoxLayout(textBox);
-    textLayout->addWidget(fontLabel);
-    textLayout->addWidget(m_fontRequester);
-
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
@@ -117,13 +110,10 @@ void ColumnViewSettingsPage::applySettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
-    int iconSize = KIconLoader::SizeSmall;
-    if (m_mediumIconSize->isChecked()) {
-        iconSize = KIconLoader::SizeMedium;
-    } else if (m_largeIconSize->isChecked()) {
-        iconSize = KIconLoader::SizeLarge;
-    }
+    const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->defaultSizeValue());
+    const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->previewSizeValue());
     settings->setIconSize(iconSize);
+    settings->setPreviewSize(previewSize);
 
     const QFont font = m_fontRequester->font();
     settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
@@ -147,19 +137,13 @@ void ColumnViewSettingsPage::loadSettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
-    switch (settings->iconSize()) {
-    case KIconLoader::SizeLarge:
-        m_largeIconSize->setChecked(true);
-        break;
-
-    case KIconLoader::SizeMedium:
-        m_mediumIconSize->setChecked(true);
-        break;
-
-    case KIconLoader::SizeSmall:
-    default:
-        m_smallIconSize->setChecked(true);
-    }
+    const QSize iconSize(settings->iconSize(), settings->iconSize());
+    const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
+    m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);
+    
+    const QSize previewSize(settings->previewSize(), settings->previewSize());
+    const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
+    m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue);
 
     if (settings->useSystemFont()) {
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);