X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7eef5ebec2ceaebb4088629093ecd3f0c2635816..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 615478627..0a386c89c 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -19,25 +19,26 @@
 
 #include "iconsviewsettingspage.h"
 
+#include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "iconsizedialog.h"
 
 #include "dolphin_iconsmodesettings.h"
 
 #include <kdialog.h>
-#include <kfontrequester.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 
-#include <QtGui/QComboBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QListView>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtCore/QDebug>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QListView>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QGridLayout>
+#include <QVBoxLayout>
 
 IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
                                              QWidget* parent) :
@@ -69,10 +70,12 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     textGroup->setSizePolicy(sizePolicy);
 
     QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
-    m_fontRequester = new KFontRequester(textGroup);
+    m_fontRequester = new DolphinFontRequester(textGroup);
 
     QLabel* textlinesCountLabel = new QLabel(i18nc("@label:textbox", "Number of lines:"), textGroup);
-    m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup);
+    m_textlinesCountBox = new QSpinBox(textGroup);
+    m_textlinesCountBox->setMinimum(1);
+    m_textlinesCountBox->setMaximum(5);
 
     QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
     m_textWidthBox = new QComboBox(textGroup);
@@ -118,7 +121,8 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 }
 
 IconsViewSettingsPage::~IconsViewSettingsPage()
-{}
+{
+}
 
 void IconsViewSettingsPage::applySettings()
 {
@@ -143,7 +147,7 @@ void IconsViewSettingsPage::applySettings()
     const int textSizeIndex = m_textWidthBox->currentIndex();
     if (arrangement == QListView::TopToBottom) {
         itemWidth += TopToBottomBase + textSizeIndex * TopToBottomInc;
-        itemHeight += fontHeight * numberOfTextlines + 16;
+        itemHeight += fontHeight * numberOfTextlines + 10;
     } else {
         itemWidth += LeftToRightBase + textSizeIndex * LeftToRightInc;
     }
@@ -151,10 +155,11 @@ void IconsViewSettingsPage::applySettings()
     settings->setItemWidth(itemWidth);
     settings->setItemHeight(itemHeight);
 
+    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->setNumberOfTextlines(numberOfTextlines);
 
@@ -185,11 +190,16 @@ void IconsViewSettingsPage::loadSettings()
     m_iconSize = settings->iconSize();
     m_previewSize = settings->previewSize();
 
-    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_textlinesCountBox->setValue(settings->numberOfTextlines());