From a97291c90d244c15d3112f33a1261c2c3f134258 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 10 Nov 2009 21:43:18 +0000 Subject: adjust code to use Nuno's new version control icons svn path=/trunk/KDE/kdebase/apps/; revision=1047280 --- src/dolphinfileitemdelegate.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to '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; } -- cgit v1.3