X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2b75a555caa81a992a289a13119dca5cce79d4cc..407841eb1dc520cd250f5791eed98b3b08c64705:/src/views/dolphinfileitemlistwidget.cpp diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index f4efa5233..7ad242f3f 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -1,34 +1,18 @@ -/*************************************************************************** - * Copyright (C) 2011 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2011 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinfileitemlistwidget.h" +#include "../kitemviews/private/kitemviewsutils.h" -#include -#include -#include -#include +#include "dolphindebug.h" -#include +#include -DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant, - QGraphicsItem* parent) : - KFileItemListWidget(informant, parent) +DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent) + : KFileItemListWidget(informant, parent) { } @@ -40,10 +24,11 @@ void DolphinFileItemListWidget::refreshCache() { QColor color; const QHash values = data(); + QHash overlays; if (values.contains("version")) { // The item is under version control. Apply the text color corresponding // to its version state. - const KVersionControlPlugin2::ItemVersion version = static_cast(values.value("version").toInt()); + const KVersionControlPlugin::ItemVersion version = static_cast(values.value("version").toInt()); const QColor textColor = styleOption().palette.text().color(); QColor tintColor = textColor; @@ -51,78 +36,96 @@ void DolphinFileItemListWidget::refreshCache() // 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 (version) { - case KVersionControlPlugin2::UpdateRequiredVersion: tintColor = Qt::yellow; break; - case KVersionControlPlugin2::LocallyModifiedUnstagedVersion: tintColor = Qt::green; break; - case KVersionControlPlugin2::LocallyModifiedVersion: tintColor = Qt::green; break; - case KVersionControlPlugin2::AddedVersion: tintColor = Qt::green; break; - case KVersionControlPlugin2::RemovedVersion: tintColor = Qt::darkRed; break; - case KVersionControlPlugin2::ConflictingVersion: tintColor = Qt::red; break; - case KVersionControlPlugin2::IgnoredVersion: tintColor = Qt::white; break; - case KVersionControlPlugin2::MissingVersion: tintColor = Qt::red; break; - case KVersionControlPlugin2::NormalVersion: - case KVersionControlPlugin2::UnversionedVersion: + case KVersionControlPlugin::UpdateRequiredVersion: + tintColor = Qt::yellow; + break; + case KVersionControlPlugin::LocallyModifiedUnstagedVersion: + tintColor = Qt::green; + break; + case KVersionControlPlugin::LocallyModifiedVersion: + tintColor = Qt::green; + break; + case KVersionControlPlugin::AddedVersion: + tintColor = Qt::green; + break; + case KVersionControlPlugin::RemovedVersion: + tintColor = Qt::darkRed; + break; + case KVersionControlPlugin::ConflictingVersion: + tintColor = Qt::red; + break; + case KVersionControlPlugin::IgnoredVersion: + tintColor = Qt::white; + break; + case KVersionControlPlugin::MissingVersion: + tintColor = Qt::red; + break; + case KVersionControlPlugin::NormalVersion: + case KVersionControlPlugin::UnversionedVersion: default: break; } - color = QColor((tintColor.red() + textColor.red()) / 2, + color = QColor((tintColor.red() + textColor.red()) / 2, (tintColor.green() + textColor.green()) / 2, - (tintColor.blue() + textColor.blue()) / 2, + (tintColor.blue() + textColor.blue()) / 2, (tintColor.alpha() + textColor.alpha()) / 2); - setOverlay(overlayForState(version, styleOption().iconSize)); - } else if (!overlay().isNull()) { - setOverlay(QPixmap()); + overlays.insert(Qt::Corner::BottomLeftCorner, overlayForState(version)); } + if (values.contains("iconOverlays")) { + const auto corners = {Qt::Corner::BottomRightCorner, Qt::Corner::TopLeftCorner, Qt::Corner::TopRightCorner}; + const auto iconOverlays = values.value("iconOverlays").toStringList(); + auto overlaysIt = iconOverlays.constBegin(); + for (const auto &corner : corners) { + if (overlaysIt == iconOverlays.constEnd()) { + break; + } + overlays.insert(corner, *overlaysIt); + overlaysIt = ++overlaysIt; + } + } + + setOverlays(overlays); setTextColor(color); } -QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin2::ItemVersion version, int size) +QString DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version) const { - int overlayHeight = KIconLoader::SizeSmall; - if (size >= KIconLoader::SizeEnormous) { - overlayHeight = KIconLoader::SizeMedium; - } else if (size >= KIconLoader::SizeLarge) { - overlayHeight = KIconLoader::SizeSmallMedium; - } else if (size >= KIconLoader::SizeMedium) { - overlayHeight = KIconLoader::SizeSmall; - } else { - overlayHeight = KIconLoader::SizeSmall / 2; - } - QString iconName; switch (version) { case KVersionControlPlugin::NormalVersion: - iconName = "vcs-normal"; + iconName = QStringLiteral("vcs-normal"); break; case KVersionControlPlugin::UpdateRequiredVersion: - iconName = "vcs-update-required"; + iconName = QStringLiteral("vcs-update-required"); break; case KVersionControlPlugin::LocallyModifiedVersion: - iconName = "vcs-locally-modified"; + iconName = QStringLiteral("vcs-locally-modified"); break; case KVersionControlPlugin::LocallyModifiedUnstagedVersion: - iconName = "vcs-locally-modified-unstaged"; + iconName = QStringLiteral("vcs-locally-modified-unstaged"); break; case KVersionControlPlugin::AddedVersion: - iconName = "vcs-added"; + iconName = QStringLiteral("vcs-added"); break; case KVersionControlPlugin::RemovedVersion: - iconName = "vcs-removed"; + iconName = QStringLiteral("vcs-removed"); break; case KVersionControlPlugin::ConflictingVersion: - iconName = "vcs-conflicting"; + iconName = QStringLiteral("vcs-conflicting"); break; case KVersionControlPlugin::UnversionedVersion: - case KVersionControlPlugin2::IgnoredVersion: - case KVersionControlPlugin2::MissingVersion: + case KVersionControlPlugin::IgnoredVersion: + case KVersionControlPlugin::MissingVersion: break; default: Q_ASSERT(false); break; } - return KIcon(iconName).pixmap(QSize(overlayHeight, overlayHeight)); + return iconName; } +#include "moc_dolphinfileitemlistwidget.cpp"