X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d38de66f4b97a6d9cd30f3fc69e66b343ca312dc..fbd7cb02a511ff869d74aa4e758203a1cd340962:/src/columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index f5e2319bf..5918eaf92 100644
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -22,28 +22,26 @@
 #include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_columnmodesettings.h"
+#include "iconsizegroupbox.h"
+#include "zoomlevelinfo.h"
 
 #include <kdialog.h>
 #include <klocale.h>
+#include <kcombobox.h>
 
 #include <QButtonGroup>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QSlider>
 #include <QRadioButton>
 
-ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
-                                               QWidget* parent) :
-    KVBox(parent),
-    m_mainWindow(mainWindow),
-    m_smallIconSize(0),
-    m_mediumIconSize(0),
-    m_largeIconSize(0),
+ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
+    ViewSettingsPageBase(parent),
+    m_iconSizeGroupBox(0),
     m_fontRequester(0),
-    m_columnWidthSlider(0)
+    m_textWidthBox(0)
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -52,51 +50,40 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    // create "Column Width" properties
-    QGroupBox* columnWidthBox = new QGroupBox(i18nc("@title:group", "Column Width"), this);
-    columnWidthBox->setSizePolicy(sizePolicy);
-
-    QLabel* smallLabel = new QLabel(i18nc("@item:inrange Column Width", "Small"), columnWidthBox);
-    m_columnWidthSlider = new QSlider(Qt::Horizontal, columnWidthBox);
-    m_columnWidthSlider->setMinimum(0);
-    m_columnWidthSlider->setMaximum(5);
-    m_columnWidthSlider->setPageStep(1);
-    m_columnWidthSlider->setTickPosition(QSlider::TicksBelow);
-    QLabel* largeLabel = new QLabel(i18nc("@item:inrange Column Width", "Large"), columnWidthBox);
-
-    QHBoxLayout* columnWidthLayout = new QHBoxLayout(columnWidthBox);
-    columnWidthLayout->addWidget(smallLabel);
-    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);
-
-    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);
 
-    // create "Text" properties
-    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
-    textBox->setSizePolicy(sizePolicy);
+    const int min = ZoomLevelInfo::minimumLevel();
+    const int max = ZoomLevelInfo::maximumLevel();
+    m_iconSizeGroupBox->setDefaultSizeRange(min, max);
+    m_iconSizeGroupBox->setPreviewSizeRange(min, max);
 
-    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
-    m_fontRequester = new DolphinFontRequester(textBox);
+    connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)),
+            this, SIGNAL(changed()));
+    connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)),
+            this, SIGNAL(changed()));
 
-    QHBoxLayout* textLayout = new QHBoxLayout(textBox);
-    textLayout->addWidget(fontLabel);
-    textLayout->addWidget(m_fontRequester);
+    // create "Text" properties
+    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
@@ -114,23 +101,21 @@ 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);
     settings->setFontFamily(font.family());
     settings->setFontSize(font.pointSize());
     settings->setItalicFont(font.italic());
-    settings->setBoldFont(font.bold());
+    settings->setFontWeight(font.weight());
 
-    const int columnWidth = 150 + (m_columnWidthSlider->value() * 50);
-    settings->setColumnWidth(columnWidth);
+    // TODO:
+    //const int columnWidth = 150 + (m_columnWidthSlider->value() * 50);
+    //settings->setColumnWidth(columnWidth);
 }
 
 void ColumnViewSettingsPage::restoreDefaults()
@@ -144,19 +129,13 @@ void ColumnViewSettingsPage::loadSettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
-    switch (settings->iconSize()) {
-    case KIconLoader::SizeLarge:
-        m_largeIconSize->setChecked(true);
-        break;
+    const QSize iconSize(settings->iconSize(), settings->iconSize());
+    const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
+    m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue);
 
-    case KIconLoader::SizeMedium:
-        m_mediumIconSize->setChecked(true);
-        break;
-
-    case KIconLoader::SizeSmall:
-    default:
-        m_smallIconSize->setChecked(true);
-    }
+    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);
@@ -164,12 +143,13 @@ void ColumnViewSettingsPage::loadSettings()
         QFont font(settings->fontFamily(),
                    settings->fontSize());
         font.setItalic(settings->italicFont());
-        font.setBold(settings->boldFont());
+        font.setWeight(settings->fontWeight());
         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }
 
-    m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);
+    // TODO:
+    //m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);
 }
 
 #include "columnviewsettingspage.moc"