use a smaller step size when using the scroll wheel

[dolphin.git] / src / columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index eefad6764195afea53c53f58861521a5b3f23de9..27774cd33f968460b2571bbaabece5c2f159ce73 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -19,30 +19,29 @@
 
 #include "columnviewsettingspage.h"
 
 
 #include "columnviewsettingspage.h"
 

+#include "dolphinfontrequester.h"

 #include "dolphinsettings.h"
 #include "dolphin_columnmodesettings.h"
 #include "dolphinsettings.h"
 #include "dolphin_columnmodesettings.h"

+#include "iconsizegroupbox.h"
+#include "zoomlevelinfo.h"

 
 #include <kdialog.h>
 
 #include <kdialog.h>

-#include <kfontrequester.h>

 #include <klocale.h>
 #include <klocale.h>

-
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSpinBox>
-
-ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
-                                               QWidget* parent) :
-    KVBox(parent),
-    m_mainWindow(mainWindow),
-    m_smallIconSize(0),
-    m_mediumIconSize(0),
-    m_largeIconSize(0),
-    m_fontRequester(0)
+#include <kcombobox.h>
+
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSlider>
+#include <QRadioButton>
+
+ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
+    ViewSettingsPageBase(parent),
+    m_iconSizeGroupBox(0),
+    m_fontRequester(0),
+    m_textWidthBox(0)

 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();


@@ -50,35 +49,41 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
 
     setSpacing(spacing);
     setMargin(margin);
 
     setSpacing(spacing);
     setMargin(margin);

-
-    // Create 'Icon' properties
-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
-    iconSizeBox->setSizePolicy(sizePolicy);
-
-    m_smallIconSize  = new QRadioButton(i18nc("Size", "Small"), this);
-    m_mediumIconSize = new QRadioButton(i18nc("Size", "Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18nc("Size", "Large"), this);
-
-    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 "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
 
     // create "Text" properties

-    QGroupBox* textBox = new QGroupBox(i18n("Text"), this);
-    textBox->setSizePolicy(sizePolicy);
-
-    QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);
-    m_fontRequester = new KFontRequester(textBox);
-
-    QHBoxLayout* textLayout = new QHBoxLayout(textBox);
-    textLayout->addWidget(fontLabel);
-    textLayout->addWidget(m_fontRequester);
+    QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
+    textGroup->setSizePolicy(sizePolicy);
+
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
+    m_fontRequester = new DolphinFontRequester(textGroup);
+    connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
+
+    QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
+    m_textWidthBox = new KComboBox(textGroup);
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
+    connect(m_textWidthBox, SIGNAL(activated(int)), this, SIGNAL(changed()));
+
+    QGridLayout* textGroupLayout = new QGridLayout(textGroup);
+    textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight);
+    textGroupLayout->addWidget(m_fontRequester, 0, 1);
+    textGroupLayout->addWidget(textWidthLabel, 1, 0, Qt::AlignRight);
+    textGroupLayout->addWidget(m_textWidthBox, 1, 1);

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout


@@ -96,19 +101,21 @@ void ColumnViewSettingsPage::applySettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 

-    int iconSize = K3Icon::SizeSmall;
-    if (m_mediumIconSize->isChecked()) {
-        iconSize = K3Icon::SizeMedium;
-    } else if (m_largeIconSize->isChecked()) {
-        iconSize = K3Icon::SizeLarge;
-    }
+    const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->defaultSizeValue());
+    const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->previewSizeValue());

     settings->setIconSize(iconSize);
     settings->setIconSize(iconSize);

+    settings->setPreviewSize(previewSize);

 
     const QFont font = m_fontRequester->font();
 
     const QFont font = m_fontRequester->font();

+    settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);

     settings->setFontFamily(font.family());
     settings->setFontSize(font.pointSize());
     settings->setItalicFont(font.italic());
     settings->setFontFamily(font.family());
     settings->setFontSize(font.pointSize());
     settings->setItalicFont(font.italic());

-    settings->setBoldFont(font.bold());
+    settings->setFontWeight(font.weight());
+
+    // TODO:
+    //const int columnWidth = 150 + (m_columnWidthSlider->value() * 50);
+    //settings->setColumnWidth(columnWidth);

 }
 
 void ColumnViewSettingsPage::restoreDefaults()
 }
 
 void ColumnViewSettingsPage::restoreDefaults()


@@ -122,25 +129,27 @@ void ColumnViewSettingsPage::loadSettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 

-    switch (settings->iconSize()) {
-    case K3Icon::SizeLarge:
-        m_largeIconSize->setChecked(true);
-        break;
-
-    case K3Icon::SizeMedium:
-        m_mediumIconSize->setChecked(true);
-        break;
-
-    case K3Icon::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);
+    } else {
+        QFont font(settings->fontFamily(),
+                   settings->fontSize());
+        font.setItalic(settings->italicFont());
+        font.setWeight(settings->fontWeight());
+        m_fontRequester->setMode(DolphinFontRequester::CustomFont);
+        m_fontRequester->setCustomFont(font);

     }
 
     }
 

-    QFont font(settings->fontFamily(),
-               settings->fontSize());
-    font.setItalic(settings->italicFont());
-    font.setBold(settings->boldFont());
-    m_fontRequester->setFont(font);
+    // TODO:
+    //m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);

 }
 
 #include "columnviewsettingspage.moc"
 }
 
 #include "columnviewsettingspage.moc"