Differential D10832 Diff 28884 src/views/dolphinfileitemlistwidget.cpp

Changeset View

Standalone View

View Options

src/views/dolphinfileitemlistwidget.cpp

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)40 if (values.contains("version")) {
43 const KVersionControlPlugin::ItemVersion version = static_cast<KVersionControlPlugin::ItemVersion>(values.value("version").toInt()); 43​ const KVersionControlPlugin::ItemVersion version = static_cast<KVersionControlPlugin::ItemVersion>(values.value("version").toInt());
44 const QColor textColor = styleOption().palette.text().color(); 44​ const QColor textColor = styleOption().palette.text().color();
45 QColor tintColor = textColor; 45​ QColor tintColor = textColor;
46 46​
47 // Using hardcoded colors is generally a bad idea. In this case the colors just act 47​ // Using hardcoded colors is generally a bad idea. In this case the colors just act
48 // as tint colors and are mixed with the current set text color. The tint colors 48​ // as tint colors and are mixed with the current set text color. The tint colors
49 // have been optimized for the base colors of the corresponding Oxygen emblems. 49​ // have been optimized for the base colors of the corresponding Oxygen emblems.
50 switch (version) { 50​ switch (version) {
51 case KVersionControlPlugin::UpdateRequiredVersion: tintColor = Qt::yellow; break; 51​ case KVersionControlPlugin::ItemVersion::UpdateRequired: tintColor = Qt::yellow; break;
52 case KVersionControlPlugin::LocallyModifiedUnstagedVersion: tintColor = Qt::green; break; 52​ case KVersionControlPlugin::ItemVersion::LocallyModifiedUnstaged: tintColor = Qt::green; break;
53 case KVersionControlPlugin::LocallyModifiedVersion: tintColor = Qt::green; break; 53​ case KVersionControlPlugin::ItemVersion::LocallyModified: tintColor = Qt::green; break;
54 case KVersionControlPlugin::AddedVersion: tintColor = Qt::green; break; 54​ case KVersionControlPlugin::ItemVersion::Added: tintColor = Qt::green; break;
55 case KVersionControlPlugin::RemovedVersion: tintColor = Qt::darkRed; break; 55​ case KVersionControlPlugin::ItemVersion::Removed: tintColor = Qt::darkRed; break;
56 case KVersionControlPlugin::ConflictingVersion: tintColor = Qt::red; break; 56​ case KVersionControlPlugin::ItemVersion::Conflicting: tintColor = Qt::red; break;
57 case KVersionControlPlugin::IgnoredVersion: tintColor = Qt::white; break; 57​ case KVersionControlPlugin::ItemVersion::Ignored: tintColor = Qt::white; break;
58 case KVersionControlPlugin::MissingVersion: tintColor = Qt::red; break; 58​ case KVersionControlPlugin::ItemVersion::Missing: tintColor = Qt::red; break;
59 case KVersionControlPlugin::NormalVersion: 59​ case KVersionControlPlugin::ItemVersion::Normal:
60 case KVersionControlPlugin::UnversionedVersion: 60​ case KVersionControlPlugin::ItemVersion::Unversioned:
61 default: 61​ default:
62 break; 62​ break;
63 } 63​ }
64 64​
65 color = QColor((tintColor.red() + textColor.red()) / 2, 65​ color = QColor((tintColor.red() + textColor.red()) / 2,
66 (tintColor.green() + textColor.green()) / 2, 66​ (tintColor.green() + textColor.green()) / 2,
67 (tintColor.blue() + textColor.blue()) / 2, 67​ (tintColor.blue() + textColor.blue()) / 2,
68 (tintColor.alpha() + textColor.alpha()) / 2); 68​ (tintColor.alpha() + textColor.alpha()) / 2);
Show All 16 Lines79{
85 } else if (size >= KIconLoader::SizeMedium) { 85​ } else if (size >= KIconLoader::SizeMedium) {
86 overlayHeight = KIconLoader::SizeSmall; 86​ overlayHeight = KIconLoader::SizeSmall;
87 } else { 87​ } else {
88 overlayHeight = KIconLoader::SizeSmall / 2; 88​ overlayHeight = KIconLoader::SizeSmall / 2;
89 } 89​ }
90 90​
91 QString iconName; 91​ QString iconName;
92 switch (version) { 92​ switch (version) {
93 case KVersionControlPlugin::NormalVersion: 93​ case KVersionControlPlugin::ItemVersion::Normal:
94 iconName = QStringLiteral("vcs-normal"); 94​ iconName = QStringLiteral("vcs-normal");
95 break; 95​ break;
96 case KVersionControlPlugin::UpdateRequiredVersion: 96​ case KVersionControlPlugin::ItemVersion::UpdateRequired:
97 iconName = QStringLiteral("vcs-update-required"); 97​ iconName = QStringLiteral("vcs-update-required");
98 break; 98​ break;
99 case KVersionControlPlugin::LocallyModifiedVersion: 99​ case KVersionControlPlugin::ItemVersion::LocallyModified:
100 iconName = QStringLiteral("vcs-locally-modified"); 100​ iconName = QStringLiteral("vcs-locally-modified");
101 break; 101​ break;
102 case KVersionControlPlugin::LocallyModifiedUnstagedVersion: 102​ case KVersionControlPlugin::ItemVersion::LocallyModifiedUnstaged:
103 iconName = QStringLiteral("vcs-locally-modified-unstaged"); 103​ iconName = QStringLiteral("vcs-locally-modified-unstaged");
104 break; 104​ break;
105 case KVersionControlPlugin::AddedVersion: 105​ case KVersionControlPlugin::ItemVersion::Added:
106 iconName = QStringLiteral("vcs-added"); 106​ iconName = QStringLiteral("vcs-added");
107 break; 107​ break;
108 case KVersionControlPlugin::RemovedVersion: 108​ case KVersionControlPlugin::ItemVersion::Removed:
109 iconName = QStringLiteral("vcs-removed"); 109​ iconName = QStringLiteral("vcs-removed");
110 break; 110​ break;
111 case KVersionControlPlugin::ConflictingVersion: 111​ case KVersionControlPlugin::ItemVersion::Conflicting:
112 iconName = QStringLiteral("vcs-conflicting"); 112​ iconName = QStringLiteral("vcs-conflicting");
113 break; 113​ break;
114 case KVersionControlPlugin::UnversionedVersion: 114​ case KVersionControlPlugin::ItemVersion::Unversioned:
115 case KVersionControlPlugin::IgnoredVersion: 115​ case KVersionControlPlugin::ItemVersion::Ignored:
116 case KVersionControlPlugin::MissingVersion: 116​ case KVersionControlPlugin::ItemVersion::Missing:
117 break; 117​ break;
118 default: 118​ default:
119 Q_ASSERT(false); 119​ Q_ASSERT(false);
120 break; 120​ break;
121 } 121​ }
122 122​
123 return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight)); 123​ return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight));
124} 124​}
125 125​