diff options
| author | Peter Penz <[email protected]> | 2010-11-09 16:26:19 +0000 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2010-11-09 16:26:19 +0000 |
| commit | 09e4bd3ed4f1283ef3b6df3bb55c1001978a1b34 (patch) | |
| tree | 9df8de0f6a916529c6bd314e8015b789669c9519 /src/views/dolphinfileitemdelegate.cpp | |
| parent | 1a032453950a058eba3cb0695a7331737330add3 (diff) | |
Adjust the color when using the LocallyModifiedUnstagedVersion (patch written by Sebastian Dörner)
svn path=/trunk/KDE/kdebase/apps/; revision=1194724
Diffstat (limited to 'src/views/dolphinfileitemdelegate.cpp')
| -rw-r--r-- | src/views/dolphinfileitemdelegate.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/views/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp index 64a19582a..3e537ffeb 100644 --- a/src/views/dolphinfileitemdelegate.cpp +++ b/src/views/dolphinfileitemdelegate.cpp @@ -119,11 +119,12 @@ void DolphinFileItemDelegate::adjustOptionTextColor(QStyleOptionViewItemV4& opti // as tint colors and are mixed with the current set text color. The tint colors // have been optimized for the base colors of the corresponding Oxygen emblems. switch (state) { - case KVersionControlPlugin::UpdateRequiredVersion: tintColor = Qt::yellow; break; - case KVersionControlPlugin::LocallyModifiedVersion: tintColor = Qt::green; break; - case KVersionControlPlugin::AddedVersion: tintColor = Qt::darkGreen; break; - case KVersionControlPlugin::RemovedVersion: tintColor = Qt::darkRed; break; - case KVersionControlPlugin::ConflictingVersion: tintColor = Qt::red; break; + case KVersionControlPlugin::UpdateRequiredVersion: tintColor = Qt::yellow; break; + case KVersionControlPlugin::LocallyModifiedUnstagedVersion: tintColor = Qt::darkRed; break; + case KVersionControlPlugin::LocallyModifiedVersion: tintColor = Qt::green; break; + case KVersionControlPlugin::AddedVersion: tintColor = Qt::darkGreen; break; + case KVersionControlPlugin::RemovedVersion: tintColor = Qt::darkRed; break; + case KVersionControlPlugin::ConflictingVersion: tintColor = Qt::red; break; case KVersionControlPlugin::UnversionedVersion: case KVersionControlPlugin::NormalVersion: default: @@ -143,7 +144,7 @@ void DolphinFileItemDelegate::adjustOptionTextColor(QStyleOptionViewItemV4& opti QPixmap DolphinFileItemDelegate::emblemForState(KVersionControlPlugin::VersionState state, const QSize& size) const { - Q_ASSERT(state <= KVersionControlPlugin::ConflictingVersion); + Q_ASSERT(state <= KVersionControlPlugin::LocallyModifiedUnstagedVersion); if (m_cachedSize != size) { m_cachedSize = size; @@ -160,7 +161,7 @@ QPixmap DolphinFileItemDelegate::emblemForState(KVersionControlPlugin::VersionSt } const QSize emblemSize(emblemHeight, emblemHeight); - for (int i = KVersionControlPlugin::NormalVersion; i <= KVersionControlPlugin::ConflictingVersion; ++i) { + for (int i = KVersionControlPlugin::NormalVersion; i <= KVersionControlPlugin::LocallyModifiedUnstagedVersion; ++i) { QString iconName; switch (i) { case KVersionControlPlugin::NormalVersion: |