From dbc8874c00c35aaefacdd03f8aef9e4ac4e2be01 Mon Sep 17 00:00:00 2001 From: Fredrik Höglund Date: Mon, 1 Oct 2007 22:06:49 +0000 Subject: Port dolphin to the KFileItemDelegate API changes. svn path=/trunk/KDE/kdebase/apps/; revision=719796 --- src/viewpropertiesdialog.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/viewpropertiesdialog.cpp') diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 899a3d3a0..36fe0a954 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -269,11 +269,11 @@ void ViewPropertiesDialog::slotCategorizedSortingChanged() void ViewPropertiesDialog::slotAdditionalInfoChanged(int index) { - KFileItemDelegate::AdditionalInformation info = KFileItemDelegate::NoInformation; + KFileItemDelegate::InformationList info; switch (index) { - case 1: info = KFileItemDelegate::FriendlyMimeType; break; - case 2: info = KFileItemDelegate::Size; break; - case 3: info = KFileItemDelegate::ModificationTime; break; + case 1: info << KFileItemDelegate::FriendlyMimeType; break; + case 2: info << KFileItemDelegate::Size; break; + case 3: info << KFileItemDelegate::ModificationTime; break; default: break; } m_viewProps->setAdditionalInfo(info); @@ -376,7 +376,8 @@ void ViewPropertiesDialog::loadSettings() m_sorting->setCurrentIndex(m_viewProps->sorting()); // load additional info - const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo()); + KFileItemDelegate::InformationList info = m_viewProps->additionalInfo(); + const int addInfoIndex = m_additionalInfo->findData(info.isEmpty() ? KFileItemDelegate::NoInformation : info.first()); m_additionalInfo->setCurrentIndex(addInfoIndex); m_additionalInfo->setEnabled(iconsViewEnabled); -- cgit v1.3