X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d511752c9de4d9adc30a15ddf9bf89efc1924a7b..80ad31f00a6c2bfa54f7164aa2a5c9f6b30f1eab:/src/columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index 25150b212..44d2a4127 100644
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.cpp
@@ -19,21 +19,21 @@
 
 #include "columnviewsettingspage.h"
 
+#include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_columnmodesettings.h"
 
 #include <kdialog.h>
-#include <kfontrequester.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>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSlider>
+#include <QRadioButton>
 
 ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
                                                QWidget* parent) :
@@ -42,7 +42,8 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     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,6 +52,23 @@ 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);
@@ -74,7 +92,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     textBox->setSizePolicy(sizePolicy);
 
     QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
-    m_fontRequester = new KFontRequester(textBox);
+    m_fontRequester = new DolphinFontRequester(textBox);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);
     textLayout->addWidget(fontLabel);
@@ -96,19 +114,23 @@ void ColumnViewSettingsPage::applySettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
-    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()
@@ -123,24 +145,31 @@ void ColumnViewSettingsPage::loadSettings()
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
 
     switch (settings->iconSize()) {
-    case K3Icon::SizeLarge:
+    case KIconLoader::SizeLarge:
         m_largeIconSize->setChecked(true);
         break;
 
-    case K3Icon::SizeMedium:
+    case KIconLoader::SizeMedium:
         m_mediumIconSize->setChecked(true);
         break;
 
-    case K3Icon::SizeSmall:
+    case KIconLoader::SizeSmall:
     default:
         m_smallIconSize->setChecked(true);
     }
 
-    QFont font(settings->fontFamily(),
-               settings->fontSize());
-    font.setItalic(settings->italicFont());
-    font.setBold(settings->boldFont());
-    m_fontRequester->setFont(font);
+    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"