X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..2b8e67d7f260847c803eac33712ba69b6785bd1d:/src/viewproperties.cpp diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index 52129bd80..835be2aad 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 * @@ -15,84 +15,73 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include "viewproperties.h" -#include -#include -#include +#include "dolphinsettings.h" +#include "dolphin_directoryviewpropertysettings.h" +#include "dolphin_generalsettings.h" +#include #include #include #include -#include "viewproperties.h" - -#include "dolphinsettings.h" +#include +#include +#include #define FILE_NAME "/.directory" -ViewProperties::ViewProperties(KUrl url) : - m_changedProps(false), - m_autoSave(true), - m_subDirValidityHidden(false), - m_node(0) +ViewProperties::ViewProperties(const KUrl& url) : + m_changedProps(false), + m_autoSave(true), + m_node(0) { - url.cleanPath(true); - m_filepath = url.path(); + 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 - // if the directory is not writable by the user or the directory is not local - // we store the properties information in a local file - QString rootDir("/"); // TODO: should this be set to the root of the bookmark, if any? - if (url.isLocalFile()) { - QFileInfo info(m_filepath); - + // 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. + 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); if (!info.isWritable()) { - QString basePath = KGlobal::instance()->instanceName(); - basePath.append("/view_properties/local"); - rootDir = locateLocal("data", basePath); - m_filepath = rootDir + m_filepath; + m_filepath = destinationDir("local") + m_filepath; } - } - else { - QString basePath = KGlobal::instance()->instanceName(); - basePath.append("/view_properties/remote/").append(url.host()); - rootDir = locateLocal("data", basePath); - m_filepath = rootDir + m_filepath; + } 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)); - QDir dir(m_filepath); - const bool isValidForSubDirs = m_node->validForSubDirs(); - while ((dir.path() != rootDir) && dir.cdUp()) { - QString parentPath(dir.path() + FILE_NAME); + 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); - if (!QFile::exists(parentPath)) - { - continue; - } + ViewProperties defaultProps(url); + setDirProperties(defaultProps); - ViewPropertySettings parentNode(KSharedConfig::openConfig(dir.path() + FILE_NAME)); - const bool inheritProps = parentNode.validForSubDirs() && - (parentNode.timestamp() > m_node->timestamp()); - - if (inheritProps) { - *m_node = parentNode; - break; - } - } - - if (isValidForSubDirs) { - m_subDirValidityHidden = true; + settings->setGlobalViewProps(false); + m_changedProps = false; } } @@ -103,6 +92,7 @@ ViewProperties::~ViewProperties() } delete m_node; + m_node = 0; } void ViewProperties::setViewMode(DolphinView::Mode mode) @@ -118,7 +108,21 @@ DolphinView::Mode ViewProperties::viewMode() const return static_cast(m_node->viewMode()); } -void ViewProperties::setShowHiddenFilesEnabled(bool show) +void ViewProperties::setShowPreview(bool show) +{ + if (m_node->showPreview() != show) { + m_node->setShowPreview(show); + updateTimeStamp(); + } +} + +bool ViewProperties::showPreview() const +{ + return m_node->showPreview(); +} + + +void ViewProperties::setShowHiddenFiles(bool show) { if (m_node->showHiddenFiles() != show) { m_node->setShowHiddenFiles(show); @@ -126,7 +130,21 @@ void ViewProperties::setShowHiddenFilesEnabled(bool show) } } -bool ViewProperties::isShowHiddenFilesEnabled() const +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(); } @@ -157,17 +175,29 @@ Qt::SortOrder ViewProperties::sortOrder() const return static_cast(m_node->sortOrder()); } -void ViewProperties::setValidForSubDirs(bool valid) +void ViewProperties::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) { - if (m_node->validForSubDirs() != valid) { - m_node->setValidForSubDirs(valid); + if (m_node->additionalInfo() != info) { + m_node->setAdditionalInfo(info); updateTimeStamp(); } } -bool ViewProperties::isValidForSubDirs() const +KFileItemDelegate::AdditionalInformation ViewProperties::additionalInfo() const +{ + return static_cast(m_node->additionalInfo()); +} + + +void ViewProperties::setDirProperties(const ViewProperties& props) { - return m_node->validForSubDirs(); + 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) @@ -193,16 +223,16 @@ void ViewProperties::save() m_changedProps = false; } -ViewProperties& ViewProperties::operator = (const ViewProperties& props) +KUrl ViewProperties::mirroredDirectory() { - if (&props != this) { - m_changedProps = props.m_changedProps; - m_autoSave = props.m_autoSave; - m_subDirValidityHidden = props.m_subDirValidityHidden; - m_filepath = props.m_filepath; - m_node = new ViewPropertySettings(); - //*m_node = *(props.m_node); - } + QString basePath = KGlobal::mainComponent().componentName(); + basePath.append("/view_properties/"); + return KUrl(KStandardDirs::locateLocal("data", basePath)); +} - return *this; +QString ViewProperties::destinationDir(const QString& subDir) const +{ + QString basePath = KGlobal::mainComponent().componentName(); + basePath.append("/view_properties/").append(subDir); + return KStandardDirs::locateLocal("data", basePath); }