X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c7272df5c17c804fd379e4bac2758850f03695da..edced8460b:/src/views/dolphinfileitemlistwidget.cpp diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index d39d58cd0..c3a15ea6f 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -1,32 +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 -#include -#include +#include "dolphindebug.h" -#include +#include -DolphinFileItemListWidget::DolphinFileItemListWidget(QGraphicsItem* parent) : - KFileItemListWidget(parent) +DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant, + QGraphicsItem* parent) : + KFileItemListWidget(informant, parent) { } @@ -41,7 +27,7 @@ void DolphinFileItemListWidget::refreshCache() if (values.contains("version")) { // The item is under version control. Apply the text color corresponding // to its version state. - const KVersionControlPlugin::VersionState 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; @@ -55,8 +41,10 @@ void DolphinFileItemListWidget::refreshCache() case KVersionControlPlugin::AddedVersion: tintColor = Qt::green; break; case KVersionControlPlugin::RemovedVersion: tintColor = Qt::darkRed; break; case KVersionControlPlugin::ConflictingVersion: tintColor = Qt::red; break; - case KVersionControlPlugin::UnversionedVersion: tintColor = Qt::white; break; + case KVersionControlPlugin::IgnoredVersion: tintColor = Qt::white; break; + case KVersionControlPlugin::MissingVersion: tintColor = Qt::red; break; case KVersionControlPlugin::NormalVersion: + case KVersionControlPlugin::UnversionedVersion: default: break; } @@ -74,7 +62,7 @@ void DolphinFileItemListWidget::refreshCache() setTextColor(color); } -QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::VersionState version, int size) +QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version, int size) { int overlayHeight = KIconLoader::SizeSmall; if (size >= KIconLoader::SizeEnormous) { @@ -90,34 +78,35 @@ QPixmap DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::Versio 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 KVersionControlPlugin::IgnoredVersion: + case KVersionControlPlugin::MissingVersion: break; default: Q_ASSERT(false); break; } - return KIcon(iconName).pixmap(QSize(overlayHeight, overlayHeight)); + return QIcon::fromTheme(iconName).pixmap(QSize(overlayHeight, overlayHeight)); } -#include "dolphinfileitemlistwidget.moc"