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

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index 6a25e7e42..aa84fc398 100644
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -19,30 +19,29 @@
 
 #include "columnviewsettingspage.h"
 
+#include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_columnmodesettings.h"
 
 #include <kdialog.h>
-#include <kfontrequester.h>
 #include <klocale.h>
 
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QGroupBox>
-#include <QGridLayout>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QSlider>
 #include <QRadioButton>
-#include <QSpinBox>
 
-ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
-                                               QWidget* parent) :
-    KVBox(parent),
-    m_mainWindow(mainWindow),
+ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
+    ViewSettingsPageBase(parent),
     m_smallIconSize(0),
     m_mediumIconSize(0),
     m_largeIconSize(0),
-    m_fontRequester(0)
+    m_fontRequester(0),
+    m_columnWidthSlider(0)
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -51,29 +50,34 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    Q_ASSERT(settings != 0);
-
-    // Create "Icon" properties
-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
+    // 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);
+    connect(m_columnWidthSlider, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
+
+    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(i18n("Small"), this);
-    m_mediumIconSize = new QRadioButton(i18n("Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18n("Large"), this);
-    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);
-    }
+    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);
@@ -86,16 +90,12 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     iconSizeLayout->addWidget(m_largeIconSize);
 
     // create "Text" properties
-    QGroupBox* textBox = new QGroupBox(i18n("Text"), this);
+    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
     textBox->setSizePolicy(sizePolicy);
 
-    QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);
-    m_fontRequester = new KFontRequester(textBox);
-    QFont font(settings->fontFamily(),
-               settings->fontSize());
-    font.setItalic(settings->italicFont());
-    font.setBold(settings->boldFont());
-    m_fontRequester->setFont(font);
+    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);
@@ -105,6 +105,8 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new QWidget(this);
+
+    loadSettings();
 }
 
 ColumnViewSettingsPage::~ColumnViewSettingsPage()
@@ -114,21 +116,63 @@ ColumnViewSettingsPage::~ColumnViewSettingsPage()
 void ColumnViewSettingsPage::applySettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    Q_ASSERT(settings != 0);
 
-    int iconSize = K3Icon::SizeSmall;
+    int iconSize = KIconLoader::SizeSmall;
     if (m_mediumIconSize->isChecked()) {
-        iconSize = K3Icon::SizeMedium;
+        iconSize = KIconLoader::SizeMedium;
     } else if (m_largeIconSize->isChecked()) {
-        iconSize = K3Icon::SizeLarge;
+        iconSize = KIconLoader::SizeLarge;
     }
     settings->setIconSize(iconSize);
 
     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);
+}
+
+void ColumnViewSettingsPage::restoreDefaults()
+{
+    ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+    settings->setDefaults();
+    loadSettings();
+}
+
+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);
+    }
+
+    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);
+    }
+
+    m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);
 }
 
 #include "columnviewsettingspage.moc"