don't use KUrl::upUrl() (thanks to David for the hint!)

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 4c87397e869733ce08b5428502d073f71049e627..d36b1025bf550c1c1789c45ff8d821318f31f9ea 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -79,8 +79,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
-    m_viewMode->addItem(SmallIcon("view-icon"), i18n("Icons"));
-    m_viewMode->addItem(SmallIcon("fileview-text"), i18n("Details"));
+    m_viewMode->addItem(KIcon("view-icon"), i18n("Icons"));
+    m_viewMode->addItem(KIcon("fileview-text"), i18n("Details"));
+    m_viewMode->addItem(KIcon("view-tree"), i18n("Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
 
@@ -104,7 +105,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox);
     m_additionalInfo = new QComboBox(propsBox);
     m_additionalInfo->addItem(i18n("No Information"), KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18n("MIME Type"), KFileItemDelegate::FriendlyMimeType);
+    m_additionalInfo->addItem(i18n("Type"), KFileItemDelegate::FriendlyMimeType);
     m_additionalInfo->addItem(i18n("Size"), KFileItemDelegate::Size);
     m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
     const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo());
@@ -208,7 +209,6 @@ void ViewPropertiesDialog::slotApply()
 
 void ViewPropertiesDialog::slotViewModeChanged(int index)
 {
-    Q_ASSERT((index >= 0) && (index <= 1));
     m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
     m_isDirty = true;
 
@@ -303,6 +303,7 @@ void ViewPropertiesDialog::applyViewProperties()
     m_dolphinView->setMode(m_viewProps->viewMode());
     m_dolphinView->setSorting(m_viewProps->sorting());
     m_dolphinView->setSortOrder(m_viewProps->sortOrder());
+    m_dolphinView->setAdditionalInfo(m_viewProps->additionalInfo());
     m_dolphinView->setShowPreview(m_viewProps->showPreview());
     m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles());