Move "Show in Groups" toggle action into Sort menu

[dolphin.git] / src / views / dolphinfileitemlistwidget.cpp

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index c3ec2b8ded80eb39d80640fb6c19b6b8b4d252d7..7ad242f3f5452a350340987c2cc2581fc62ace8e 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -1,31 +1,18 @@
-/***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   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 <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "dolphinfileitemlistwidget.h"
 
 #include "dolphinfileitemlistwidget.h"

+#include "../kitemviews/private/kitemviewsutils.h"

 
 

-#include <kversioncontrolplugin.h>
-#include <QColor>
+#include "dolphindebug.h"

 
 

-#include <KDebug>
+#include <KIconLoader>

 
 

-DolphinFileItemListWidget::DolphinFileItemListWidget(QGraphicsItem* parent) :
-    KFileItemListWidget(parent)
+DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent)
+    : KFileItemListWidget(informant, parent)

 {
 }
 
 {
 }
 


@@ -33,44 +20,112 @@ DolphinFileItemListWidget::~DolphinFileItemListWidget()
 {
 }
 
 {
 }
 

-void DolphinFileItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles)
+void DolphinFileItemListWidget::refreshCache()

 {
 {

-    KFileItemListWidget::dataChanged(current, roles);
-

     QColor color;
     QColor color;

-    if (roles.contains("version")) {
+    const QHash<QByteArray, QVariant> values = data();
+    QHash<Qt::Corner, QString> overlays;
+    if (values.contains("version")) {

         // The item is under version control. Apply the text color corresponding
         // to its version state.
         // The item is under version control. Apply the text color corresponding
         // to its version state.

-        const KVersionControlPlugin::VersionState version = static_cast<KVersionControlPlugin::VersionState>(current.value("version").toInt());
-        if (version != KVersionControlPlugin::UnversionedVersion) {
-            const QColor textColor = styleOption().palette.text().color();
-            QColor tintColor = textColor;
+        const KVersionControlPlugin::ItemVersion version = static_cast<KVersionControlPlugin::ItemVersion>(values.value("version").toInt());
+        const QColor textColor = styleOption().palette.text().color();
+        QColor tintColor = textColor;

 
 

-            // Using hardcoded colors is generally a bad idea. In this case the colors just act
-            // 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 KVersionControlPlugin::UpdateRequiredVersion:          tintColor = Qt::yellow; break;
-            case KVersionControlPlugin::LocallyModifiedUnstagedVersion: tintColor = Qt::darkGreen; 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::UnversionedVersion:
-            case KVersionControlPlugin::NormalVersion:
-            default:
-                 // use the default text color
-                 return;
-            }
+        // Using hardcoded colors is generally a bad idea. In this case the colors just act
+        // 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 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,
+                       (tintColor.green() + textColor.green()) / 2,
+                       (tintColor.blue() + textColor.blue()) / 2,
+                       (tintColor.alpha() + textColor.alpha()) / 2);
+
+        overlays.insert(Qt::Corner::BottomLeftCorner, overlayForState(version));
+    }

 
 

-            color = QColor((tintColor.red()   + textColor.red())   / 2,
-                           (tintColor.green() + textColor.green()) / 2,
-                           (tintColor.blue()  + textColor.blue())  / 2,
-                           (tintColor.alpha() + textColor.alpha()) / 2);
+    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);
 }
 
     setTextColor(color);
 }
 

-#include "dolphinfileitemlistwidget.moc"
+QString DolphinFileItemListWidget::overlayForState(KVersionControlPlugin::ItemVersion version) const
+{
+    QString iconName;
+    switch (version) {
+    case KVersionControlPlugin::NormalVersion:
+        iconName = QStringLiteral("vcs-normal");
+        break;
+    case KVersionControlPlugin::UpdateRequiredVersion:
+        iconName = QStringLiteral("vcs-update-required");
+        break;
+    case KVersionControlPlugin::LocallyModifiedVersion:
+        iconName = QStringLiteral("vcs-locally-modified");
+        break;
+    case KVersionControlPlugin::LocallyModifiedUnstagedVersion:
+        iconName = QStringLiteral("vcs-locally-modified-unstaged");
+        break;
+    case KVersionControlPlugin::AddedVersion:
+        iconName = QStringLiteral("vcs-added");
+        break;
+    case KVersionControlPlugin::RemovedVersion:
+        iconName = QStringLiteral("vcs-removed");
+        break;
+    case KVersionControlPlugin::ConflictingVersion:
+        iconName = QStringLiteral("vcs-conflicting");
+        break;
+    case KVersionControlPlugin::UnversionedVersion:
+    case KVersionControlPlugin::IgnoredVersion:
+    case KVersionControlPlugin::MissingVersion:
+        break;
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+
+    return iconName;
+}
+
+#include "moc_dolphinfileitemlistwidget.cpp"