Respect floating point font sizes

[dolphin.git] / src / settings / columnviewsettingspage.cpp

diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp
index 5918eaf928e2b458c31cd98d2f5e64598494f295..a935d4e93699c3e2d19bc173fd20935dd9ed3332 100644 (file)
--- a/src/settings/columnviewsettingspage.cpp
+++ b/src/settings/columnviewsettingspage.cpp
@@ -77,7 +77,8 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
     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()));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
+    connect(m_textWidthBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
 
     QGridLayout* textGroupLayout = new QGridLayout(textGroup);
     textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight);
@@ -109,20 +110,22 @@ void ColumnViewSettingsPage::applySettings()
     const QFont font = m_fontRequester->font();
     settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
     settings->setFontFamily(font.family());
-    settings->setFontSize(font.pointSize());
+    settings->setFontSize(font.pointSizeF());
     settings->setItalicFont(font.italic());
     settings->setFontWeight(font.weight());
 
-    // TODO:
-    //const int columnWidth = 150 + (m_columnWidthSlider->value() * 50);
-    //settings->setColumnWidth(columnWidth);
+    const int columnWidth = BaseTextWidth + (m_textWidthBox->currentIndex() * TextInc);
+    settings->setColumnWidth(columnWidth);
+
+    settings->writeConfig();
 }
 
 void ColumnViewSettingsPage::restoreDefaults()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    settings->setDefaults();
+    settings->useDefaults(true);
     loadSettings();
+    settings->useDefaults(false);
 }
 
 void ColumnViewSettingsPage::loadSettings()
@@ -148,8 +151,7 @@ void ColumnViewSettingsPage::loadSettings()
         m_fontRequester->setCustomFont(font);
     }
 
-    // TODO:
-    //m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);
+    m_textWidthBox->setCurrentIndex((settings->columnWidth() - BaseTextWidth) / TextInc);
 }
 
 #include "columnviewsettingspage.moc"