X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e7390eba86f123fe3899d1f42c8e148aba52cf4d..64afe7b22622f79b34aafd54501b08120ab2fc5c:/src/settings/viewpropertiesdialog.cpp

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index c07c072d1..574f8e18e 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,15 +21,13 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "views/dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "viewpropsprogressinfo.h"
 
-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-#include <Nepomuk/ResourceManager>
-#endif
+#include <config-baloo.h>
 
 #include <KComponentData>
 #include <KLocale>
@@ -105,18 +103,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
     m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
 
-    // TODO: Provide a kind of SortingInfoAccessor similar to AdditionalInfoAccessor
-    // to assure that adding a sort-role requires to change only one file
     m_sorting = new KComboBox(sortingBox);
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Permissions"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Owner"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Group"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Link Destination"));
-    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Path"));
+    const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+    foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
+        m_sorting->addItem(info.translation, info.role);
+    }
 
     m_sortFoldersFirst = new QCheckBox(i18nc("@option:check", "Show folders first"));
     m_previewsShown = new QCheckBox(i18nc("@option:check", "Show preview"));
@@ -249,7 +240,8 @@ void ViewPropertiesDialog::slotViewModeChanged(int index)
 
 void ViewPropertiesDialog::slotSortingChanged(int index)
 {
-    m_viewProps->setSorting(static_cast<DolphinView::Sorting>(index));
+    const QByteArray role = m_sorting->itemData(index).toByteArray();
+    m_viewProps->setSortRole(role);
     markAsDirty(true);
 }
 
@@ -295,22 +287,22 @@ void ViewPropertiesDialog::markAsDirty(bool isDirty)
 
 void ViewPropertiesDialog::configureAdditionalInfo()
 {
-    QList<DolphinView::AdditionalInfo> infoList = m_viewProps->additionalInfoList();
-    const bool useDefaultInfo = (m_viewProps->viewMode() == DolphinView::DetailsView) &&
-                                (infoList.isEmpty() || infoList.contains(DolphinView::NoInfo));
-    if (useDefaultInfo) {
+    QList<QByteArray> visibleRoles = m_viewProps->visibleRoles();
+    const bool useDefaultRoles = (m_viewProps->viewMode() == DolphinView::DetailsView) && visibleRoles.isEmpty();
+    if (useDefaultRoles) {
         // Using the details view without any additional information (-> additional column)
         // makes no sense and leads to a usability problem as no viewport area is available
         // anymore. Hence as fallback provide at least a size and date column.
-        infoList.clear();
-        infoList.append(DolphinView::SizeInfo);
-        infoList.append(DolphinView::DateInfo);
-        m_viewProps->setAdditionalInfoList(infoList);
+        visibleRoles.clear();
+        visibleRoles.append("text");
+        visibleRoles.append("size");
+        visibleRoles.append("date");
+        m_viewProps->setVisibleRoles(visibleRoles);
     }
 
-    QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, infoList);
+    QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, visibleRoles);
     if (dialog->exec() == QDialog::Accepted) {
-        m_viewProps->setAdditionalInfoList(dialog->informationList());
+        m_viewProps->setVisibleRoles(dialog->visibleRoles());
         markAsDirty(true);
     }
     delete dialog;
@@ -370,11 +362,11 @@ void ViewPropertiesDialog::applyViewProperties()
     }
 
     m_dolphinView->setMode(m_viewProps->viewMode());
-    m_dolphinView->setSorting(m_viewProps->sorting());
+    m_dolphinView->setSortRole(m_viewProps->sortRole());
     m_dolphinView->setSortOrder(m_viewProps->sortOrder());
     m_dolphinView->setSortFoldersFirst(m_viewProps->sortFoldersFirst());
     m_dolphinView->setGroupedSorting(m_viewProps->groupedSorting());
-    m_dolphinView->setAdditionalInfoList(m_viewProps->additionalInfoList());
+    m_dolphinView->setVisibleRoles(m_viewProps->visibleRoles());
     m_dolphinView->setPreviewsShown(m_viewProps->previewsShown());
     m_dolphinView->setHiddenFilesShown(m_viewProps->hiddenFilesShown());
 
@@ -396,7 +388,17 @@ void ViewPropertiesDialog::loadSettings()
     // Load sort order and sorting
     const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIndex);
-    m_sorting->setCurrentIndex(m_viewProps->sorting());
+
+    const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+    int sortRoleIndex = 0;
+    for (int i = 0; i < rolesInfo.count(); ++i) {
+        if (rolesInfo[i].role == m_viewProps->sortRole()) {
+            sortRoleIndex = i;
+            break;
+        }
+    }
+    m_sorting->setCurrentIndex(sortRoleIndex);
+
     m_sortFoldersFirst->setChecked(m_viewProps->sortFoldersFirst());
 
     // Load show preview, show in groups and show hidden files settings