#include <KComponentData>
#include <KLocale>
-#include <KStandardDirs>
#include <KUrl>
+#include <KDebug>
+#include <KGlobal>
#include <QCryptographicHash>
#include <QDate>
#include <QFile>
#include <QFileInfo>
+#include <QStandardPaths>
namespace {
const int AdditionalInfoViewPropertiesVersion = 1;
// String representation to mark the additional properties of
// the details view as customized by the user. See
// ViewProperties::visibleRoles() for more information.
- const char* CustomizedDetailsString = "CustomizedDetails";
+ const char CustomizedDetailsString[] = "CustomizedDetails";
+
+ // Filename that is used for storing the properties
+ const char ViewPropertiesFileName[] = ".directory";
}
ViewProperties::ViewProperties(const KUrl& url) :
m_node(0)
{
GeneralSettings* settings = GeneralSettings::self();
- const bool useGlobalViewProps = settings->globalViewProps();
+ const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty();
bool useDetailsViewWithPath = false;
// We try and save it to the file .directory in the directory being viewed.
useDetailsViewWithPath = true;
} else if (url.isLocalFile()) {
m_filePath = url.toLocalFile();
- const QFileInfo info(m_filePath);
- if (!info.isWritable() || !isPartOfHome(m_filePath)) {
+ const QFileInfo dirInfo(m_filePath);
+ const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);
+ // Check if the directory is writable and check if the ".directory" file exists and
+ // is read- and writable.
+ if (!dirInfo.isWritable()
+ || (fileInfo.exists() && !(fileInfo.isReadable() && fileInfo.isWritable()))
+ || !isPartOfHome(m_filePath)) {
#ifdef Q_OS_WIN
// m_filePath probably begins with C:/ - the colon is not a valid character for paths though
m_filePath = QDir::separator() + m_filePath.remove(QLatin1Char(':'));
m_filePath = destinationDir("remote") + m_filePath;
}
- const QString file = m_filePath + QDir::separator() + QLatin1String(".directory");
+ const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName;
m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
// If the .directory file does not exist or the timestamp is too old,
// use default values instead.
const bool useDefaultProps = (!useGlobalViewProps || useDetailsViewWithPath) &&
- (!QFileInfo(file).exists() ||
+ (!QFile::exists(file) ||
(m_node->timestamp() < settings->viewPropsTimestamp()));
if (useDefaultProps) {
if (useDetailsViewWithPath) {
setVisibleRoles(QList<QByteArray>() << "path");
} else {
// The global view-properties act as default for directories without
- // any view-property configuration
- settings->setGlobalViewProps(true);
-
- ViewProperties defaultProps(url);
+ // any view-property configuration. Constructing a ViewProperties
+ // instance for an empty KUrl ensures that the global view-properties
+ // are loaded.
+ KUrl emptyUrl;
+ ViewProperties defaultProps(emptyUrl);
setDirProperties(defaultProps);
- settings->setGlobalViewProps(false);
m_changedProps = false;
}
}
+
+ if (m_node->version() < CurrentViewPropertiesVersion) {
+ // The view-properties have an outdated version. Convert the properties
+ // to the changes of the current version.
+ if (m_node->version() < AdditionalInfoViewPropertiesVersion) {
+ convertAdditionalInfo();
+ Q_ASSERT(m_node->version() == AdditionalInfoViewPropertiesVersion);
+ }
+
+ if (m_node->version() < NameRolePropertiesVersion) {
+ convertNameRoleToTextRole();
+ Q_ASSERT(m_node->version() == NameRolePropertiesVersion);
+ }
+
+ m_node->setVersion(CurrentViewPropertiesVersion);
+ }
}
ViewProperties::~ViewProperties()
QByteArray ViewProperties::sortRole() const
{
- if (m_node->version() <= NameRolePropertiesVersion) {
- const_cast<ViewProperties*>(this)->convertNameRoleToTextRole();
- }
-
return m_node->sortRole().toLatin1();
}
void ViewProperties::setVisibleRoles(const QList<QByteArray>& roles)
{
+ if (roles == visibleRoles()) {
+ return;
+ }
+
// See ViewProperties::visibleRoles() for the storage format
// of the additional information.
roles.append("text");
// Iterate through all stored keys and append all roles that match to
- // the curren view mode.
+ // the current view mode.
const QString prefix = viewModePrefix();
const int prefixLength = prefix.length();
- QStringList visibleRoles = m_node->visibleRoles();
- const int version = m_node->version();
- if (visibleRoles.isEmpty() && version <= AdditionalInfoViewPropertiesVersion) {
- // Convert the obsolete additionalInfo-property from older versions into the
- // visibleRoles-property
- const_cast<ViewProperties*>(this)->convertAdditionalInfo();
- visibleRoles = m_node->visibleRoles();
- } else if (version <= NameRolePropertiesVersion) {
- const_cast<ViewProperties*>(this)->convertNameRoleToTextRole();
- visibleRoles = m_node->visibleRoles();
- }
-
+ const QStringList visibleRoles = m_node->visibleRoles();
foreach (const QString& visibleRole, visibleRoles) {
if (visibleRole.startsWith(prefix)) {
const QByteArray role = visibleRole.right(visibleRole.length() - prefixLength).toLatin1();
setSortFoldersFirst(props.sortFoldersFirst());
setVisibleRoles(props.visibleRoles());
setHeaderColumnWidths(props.headerColumnWidths());
+ m_node->setVersion(props.m_node->version());
}
void ViewProperties::setAutoSaveEnabled(bool autoSave)
void ViewProperties::save()
{
- KStandardDirs::makeDir(m_filePath);
+ kDebug() << "Saving view-properties to" << m_filePath;
+ QDir dir;
+ dir.mkpath(m_filePath);
m_node->setVersion(CurrentViewPropertiesVersion);
m_node->writeConfig();
m_changedProps = false;
}
-KUrl ViewProperties::mirroredDirectory()
+bool ViewProperties::exist() const
{
- QString basePath = KGlobal::mainComponent().componentName();
- basePath.append("/view_properties/");
- return KUrl(KStandardDirs::locateLocal("data", basePath));
+ const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName;
+ return QFile::exists(file);
}
QString ViewProperties::destinationDir(const QString& subDir) const
{
- QString basePath = KGlobal::mainComponent().componentName();
- basePath.append("/view_properties/").append(subDir);
- return KStandardDirs::locateLocal("data", basePath);
+ QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+ path.append(KGlobal::mainComponent().componentName());
+ path.append("/view_properties/").append(subDir);
+ return path;
}
QString ViewProperties::viewModePrefix() const
m_node->setAdditionalInfo(QStringList());
m_node->setVisibleRoles(visibleRoles);
+ m_node->setVersion(AdditionalInfoViewPropertiesVersion);
update();
}
{
QStringList visibleRoles = m_node->visibleRoles();
for (int i = 0; i < visibleRoles.count(); ++i) {
- if (visibleRoles[i].endsWith("_name")) {
+ if (visibleRoles[i].endsWith(QLatin1String("_name"))) {
const int leftLength = visibleRoles[i].length() - 5;
visibleRoles[i] = visibleRoles[i].left(leftLength) + "_text";
}
m_node->setVisibleRoles(visibleRoles);
m_node->setSortRole(sortRole);
+ m_node->setVersion(NameRolePropertiesVersion);
update();
}
projects / dolphin.git / blobdiff