Backport of bugfix 154434 (trunk revision 757791): Remember the additional-info property (size, date, type, ...) for each view mode (icons view, details view, column view) individually.

svn path=/branches/KDE/4.0/kdebase/apps/; revision=758210

1 files changed, 1 insertions, 14 deletions

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 56e75ac10..6bcc78ae8 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -50,7 +50,6 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_textWidthBox(0),
     m_fontRequester(0),
     m_textlinesCountBox(0),
-    m_showAdditionalInfo(0),
     m_arrangementBox(0),
     m_gridSpacingBox(0)
 {
@@ -84,12 +83,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
     m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
 
-    m_showAdditionalInfo = new QCheckBox(i18nc("@option:check",
-                                               "Allow showing of additional information"), textGroup);
-
-    QVBoxLayout* textVBoxLayout = new QVBoxLayout(textGroup);
-
-    QGridLayout* textGroupLayout = new QGridLayout();
+    QGridLayout* textGroupLayout = new QGridLayout(textGroup);
     textGroupLayout->addWidget(fontLabel, 0, 0);
     textGroupLayout->addWidget(m_fontRequester, 0, 1);
     textGroupLayout->addWidget(textlinesCountLabel, 1, 0);
@@ -97,9 +91,6 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     textGroupLayout->addWidget(textWidthLabel, 2, 0);
     textGroupLayout->addWidget(m_textWidthBox, 2, 1);
 
-    textVBoxLayout->addLayout(textGroupLayout);
-    textVBoxLayout->addWidget(m_showAdditionalInfo);
-
     // create the 'Grid' group for selecting the arrangement and the grid spacing
     QGroupBox* gridGroup = new QGroupBox(i18nc("@title:group", "Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
@@ -171,8 +162,6 @@ void IconsViewSettingsPage::applySettings()
 
     settings->setNumberOfTextlines(numberOfTextlines);
 
-    settings->setShowAdditionalInfo(m_showAdditionalInfo->isChecked());
-
     settings->setGridSpacing(GridSpacingBase +
                              m_gridSpacingBox->currentIndex() * GridSpacingInc);
 }
@@ -208,8 +197,6 @@ void IconsViewSettingsPage::loadSettings()
 
     m_textlinesCountBox->setValue(settings->numberOfTextlines());
 
-    m_showAdditionalInfo->setChecked(settings->showAdditionalInfo());
-
     const bool leftToRightArrangement = (settings->arrangement() == QListView::LeftToRight);
     int textWidthIndex = 0;
     const int remainingWidth = settings->itemWidth() - settings->iconSize();