mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
[ViewProperties] Consider existing roles in convertAdditionalInfo
Otherwise all default overrides for roles we perform in this class are moot.
This commit is contained in:
parent
0a9c018497
commit
e304aa79b4
|
@ -430,7 +430,7 @@ QString ViewProperties::viewModePrefix() const
|
|||
|
||||
void ViewProperties::convertAdditionalInfo()
|
||||
{
|
||||
QStringList visibleRoles;
|
||||
QStringList visibleRoles = m_node->visibleRoles();
|
||||
|
||||
const QStringList additionalInfo = m_node->additionalInfo();
|
||||
if (!additionalInfo.isEmpty()) {
|
||||
|
@ -438,7 +438,7 @@ void ViewProperties::convertAdditionalInfo()
|
|||
// 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());
|
||||
visibleRoles.reserve(visibleRoles.count() + additionalInfo.count());
|
||||
for (const QString& info : additionalInfo) {
|
||||
QString visibleRole = info;
|
||||
int index = visibleRole.indexOf('_');
|
||||
|
@ -450,9 +450,11 @@ void ViewProperties::convertAdditionalInfo()
|
|||
visibleRole[index] = visibleRole[index].toLower();
|
||||
}
|
||||
}
|
||||
if (!visibleRoles.contains(visibleRole)) {
|
||||
visibleRoles.append(visibleRole);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
m_node->setAdditionalInfo(QStringList());
|
||||
m_node->setVisibleRoles(visibleRoles);
|
||||
|
|
Loading…
Reference in a new issue