/***************************************************************************
- * Copyright (C) 2006 by Peter Penz (<peter.penz@gmx.at>) *
+ * Copyright (C) 2006-2010 by Peter Penz (<peter.penz@gmx.at>) *
* Copyright (C) 2006 by Aaron J. Seigo (<aseigo@kde.org>) *
* *
* This program is free software; you can redistribute it and/or modify *
#include "viewproperties.h"
+#include "additionalinfoaccessor.h"
#include "settings/dolphinsettings.h"
#include "dolphin_directoryviewpropertysettings.h"
#include "dolphin_generalsettings.h"
#include <kstandarddirs.h>
#include <kurl.h>
-#ifdef HAVE_NEPOMUK
- #include <nepomuk/resourcemanager.h>
-#endif
-
#include <QDate>
#include <QFile>
#include <QFileInfo>
-bool ViewProperties::m_nepomukSupport = false;
-
-#define FILE_NAME "/.directory"
-
ViewProperties::ViewProperties(const KUrl& url) :
m_changedProps(false),
m_autoSave(true),
m_node(0)
{
-#ifdef HAVE_NEPOMUK
- static bool checkedNepomukSupport = false;
- if (!checkedNepomukSupport) {
- m_nepomukSupport = !Nepomuk::ResourceManager::instance()->init();
- checkedNepomukSupport = true;
- }
-#endif
-
- KUrl cleanUrl(url);
- cleanUrl.cleanPath();
- m_filepath = cleanUrl.toLocalFile();
-
- if ((m_filepath.length() < 1) || (!QDir::isAbsolutePath(m_filepath))) {
- const QString file = destinationDir("global") + FILE_NAME;
- m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
- return;
- }
-
// We try and save it to a file in the directory being viewed.
// If the directory is not writable by the user or the directory is not local,
// we store the properties information in a local file.
const bool useGlobalViewProps = settings->globalViewProps();
if (useGlobalViewProps) {
m_filepath = destinationDir("global");
- } else if (cleanUrl.isLocalFile()) {
+ } else if (url.isLocalFile()) {
+ m_filepath = url.toLocalFile();
const QFileInfo info(m_filepath);
if (!info.isWritable()) {
m_filepath = destinationDir("local") + m_filepath;
m_filepath = destinationDir("remote") + m_filepath;
}
- const QString file = m_filepath + FILE_NAME;
+ const QString file = m_filepath + QDir::separator() + QLatin1String(".directory");
m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
const bool useDefaultProps = !useGlobalViewProps &&
DolphinView::Sorting ViewProperties::sorting() const
{
- // If Nepomuk is not available, return SortByName as fallback if SortByRating
- // or SortByTags is stored.
- DolphinView::Sorting sorting = static_cast<DolphinView::Sorting>(m_node->sorting());
- const bool sortByName = !m_nepomukSupport &&
- ((sorting == DolphinView::SortByRating) || (sorting == DolphinView::SortByTags));
- if (sortByName) {
- sorting = DolphinView::SortByName;
- }
- return sorting;
+ return static_cast<DolphinView::Sorting>(m_node->sorting());
}
void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)
return m_node->sortFoldersFirst();
}
-void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list)
+void ViewProperties::setAdditionalInfo(const KFileItemDelegate::InformationList& list)
{
- int info = NoInfo;
+ AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+
+ int infoMask = 0;
foreach (KFileItemDelegate::Information currentInfo, list) {
- switch (currentInfo) {
- case KFileItemDelegate::Size:
- info = info | SizeInfo;
- break;
- case KFileItemDelegate::ModificationTime:
- info = info | DateInfo;
- break;
- case KFileItemDelegate::Permissions:
- info = info | PermissionsInfo;
- break;
- case KFileItemDelegate::Owner:
- info = info | OwnerInfo;
- break;
- case KFileItemDelegate::OwnerAndGroup:
- info = info | GroupInfo;
- break;
- case KFileItemDelegate::FriendlyMimeType:
- info = info | TypeInfo;
- break;
- default:
- break;
- }
+ infoMask = infoMask | infoAccessor.bitValue(currentInfo);
}
- const int encodedInfo = encodedAdditionalInfo(info);
+ const int encodedInfo = encodedAdditionalInfo(infoMask);
if (m_node->additionalInfo() != encodedInfo) {
m_node->setAdditionalInfo(encodedInfo);
updateTimeStamp();
KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
{
- const int info = decodedAdditionalInfo();
+ KFileItemDelegate::InformationList usedInfos;
- KFileItemDelegate::InformationList list;
- if (info & SizeInfo) {
- list.append(KFileItemDelegate::Size);
- }
- if (info & DateInfo) {
- list.append(KFileItemDelegate::ModificationTime);
- }
- if (info & PermissionsInfo) {
- list.append(KFileItemDelegate::Permissions);
- }
- if (info & OwnerInfo) {
- list.append(KFileItemDelegate::Owner);
- }
- if (info & GroupInfo) {
- list.append(KFileItemDelegate::OwnerAndGroup);
- }
- if (info & TypeInfo) {
- list.append(KFileItemDelegate::FriendlyMimeType);
+ const int decodedInfo = decodedAdditionalInfo();
+
+ AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+ const KFileItemDelegate::InformationList infos = infoAccessor.keys();
+
+ foreach (const KFileItemDelegate::Information info, infos) {
+ if (decodedInfo & infoAccessor.bitValue(info)) {
+ usedInfos.append(info);
+ }
}
- return list;
+ return usedInfos;
}
setCategorizedSorting(props.categorizedSorting());
setSorting(props.sorting());
setSortOrder(props.sortOrder());
+ setSortFoldersFirst(props.sortFoldersFirst());
setAdditionalInfo(props.additionalInfo());
}
switch (viewMode()) {
case DolphinView::DetailsView:
decodedInfo = decodedInfo & 0xFF;
- if (decodedInfo == NoInfo) {
- // a details view without any additional info makes no sense, hence
+ if (decodedInfo == 0) {
+ // A details view without any additional info makes no sense, hence
// provide at least a size-info and date-info as fallback
- decodedInfo = SizeInfo | DateInfo;
+ AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+ decodedInfo = infoAccessor.bitValue(KFileItemDelegate::Size) |
+ infoAccessor.bitValue(KFileItemDelegate::ModificationTime);
}
break;
case DolphinView::IconsView:
projects / dolphin.git / blobdiff