there is no need anymore to check whether the KDirLister is currently loading before...

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 899a3d3a053bbc3c946dd78daeb16dc17d047cea..49d42f4ffd06b9eb7c38d0d54982c0d2eacc2880 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -121,14 +121,15 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     sortingBox->setLayout(sortingLayout);
 
     QLabel* additionalInfoLabel = new QLabel(i18nc("@label:listbox", "Additional information:"), propsBox);
+    // TODO: the additional information can be shown in parallel since today
     m_additionalInfo = new QComboBox(propsBox);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "No Information"),
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
                               KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Type"),
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
                               KFileItemDelegate::FriendlyMimeType);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Size"),
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
                               KFileItemDelegate::Size);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Date"),
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
                               KFileItemDelegate::ModificationTime);
 
     m_showPreview = new QCheckBox(i18nc("@option:check", "Show preview"), propsBox);
@@ -269,11 +270,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 +377,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);