X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b2719884b9cdd31b293e785aebabddabf374383d..86d2aa321d54bf3ae6c95476d649634fd0ff68d5:/src/views/viewproperties.cpp diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 30deb7277..597baa293 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -23,15 +23,14 @@ #include "dolphin_directoryviewpropertysettings.h" #include "dolphin_generalsettings.h" -#include -#include -#include -#include +#include +#include "dolphindebug.h" #include #include #include #include +#include namespace { const int AdditionalInfoViewPropertiesVersion = 1; @@ -41,31 +40,31 @@ namespace { // 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"; + const char ViewPropertiesFileName[] = ".directory"; } -ViewProperties::ViewProperties(const KUrl& url) : +ViewProperties::ViewProperties(const QUrl& url) : m_changedProps(false), m_autoSave(true), 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. // If the directory is not writable by the user or the directory is not local, // we store the properties information in a local file. if (useGlobalViewProps) { - m_filePath = destinationDir("global"); - } else if (url.protocol().contains("search")) { - m_filePath = destinationDir("search/") + directoryHashForUrl(url); + m_filePath = destinationDir(QStringLiteral("global")); + } else if (url.scheme().contains(QStringLiteral("search"))) { + m_filePath = destinationDir(QStringLiteral("search/")) + directoryHashForUrl(url); useDetailsViewWithPath = true; - } else if (url.protocol() == QLatin1String("trash")) { - m_filePath = destinationDir("trash"); + } else if (url.scheme() == QLatin1String("trash")) { + m_filePath = destinationDir(QStringLiteral("trash")); useDetailsViewWithPath = true; } else if (url.isLocalFile()) { m_filePath = url.toLocalFile(); @@ -80,10 +79,10 @@ ViewProperties::ViewProperties(const KUrl& url) : // m_filePath probably begins with C:/ - the colon is not a valid character for paths though m_filePath = QDir::separator() + m_filePath.remove(QLatin1Char(':')); #endif - m_filePath = destinationDir("local") + m_filePath; + m_filePath = destinationDir(QStringLiteral("local")) + m_filePath; } } else { - m_filePath = destinationDir("remote") + m_filePath; + m_filePath = destinationDir(QStringLiteral("remote")) + m_filePath; } const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName; @@ -97,16 +96,16 @@ ViewProperties::ViewProperties(const KUrl& url) : if (useDefaultProps) { if (useDetailsViewWithPath) { setViewMode(DolphinView::DetailsView); - setVisibleRoles(QList() << "path"); + setVisibleRoles({"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 QUrl ensures that the global view-properties + // are loaded. + QUrl emptyUrl; + ViewProperties defaultProps(emptyUrl); setDirProperties(defaultProps); - settings->setGlobalViewProps(false); m_changedProps = false; } } @@ -250,6 +249,7 @@ void ViewProperties::setVisibleRoles(const QList& roles) } // Add the updated values for the current view-mode + newVisibleRoles.reserve(roles.count()); foreach (const QByteArray& role, roles) { newVisibleRoles.append(prefix + role); } @@ -285,8 +285,7 @@ QList ViewProperties::visibleRoles() const // by "CustomizedDetails"), also a details-view with no additional information // is accepted. - QList roles; - roles.append("text"); + QList roles{"text"}; // Iterate through all stored keys and append all roles that match to // the current view mode. @@ -361,10 +360,11 @@ void ViewProperties::update() void ViewProperties::save() { - kDebug() << "Saving view-properties to" << m_filePath; - KStandardDirs::makeDir(m_filePath); + qCDebug(DolphinDebug) << "Saving view-properties to" << m_filePath; + QDir dir; + dir.mkpath(m_filePath); m_node->setVersion(CurrentViewPropertiesVersion); - m_node->writeConfig(); + m_node->save(); m_changedProps = false; } @@ -376,9 +376,9 @@ bool ViewProperties::exist() const 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("/view_properties/").append(subDir); + return path; } QString ViewProperties::viewModePrefix() const @@ -386,10 +386,10 @@ QString ViewProperties::viewModePrefix() const QString prefix; switch (m_node->viewMode()) { - case DolphinView::IconsView: prefix = "Icons_"; break; - case DolphinView::CompactView: prefix = "Compact_"; break; - case DolphinView::DetailsView: prefix = "Details_"; break; - default: kWarning() << "Unknown view-mode of the view properties"; + case DolphinView::IconsView: prefix = QStringLiteral("Icons_"); break; + case DolphinView::CompactView: prefix = QStringLiteral("Compact_"); break; + case DolphinView::DetailsView: prefix = QStringLiteral("Details_"); break; + default: qCWarning(DolphinDebug) << "Unknown view-mode of the view properties"; } return prefix; @@ -412,7 +412,7 @@ void ViewProperties::convertAdditionalInfo() if (index >= 0 && index + 1 < visibleRole.length()) { ++index; if (visibleRole[index] == QLatin1Char('L')) { - visibleRole.replace("LinkDestination", "destination"); + visibleRole.replace(QLatin1String("LinkDestination"), QLatin1String("destination")); } else { visibleRole[index] = visibleRole[index].toLower(); } @@ -439,7 +439,7 @@ void ViewProperties::convertNameRoleToTextRole() QString sortRole = m_node->sortRole(); if (sortRole == QLatin1String("name")) { - sortRole = QLatin1String("text"); + sortRole = QStringLiteral("text"); } m_node->setVisibleRoles(visibleRoles); @@ -461,18 +461,10 @@ bool ViewProperties::isPartOfHome(const QString& filePath) return filePath.startsWith(homePath); } -QString ViewProperties::directoryHashForUrl(const KUrl& url) +QString ViewProperties::directoryHashForUrl(const QUrl& url) { - const QByteArray hashValue = QCryptographicHash::hash(url.prettyUrl().toLatin1(), - QCryptographicHash::Sha1); + const QByteArray hashValue = QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Sha1); QString hashString = hashValue.toBase64(); hashString.replace('/', '-'); return hashString; } - -KUrl ViewProperties::mirroredDirectory() -{ - QString basePath = KGlobal::mainComponent().componentName(); - basePath.append("/view_properties/"); - return KUrl(KStandardDirs::locateLocal("data", basePath)); -}