X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f11c699fa203dd2cde0e85c63a6d186e3fa6a3de..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index ea45c9688..8838ee7ec 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -23,16 +23,16 @@
 #include "dolphin_detailsmodesettings.h"
 
 #include <kdialog.h>
-#include <kfontrequester.h>
+#include <dolphinfontrequester.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 <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QRadioButton>
 #include <QtGui/QSpinBox>
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
@@ -42,7 +42,8 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_smallIconSize(0),
     m_mediumIconSize(0),
     m_largeIconSize(0),
-    m_fontRequester(0)
+    m_fontRequester(0),
+    m_expandableFolders(0)
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -74,12 +75,15 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(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);
     textLayout->addWidget(m_fontRequester);
 
+    // create "Expandable Folders" checkbox
+    m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable Folders"), this);
+
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
@@ -105,10 +109,13 @@ void DetailsViewSettingsPage::applySettings()
     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());
+
+    settings->setExpandableFolders(m_expandableFolders->isChecked());
 }
 
 void DetailsViewSettingsPage::restoreDefaults()
@@ -136,11 +143,18 @@ void DetailsViewSettingsPage::loadSettings()
         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_expandableFolders->setChecked(settings->expandableFolders());
 }
 
 #include "detailsviewsettingspage.moc"