#include "viewproperties.h"
-#include "additionalinfoaccessor.h"
#include "dolphin_directoryviewpropertysettings.h"
#include "dolphin_generalsettings.h"
#include <KStandardDirs>
#include <KUrl>
+#include <QCryptographicHash>
#include <QDate>
#include <QFile>
#include <QFileInfo>
-#include "settings/dolphinsettings.h"
-
namespace {
+ const int AdditionalInfoViewPropertiesVersion = 1;
+ const int NameRolePropertiesVersion = 2;
+ const int CurrentViewPropertiesVersion = 3;
+
// String representation to mark the additional properties of
// the details view as customized by the user. See
- // ViewProperties::additionalInfoV2() for more information.
+ // ViewProperties::visibleRoles() for more information.
const char* CustomizedDetailsString = "CustomizedDetails";
}
m_autoSave(true),
m_node(0)
{
- GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+ GeneralSettings* settings = GeneralSettings::self();
const bool useGlobalViewProps = settings->globalViewProps();
bool useDetailsViewWithPath = false;
if (useGlobalViewProps) {
m_filePath = destinationDir("global");
} else if (url.protocol().contains("search")) {
- m_filePath = destinationDir("search");
+ m_filePath = destinationDir("search/") + directoryHashForUrl(url);
useDetailsViewWithPath = true;
} else if (url.protocol() == QLatin1String("trash")) {
m_filePath = destinationDir("trash");
m_filePath = url.toLocalFile();
const QFileInfo info(m_filePath);
if (!info.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(':'));
+#endif
m_filePath = destinationDir("local") + m_filePath;
}
} else {
if (useDefaultProps) {
if (useDetailsViewWithPath) {
setViewMode(DolphinView::DetailsView);
- setAdditionalInfo(KFileItemDelegate::InformationList() << KFileItemDelegate::LocalPathOrUrl);
+ setVisibleRoles(QList<QByteArray>() << "path");
} else {
// The global view-properties act as default for directories without
// any view-property configuration
DolphinView::Mode ViewProperties::viewMode() const
{
- return static_cast<DolphinView::Mode>(m_node->viewMode());
+ const int mode = qBound(0, m_node->viewMode(), 2);
+ return static_cast<DolphinView::Mode>(mode);
}
-void ViewProperties::setShowPreview(bool show)
+void ViewProperties::setPreviewsShown(bool show)
{
- if (m_node->showPreview() != show) {
- m_node->setShowPreview(show);
+ if (m_node->previewsShown() != show) {
+ m_node->setPreviewsShown(show);
update();
}
}
-bool ViewProperties::showPreview() const
+bool ViewProperties::previewsShown() const
{
- return m_node->showPreview();
+ return m_node->previewsShown();
}
-void ViewProperties::setShowHiddenFiles(bool show)
+void ViewProperties::setHiddenFilesShown(bool show)
{
- if (m_node->showHiddenFiles() != show) {
- m_node->setShowHiddenFiles(show);
+ if (m_node->hiddenFilesShown() != show) {
+ m_node->setHiddenFilesShown(show);
update();
}
}
-void ViewProperties::setCategorizedSorting(bool categorized)
+void ViewProperties::setGroupedSorting(bool grouped)
{
- if (m_node->categorizedSorting() != categorized) {
- m_node->setCategorizedSorting(categorized);
+ if (m_node->groupedSorting() != grouped) {
+ m_node->setGroupedSorting(grouped);
update();
}
}
-bool ViewProperties::categorizedSorting() const
+bool ViewProperties::groupedSorting() const
{
- return m_node->categorizedSorting();
+ return m_node->groupedSorting();
}
-bool ViewProperties::showHiddenFiles() const
+bool ViewProperties::hiddenFilesShown() const
{
- return m_node->showHiddenFiles();
+ return m_node->hiddenFilesShown();
}
-void ViewProperties::setSorting(DolphinView::Sorting sorting)
+void ViewProperties::setSortRole(const QByteArray& role)
{
- if (m_node->sorting() != sorting) {
- m_node->setSorting(sorting);
+ if (m_node->sortRole() != role) {
+ m_node->setSortRole(role);
update();
}
}
-DolphinView::Sorting ViewProperties::sorting() const
+QByteArray ViewProperties::sortRole() const
{
- return static_cast<DolphinView::Sorting>(m_node->sorting());
+ return m_node->sortRole().toLatin1();
}
void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)
return m_node->sortFoldersFirst();
}
-void ViewProperties::setAdditionalInfo(const KFileItemDelegate::InformationList& list)
+void ViewProperties::setVisibleRoles(const QList<QByteArray>& roles)
{
- // See ViewProperties::additionalInfoV2() for the storage format
+ // See ViewProperties::visibleRoles() for the storage format
// of the additional information.
// Remove the old values stored for the current view-mode
- const QStringList oldInfoStringList = m_node->additionalInfoV2();
+ const QStringList oldVisibleRoles = m_node->visibleRoles();
const QString prefix = viewModePrefix();
- QStringList newInfoStringList = oldInfoStringList;
- for (int i = newInfoStringList.count() - 1; i >= 0; --i) {
- if (newInfoStringList.at(i).startsWith(prefix)) {
- newInfoStringList.removeAt(i);
+ QStringList newVisibleRoles = oldVisibleRoles;
+ for (int i = newVisibleRoles.count() - 1; i >= 0; --i) {
+ if (newVisibleRoles[i].startsWith(prefix)) {
+ newVisibleRoles.removeAt(i);
}
}
// Add the updated values for the current view-mode
- AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- foreach (KFileItemDelegate::Information info, list) {
- newInfoStringList.append(prefix + infoAccessor.value(info));
- }
-
- // Only update the information if it has been changed
- bool changed = oldInfoStringList.count() != newInfoStringList.count();
- if (!changed) {
- foreach (const QString& oldInfoString, oldInfoStringList) {
- if (!newInfoStringList.contains(oldInfoString)) {
- changed = true;
- break;
- }
- }
+ foreach (const QByteArray& role, roles) {
+ newVisibleRoles.append(prefix + role);
}
- if (changed) {
- if (m_node->version() < 2) {
- m_node->setVersion(2);
- }
-
+ if (oldVisibleRoles != newVisibleRoles) {
const bool markCustomizedDetails = (m_node->viewMode() == DolphinView::DetailsView)
- && !newInfoStringList.contains(CustomizedDetailsString);
+ && !newVisibleRoles.contains(CustomizedDetailsString);
if (markCustomizedDetails) {
// The additional information of the details-view has been modified. Set a marker,
- // so that it is allowed to also show no additional information
- // (see fallback in ViewProperties::additionalInfoV2, if no additional information is
- // available).
- newInfoStringList.append(CustomizedDetailsString);
+ // so that it is allowed to also show no additional information without doing the
+ // fallback to show the size and date per default.
+ newVisibleRoles.append(CustomizedDetailsString);
}
- m_node->setAdditionalInfoV2(newInfoStringList);
+ m_node->setVisibleRoles(newVisibleRoles);
update();
}
}
-KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
+QList<QByteArray> ViewProperties::visibleRoles() const
{
- KFileItemDelegate::InformationList usedInfo;
+ // The shown additional information is stored for each view-mode separately as
+ // string with the view-mode as prefix. Example:
+ //
+ // AdditionalInfo=Details_size,Details_date,Details_owner,Icons_size
+ //
+ // To get the representation as QList<QByteArray>, the current
+ // view-mode must be checked and the values of this mode added to the list.
+ //
+ // For the details-view a special case must be respected: Per default the size
+ // and date should be shown without creating a .directory file. Only if
+ // the user explictly has modified the properties of the details view (marked
+ // by "CustomizedDetails"), also a details-view with no additional information
+ // is accepted.
+
+ QList<QByteArray> roles;
+ roles.append("text");
+
+ // Iterate through all stored keys and append all roles that match to
+ // the curren view mode.
+ const QString prefix = viewModePrefix();
+ const int prefixLength = prefix.length();
- switch (m_node->version()) {
- case 1: usedInfo = additionalInfoV1(); break;
- case 2: usedInfo = additionalInfoV2(); break;
- default: kWarning() << "Unknown version of the view properties";
+ 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
+ visibleRoles = const_cast<ViewProperties*>(this)->convertAdditionalInfo();
+ } else if (version <= NameRolePropertiesVersion) {
+ visibleRoles = const_cast<ViewProperties*>(this)->convertNameRole();
}
- return usedInfo;
+ foreach (const QString& visibleRole, visibleRoles) {
+ if (visibleRole.startsWith(prefix)) {
+ const QByteArray role = visibleRole.right(visibleRole.length() - prefixLength).toLatin1();
+ if (role != "text") {
+ roles.append(role);
+ }
+ }
+ }
+
+ // For the details view the size and date should be shown per default
+ // until the additional information has been explicitly changed by the user
+ const bool useDefaultValues = roles.count() == 1 // "text"
+ && (m_node->viewMode() == DolphinView::DetailsView)
+ && !visibleRoles.contains(CustomizedDetailsString);
+ if (useDefaultValues) {
+ roles.append("size");
+ roles.append("date");
+ }
+
+ return roles;
}
+void ViewProperties::setHeaderColumnWidths(const QList<int>& widths)
+{
+ if (m_node->headerColumnWidths() != widths) {
+ m_node->setHeaderColumnWidths(widths);
+ update();
+ }
+}
+
+QList<int> ViewProperties::headerColumnWidths() const
+{
+ return m_node->headerColumnWidths();
+}
void ViewProperties::setDirProperties(const ViewProperties& props)
{
setViewMode(props.viewMode());
- setShowPreview(props.showPreview());
- setShowHiddenFiles(props.showHiddenFiles());
- setCategorizedSorting(props.categorizedSorting());
- setSorting(props.sorting());
+ setPreviewsShown(props.previewsShown());
+ setHiddenFilesShown(props.hiddenFilesShown());
+ setGroupedSorting(props.groupedSorting());
+ setSortRole(props.sortRole());
setSortOrder(props.sortOrder());
setSortFoldersFirst(props.sortFoldersFirst());
- setAdditionalInfo(props.additionalInfo());
+ setVisibleRoles(props.visibleRoles());
+ setHeaderColumnWidths(props.headerColumnWidths());
}
void ViewProperties::setAutoSaveEnabled(bool autoSave)
{
m_changedProps = true;
m_node->setTimestamp(QDateTime::currentDateTime());
-
- // If the view-properties are stored in an older format, take
- // care to update them to the current format.
- switch (m_node->version()) {
- case 1: {
- const KFileItemDelegate::InformationList infoList = additionalInfoV1();
- m_node->setVersion(2);
- setAdditionalInfo(infoList);
- break;
- }
- case 2:
- // Current version. Nothing needs to get converted.
- break;
- default:
- kWarning() << "Unknown version of the view properties";
- }
}
void ViewProperties::save()
{
KStandardDirs::makeDir(m_filePath);
+ m_node->setVersion(CurrentViewPropertiesVersion);
m_node->writeConfig();
m_changedProps = false;
}
return KStandardDirs::locateLocal("data", basePath);
}
-KFileItemDelegate::InformationList ViewProperties::additionalInfoV1() const
+QString ViewProperties::viewModePrefix() const
{
- KFileItemDelegate::InformationList usedInfo;
-
- 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;
- }
-
- AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- const KFileItemDelegate::InformationList infoKeys = infoAccessor.keys();
+ QString prefix;
- foreach (const KFileItemDelegate::Information info, infoKeys) {
- if (decodedInfo & infoAccessor.bitValue(info)) {
- usedInfo.append(info);
- }
+ 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";
}
- return usedInfo;
+ return prefix;
}
-KFileItemDelegate::InformationList ViewProperties::additionalInfoV2() const
+QStringList ViewProperties::convertAdditionalInfo()
{
- // The shown additional information is stored for each view-mode separately as
- // string with the view-mode as prefix. Example:
- //
- // AdditionalInfoV2=Details_Size,Details_Date,Details_Owner,Icon_Size
- //
- // To get the representation as KFileItemDelegate::InformationList, the current
- // view-mode must be checked and the values of this mode added to the list.
- //
- // For the details-view a special case must be respected: Per default the size
- // and date should be shown without creating a .directory file. Only if
- // the user explictly has modified the properties of the details view (marked
- // by "CustomizedDetails"), also a details-view with no additional information
- // is accepted.
-
- KFileItemDelegate::InformationList usedInfo;
-
- // infoHash allows to get the mapped KFileItemDelegate::Information value
- // for a stored string-value in a fast way
- static QHash<QString, KFileItemDelegate::Information> infoHash;
- if (infoHash.isEmpty()) {
- AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- const KFileItemDelegate::InformationList keys = infoAccessor.keys();
- foreach (const KFileItemDelegate::Information key, keys) {
- infoHash.insert(infoAccessor.value(key), key);
- }
- }
-
- // Iterate through all stored keys stored as strings and map them to
- // the corresponding KFileItemDelegate::Information values.
- const QString prefix = viewModePrefix();
- const int prefixLength = prefix.length();
- const QStringList infoStringList = m_node->additionalInfoV2();
- foreach (const QString& infoString, infoStringList) {
- if (infoString.startsWith(prefix)) {
- const QString key = infoString.right(infoString.length() - prefixLength);
- Q_ASSERT(infoHash.contains(key));
- usedInfo.append(infoHash.value(key));
+ QStringList visibleRoles;
+
+ const QStringList additionalInfo = m_node->additionalInfo();
+ if (!additionalInfo.isEmpty()) {
+ // Convert the obsolete values like Icons_Size, Details_Date, ...
+ // to Icons_size, Details_date, ... where the suffix just represents
+ // the internal role. One special-case must be handled: "LinkDestination"
+ // has been used for "destination".
+ visibleRoles.reserve(additionalInfo.count());
+ foreach (const QString& info, additionalInfo) {
+ QString visibleRole = info;
+ int index = visibleRole.indexOf('_');
+ if (index >= 0 && index + 1 < visibleRole.length()) {
+ ++index;
+ if (visibleRole[index] == QLatin1Char('L')) {
+ visibleRole.replace("LinkDestination", "destination");
+ } else {
+ visibleRole[index] = visibleRole[index].toLower();
+ }
+ }
+ visibleRoles.append(visibleRole);
}
}
- // For the details view the size and date should be shown per default
- // until the additional information has been explicitly changed by the user
- const bool useDefaultValues = usedInfo.isEmpty()
- && (m_node->viewMode() == DolphinView::DetailsView)
- && !infoStringList.contains(CustomizedDetailsString);
- if (useDefaultValues) {
- usedInfo.append(KFileItemDelegate::Size);
- usedInfo.append(KFileItemDelegate::ModificationTime);
- }
+ m_node->setAdditionalInfo(QStringList());
+ m_node->setVisibleRoles(visibleRoles);
+ update();
- return usedInfo;
+ return visibleRoles;
}
-QString ViewProperties::viewModePrefix() const
+QStringList ViewProperties::convertNameRole()
{
- QString prefix;
-
- switch (m_node->viewMode()) {
- case DolphinView::DetailsView: prefix = "Details_"; break;
- case DolphinView::IconsView: prefix = "Icons_"; break;
- case DolphinView::ColumnView: prefix = "Column_"; break;
- default: kWarning() << "Unknown view-mode of the view properties";
+ QStringList visibleRoles = m_node->visibleRoles();
+ for (int i = 0; i < visibleRoles.count(); ++i) {
+ if (visibleRoles[i].endsWith("_name")) {
+ const int leftLength = visibleRoles[i].length() - 5;
+ visibleRoles[i] = visibleRoles[i].left(leftLength) + "_text";
+ }
}
- return prefix;
+ m_node->setVisibleRoles(visibleRoles);
+ update();
+
+ return visibleRoles;
}
+
bool ViewProperties::isPartOfHome(const QString& filePath)
{
// For performance reasons cache the path in a static QString
return filePath.startsWith(homePath);
}
+
+QString ViewProperties::directoryHashForUrl(const KUrl& url)
+{
+ const QByteArray hashValue = QCryptographicHash::hash(url.prettyUrl().toLatin1(),
+ QCryptographicHash::Sha1);
+ QString hashString = hashValue.toBase64();
+ hashString.replace('/', '-');
+ return hashString;
+}
projects / dolphin.git / blobdiff