Increase version number to 1.5

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

diff --git a/src/settings/columnviewsettingspage.cpp b/src/settings/columnviewsettingspage.cpp
index 828d812f494352698abb15be0e567c5961df3534..b1c3e119c31d42b324c4b3317f4b8c2a07f036ee 100644 (file)
--- a/src/settings/columnviewsettingspage.cpp
+++ b/src/settings/columnviewsettingspage.cpp
@@ -77,6 +77,7 @@ 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"));
+    m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
     connect(m_textWidthBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
 
     QGridLayout* textGroupLayout = new QGridLayout(textGroup);
@@ -109,13 +110,12 @@ 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();
 }
@@ -144,15 +144,15 @@ void ColumnViewSettingsPage::loadSettings()
         m_fontRequester->setMode(DolphinFontRequester::SystemFont);
     } else {
         QFont font(settings->fontFamily(),
-                   settings->fontSize());
+                   qRound(settings->fontSize()));
         font.setItalic(settings->italicFont());
         font.setWeight(settings->fontWeight());
+        font.setPointSizeF(settings->fontSize());
         m_fontRequester->setMode(DolphinFontRequester::CustomFont);
         m_fontRequester->setCustomFont(font);
     }
 
-    // TODO:
-    //m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);
+    m_textWidthBox->setCurrentIndex((settings->columnWidth() - BaseTextWidth) / TextInc);
 }
 
 #include "columnviewsettingspage.moc"