X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d8ab89171dacd45051060a622aade64e51743cad..4391635b5dcc7470cbd35d9651282696747ce764:/src/viewproperties.cpp diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index c0343350d..b46ecb87e 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * - * peter.penz@gmx.at * + * Copyright (C) 2006 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 * @@ -18,54 +18,86 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include "viewproperties.h" -#include -#include +#include "dolphinsettings.h" +#include "dolphin_directoryviewpropertysettings.h" +#include "dolphin_generalsettings.h" +#include #include #include #include -#include -#include "viewproperties.h" -#include "dolphinsettings.h" -#include "generalsettings.h" +#ifdef HAVE_NEPOMUK + #include +#endif + +#include +#include +#include + +bool ViewProperties::m_nepomukSupport = false; #define FILE_NAME "/.directory" ViewProperties::ViewProperties(const KUrl& url) : - m_changedProps(false), - m_autoSave(true), - m_node(0) + 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(); + 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 = DolphinSettings::instance().generalSettings()->globalViewProps(); + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + const bool useGlobalViewProps = settings->globalViewProps(); if (useGlobalViewProps) { m_filepath = destinationDir("global"); - } - else if (cleanUrl.isLocalFile()) { + } else if (cleanUrl.isLocalFile()) { const QFileInfo info(m_filepath); if (!info.isWritable()) { m_filepath = destinationDir("local") + m_filepath; } - } - else { + } else { m_filepath = destinationDir("remote") + m_filepath; } - m_node = new ViewPropertySettings(KSharedConfig::openConfig(m_filepath + FILE_NAME)); + const QString file = m_filepath + FILE_NAME; + m_node = new ViewPropertySettings(KSharedConfig::openConfig(file)); + + const bool useDefaultProps = !useGlobalViewProps && + (!QFileInfo(file).exists() || + (m_node->timestamp() < settings->viewPropsTimestamp())); + if (useDefaultProps) { + // If the .directory file does not exist or the timestamp is too old, + // use the values from the global .directory file instead, which acts + // as default view for new folders in this case. + settings->setGlobalViewProps(true); + + ViewProperties defaultProps(url); + setDirProperties(defaultProps); + + settings->setGlobalViewProps(false); + m_changedProps = false; + } } ViewProperties::~ViewProperties() @@ -113,6 +145,20 @@ void ViewProperties::setShowHiddenFiles(bool show) } } +void ViewProperties::setCategorizedSorting(bool categorized) +{ + if (m_node->categorizedSorting() != categorized) { + m_node->setCategorizedSorting(categorized); + updateTimeStamp(); + } +} + +bool ViewProperties::categorizedSorting() const +{ + return m_node->categorizedSorting(); +} + + bool ViewProperties::showHiddenFiles() const { return m_node->showHiddenFiles(); @@ -128,7 +174,15 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting) DolphinView::Sorting ViewProperties::sorting() const { - return static_cast(m_node->sorting()); + // 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; } void ViewProperties::setSortOrder(Qt::SortOrder sortOrder) @@ -144,13 +198,77 @@ Qt::SortOrder ViewProperties::sortOrder() const return static_cast(m_node->sortOrder()); } +void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list) +{ + int info = NoInfo; + 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; + } + } + + if (m_node->additionalInfo() != info) { + m_node->setAdditionalInfo(info); + updateTimeStamp(); + } +} + +KFileItemDelegate::InformationList ViewProperties::additionalInfo() const +{ + const int info = m_node->additionalInfo(); + + 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); + } + + return list; +} + + void ViewProperties::setDirProperties(const ViewProperties& props) { setViewMode(props.viewMode()); setShowPreview(props.showPreview()); setShowHiddenFiles(props.showHiddenFiles()); + setCategorizedSorting(props.categorizedSorting()); setSorting(props.sorting()); setSortOrder(props.sortOrder()); + setAdditionalInfo(props.additionalInfo()); } void ViewProperties::setAutoSaveEnabled(bool autoSave) @@ -176,19 +294,16 @@ void ViewProperties::save() m_changedProps = false; } -QString ViewProperties::destinationDir(const QString& subDir) const +KUrl ViewProperties::mirroredDirectory() { - QString basePath = KGlobal::instance()->instanceName(); - basePath.append("/view_properties/").append(subDir); - return KStandardDirs::locateLocal("data", basePath); + QString basePath = KGlobal::mainComponent().componentName(); + basePath.append("/view_properties/"); + return KUrl(KStandardDirs::locateLocal("data", basePath)); } -ViewProperties::ViewProperties(const ViewProperties& props) -{ - assert(false); -} - -ViewProperties& ViewProperties::operator = (const ViewProperties& props) +QString ViewProperties::destinationDir(const QString& subDir) const { - assert(false); + QString basePath = KGlobal::mainComponent().componentName(); + basePath.append("/view_properties/").append(subDir); + return KStandardDirs::locateLocal("data", basePath); }