X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f8dd060cadecd9f4c36b79d53dbae706dadf99f6..b5cc2a6924cfd8f59611d3cec2edbb00a08b4ff1:/src/iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index f4c8de577..c1b0d51c3 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -130,7 +130,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     new QLabel(i18n("Number of lines:"), textGroup);
     m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup);
-    m_textlinesCountBox->setValue(settings->numberOfTexlines());
+    m_textlinesCountBox->setValue(settings->numberOfTextlines());
 
     new QLabel(i18n("Text width:"), textGroup);
     m_textWidthBox = new QComboBox(textGroup);
@@ -140,11 +140,12 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     new QLabel(i18n("Additional information:"), textGroup);
     m_additionalInfo = new QComboBox(textGroup);
-    m_additionalInfo->addItem(i18n("No Information"));
-    m_additionalInfo->addItem(i18n("MIME Type"));
-    m_additionalInfo->addItem(i18n("Size"));
-    m_additionalInfo->addItem(i18n("Date"));
-    m_additionalInfo->setCurrentIndex(settings->additionalInfo());
+    m_additionalInfo->addItem(i18n("No Information"), KFileItemDelegate::NoInformation);
+    m_additionalInfo->addItem(i18n("MIME Type"), KFileItemDelegate::FriendlyMimeType);
+    m_additionalInfo->addItem(i18n("Size"), KFileItemDelegate::Size);
+    m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
+    const int index = m_additionalInfo->findData(settings->additionalInfo());
+    m_additionalInfo->setCurrentIndex(index);
 
     Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
@@ -184,9 +185,7 @@ void IconsViewSettingsPage::applySettings()
     const int defaultSize = iconSize(m_iconSizeSlider->value());
     settings->setIconSize(defaultSize);
 
-    int previewSize = //(m_mode == DolphinIconsView::Previews) ?
-                      //iconSize(m_previewSizeSlider->value()) :
-                      defaultSize;
+    int previewSize = iconSize(m_previewSizeSlider->value());
     if (previewSize < defaultSize) {
         // assure that the preview size is never smaller than the icon size
         previewSize = defaultSize;
@@ -205,12 +204,13 @@ void IconsViewSettingsPage::applySettings()
     // width and height
     int gridWidth = defaultSize;
     int gridHeight = defaultSize;
+    const int textSizeIndex = m_textWidthBox->currentIndex();
     if (arrangement == QListView::TopToBottom) {
-        gridWidth += 96;
+        gridWidth += 96 + textSizeIndex * 32;
         gridHeight += 64;
     }
     else {
-        gridWidth += 256;
+        gridWidth += 128 + textSizeIndex * 64;
     }
 
     settings->setGridWidth(gridWidth);
@@ -218,7 +218,9 @@ void IconsViewSettingsPage::applySettings()
 
     settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(fontSize);
-    settings->setNumberOfTexlines(m_textlinesCountBox->value());
+    settings->setNumberOfTextlines(m_textlinesCountBox->value());
+    const int index = m_additionalInfo->currentIndex();
+    settings->setAdditionalInfo(m_additionalInfo->itemData(index).toInt());
 
     settings->setGridSpacing(GRID_SPACING_BASE +
                              m_gridSpacingBox->currentIndex() * GRID_SPACING_INC);