X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d84909dc36acbd91c37de76e793f81dca9b2ace9..aeaec1c2d18a13e0dd7f36acc93042dc0b6ee7c6:/src/dolphinfileitemdelegate.cpp diff --git a/src/dolphinfileitemdelegate.cpp b/src/dolphinfileitemdelegate.cpp index 5060dd0d7..7a6ef118e 100644 --- a/src/dolphinfileitemdelegate.cpp +++ b/src/dolphinfileitemdelegate.cpp @@ -122,19 +122,18 @@ QPixmap DolphinFileItemDelegate::emblemForState(KVersionControlPlugin::VersionSt } else if (iconHeight >= KIconLoader::SizeMedium) { emblemHeight = KIconLoader::SizeSmall; } else { - // TODO: it depends on the final icons whether a smaller size works - emblemHeight = KIconLoader::SizeSmall /* / 2 */; + emblemHeight = KIconLoader::SizeSmall / 2; } const QSize emblemSize(emblemHeight, emblemHeight); for (int i = 0; i <= KVersionControlPlugin::ConflictingVersion; ++i) { QString iconName; switch (state) { - case KVersionControlPlugin::NormalVersion: iconName = "dialog-ok-apply"; break; - case KVersionControlPlugin::UpdateRequiredVersion: iconName = "rating"; break; - case KVersionControlPlugin::LocallyModifiedVersion: iconName = "emblem-important"; break; - case KVersionControlPlugin::AddedVersion: iconName = "list-add"; break; - case KVersionControlPlugin::ConflictingVersion: iconName = "application-exit"; break; + case KVersionControlPlugin::NormalVersion: iconName = "vcs-normal"; break; + case KVersionControlPlugin::UpdateRequiredVersion: iconName = "vcs-update-required"; break; + case KVersionControlPlugin::LocallyModifiedVersion: iconName = "vcs-locally-modified"; break; + case KVersionControlPlugin::AddedVersion: iconName = "vcs-added"; break; + case KVersionControlPlugin::ConflictingVersion: iconName = "vcs-conflicting"; break; default: Q_ASSERT(false); break; }