X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3c1c185400a55103cea3ed567de167df87b59945..670695ec01c816a2a123853342a316d235a07641:/src/viewproperties.cpp diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index f5fdbbf3a..3e08358f7 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz () * - * Copyright (C) 2006 by Aaron J. Seigo () * + * Copyright (C) 2006-2010 by Peter Penz * + * Copyright (C) 2006 by Aaron J. Seigo * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -20,7 +20,7 @@ #include "viewproperties.h" -#include "dolphinsettings.h" +#include "additionalinfoaccessor.h" #include "dolphin_directoryviewpropertysettings.h" #include "dolphin_generalsettings.h" @@ -29,57 +29,35 @@ #include #include -#ifdef HAVE_NEPOMUK - #include -#endif - #include #include #include -bool ViewProperties::m_nepomukSupport = false; - -#define FILE_NAME "/.directory" +#include "settings/dolphinsettings.h" 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.path(); - - if ((m_filepath.length() < 1) || (m_filepath.at(0) != QChar('/'))) { - m_node = new ViewPropertySettings(); - return; - } - - // We try and save it to a file in the directory being viewed. + // We try and save it to the file .directory 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. GeneralSettings* settings = DolphinSettings::instance().generalSettings(); const bool useGlobalViewProps = settings->globalViewProps(); if (useGlobalViewProps) { - m_filepath = destinationDir("global"); - } else if (cleanUrl.isLocalFile()) { - const QFileInfo info(m_filepath); + m_filePath = destinationDir("global"); + } 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("local") + m_filePath; } } else { - m_filepath = destinationDir("remote") + 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 && @@ -135,7 +113,6 @@ bool ViewProperties::showPreview() const return m_node->showPreview(); } - void ViewProperties::setShowHiddenFiles(bool show) { if (m_node->showHiddenFiles() != show) { @@ -157,7 +134,6 @@ bool ViewProperties::categorizedSorting() const return m_node->categorizedSorting(); } - bool ViewProperties::showHiddenFiles() const { return m_node->showHiddenFiles(); @@ -173,15 +149,7 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting) 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(m_node->sorting()); - const bool sortByName = !m_nepomukSupport && - ((sorting == DolphinView::SortByRating) || (sorting == DolphinView::SortByTags)); - if (sortByName) { - sorting = DolphinView::SortByName; - } - return sorting; + return static_cast(m_node->sorting()); } void ViewProperties::setSortOrder(Qt::SortOrder sortOrder) @@ -197,47 +165,51 @@ Qt::SortOrder ViewProperties::sortOrder() const return static_cast(m_node->sortOrder()); } -void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list) +void ViewProperties::setSortFoldersFirst(bool foldersFirst) +{ + if (m_node->sortFoldersFirst() != foldersFirst) { + m_node->setSortFoldersFirst(foldersFirst); + updateTimeStamp(); + } +} + +bool ViewProperties::sortFoldersFirst() const +{ + return m_node->sortFoldersFirst(); +} + +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::FriendlyMimeType: - info = info | TypeInfo; - break; - case KFileItemDelegate::Size: - info = info | SizeInfo; - break; - case KFileItemDelegate::ModificationTime: - info = info | DateInfo; - break; - default: - break; - } + infoMask = infoMask | infoAccessor.bitValue(currentInfo); } - if (m_node->additionalInfo() != info) { - m_node->setAdditionalInfo(info); + const int encodedInfo = encodedAdditionalInfo(infoMask); + if (m_node->additionalInfo() != encodedInfo) { + m_node->setAdditionalInfo(encodedInfo); updateTimeStamp(); } } KFileItemDelegate::InformationList ViewProperties::additionalInfo() const { - const int info = m_node->additionalInfo(); + KFileItemDelegate::InformationList usedInfos; - KFileItemDelegate::InformationList list; - if (info & TypeInfo) { - list.append(KFileItemDelegate::FriendlyMimeType); - } - if (info & SizeInfo) { - list.append(KFileItemDelegate::Size); - } - if (info & DateInfo) { - list.append(KFileItemDelegate::ModificationTime); + 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; } @@ -249,6 +221,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props) setCategorizedSorting(props.categorizedSorting()); setSorting(props.sorting()); setSortOrder(props.sortOrder()); + setSortFoldersFirst(props.sortFoldersFirst()); setAdditionalInfo(props.additionalInfo()); } @@ -270,7 +243,7 @@ void ViewProperties::updateTimeStamp() void ViewProperties::save() { - KStandardDirs::makeDir(m_filepath); + KStandardDirs::makeDir(m_filePath); m_node->writeConfig(); m_changedProps = false; } @@ -288,3 +261,50 @@ QString ViewProperties::destinationDir(const QString& subDir) const basePath.append("/view_properties/").append(subDir); return KStandardDirs::locateLocal("data", basePath); } + +int ViewProperties::encodedAdditionalInfo(int info) const +{ + int encodedInfo = m_node->additionalInfo(); + + switch (viewMode()) { + case DolphinView::DetailsView: + encodedInfo = (encodedInfo & 0xFFFF00) | info; + break; + case DolphinView::IconsView: + encodedInfo = (encodedInfo & 0xFF00FF) | (info << 8); + break; + case DolphinView::ColumnView: + encodedInfo = (encodedInfo & 0x00FFFF) | (info << 16); + break; + default: break; + } + + return encodedInfo; +} + +int ViewProperties::decodedAdditionalInfo() const +{ + int decodedInfo = m_node->additionalInfo(); + + switch (viewMode()) { + case DolphinView::DetailsView: + decodedInfo = decodedInfo & 0xFF; + 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 + AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance(); + decodedInfo = infoAccessor.bitValue(KFileItemDelegate::Size) | + infoAccessor.bitValue(KFileItemDelegate::ModificationTime); + } + break; + case DolphinView::IconsView: + decodedInfo = (decodedInfo >> 8) & 0xFF; + break; + case DolphinView::ColumnView: + decodedInfo = (decodedInfo >> 16) & 0xFF; + break; + default: break; + } + + return decodedInfo; +}