diff options
| author | Peter Penz <[email protected]> | 2010-09-21 19:03:04 +0000 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2010-09-21 19:03:04 +0000 |
| commit | 1e8e05e81f50a7567cc67666ffb8bccab9a10199 (patch) | |
| tree | f7860df72a1e9f09c6ae006caeaea883bb15a38f /src/views/additionalinfoaccessor.cpp | |
| parent | fcef5f7721dbcb2fa5d672ff123edfed078c0006 (diff) | |
It was a bad idea to store the enabled additional-information as bit-values: With the current setup only up to 8 additional informations are possible. This restriction is bypassed now:
- Backward compatibility for old .directorry files is provided
- A version-information has been added for possible future changes
- As "side-effect" it also allows to have a details-view with only one column (#238140)
BUG: 238140
FIXED-IN: 4.6.0
svn path=/trunk/KDE/kdebase/apps/; revision=1177944
Diffstat (limited to 'src/views/additionalinfoaccessor.cpp')
| -rw-r--r-- | src/views/additionalinfoaccessor.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/views/additionalinfoaccessor.cpp b/src/views/additionalinfoaccessor.cpp index 1b445cc99..bcd971516 100644 --- a/src/views/additionalinfoaccessor.cpp +++ b/src/views/additionalinfoaccessor.cpp @@ -81,6 +81,11 @@ QString AdditionalInfoAccessor::translation(KFileItemDelegate::Information info) return i18nc(m_map[info]->context, m_map[info]->translation); } +QString AdditionalInfoAccessor::value(KFileItemDelegate::Information info) const +{ + return m_map[info]->value; +} + DolphinView::Sorting AdditionalInfoAccessor::sorting(KFileItemDelegate::Information info) const { return m_map[info]->sorting; @@ -96,14 +101,16 @@ AdditionalInfoAccessor::AdditionalInfoAccessor() : m_map() { static const AdditionalInfoAccessor::AdditionalInfo additionalInfos[] = { - { "size", I18N_NOOP2_NOSTRIP("@label", "Size"), DolphinView::SortBySize, 1 }, - { "date", I18N_NOOP2_NOSTRIP("@label", "Date"), DolphinView::SortByDate, 2 }, - { "permissions", I18N_NOOP2_NOSTRIP("@label", "Permissions"), DolphinView::SortByPermissions, 4 }, - { "owner", I18N_NOOP2_NOSTRIP("@label", "Owner"), DolphinView::SortByOwner, 8 }, - { "group", I18N_NOOP2_NOSTRIP("@label", "Group"), DolphinView::SortByGroup, 16 }, - { "type", I18N_NOOP2_NOSTRIP("@label", "Type"), DolphinView::SortByType, 32 }, - { "destination", I18N_NOOP2_NOSTRIP("@label", "Link Destination"), DolphinView::SortByDestination, 64 }, - { "path", I18N_NOOP2_NOSTRIP("@label", "Path"), DolphinView::SortByPath, 128 } + // Entries for view-properties version 1: + { "size", I18N_NOOP2_NOSTRIP("@label", "Size"), "Size", DolphinView::SortBySize, 1 }, + { "date", I18N_NOOP2_NOSTRIP("@label", "Date"), "Date", DolphinView::SortByDate, 2 }, + { "permissions", I18N_NOOP2_NOSTRIP("@label", "Permissions"), "Permissions", DolphinView::SortByPermissions, 4 }, + { "owner", I18N_NOOP2_NOSTRIP("@label", "Owner"), "Owner", DolphinView::SortByOwner, 8 }, + { "group", I18N_NOOP2_NOSTRIP("@label", "Group"), "Group", DolphinView::SortByGroup, 16 }, + { "type", I18N_NOOP2_NOSTRIP("@label", "Type"), "Type", DolphinView::SortByType, 32 }, + { "destination", I18N_NOOP2_NOSTRIP("@label", "Link Destination"), "LinkDestination", DolphinView::SortByDestination, 64 }, + { "path", I18N_NOOP2_NOSTRIP("@label", "Path"), "Path", DolphinView::SortByPath, 128 } + // Entries for view-properties version >= 2 (the last column can be set to 0): }; m_map.insert(KFileItemDelegate::Size, &additionalInfos[0]); |