Merge branch 'release/20.08'

[dolphin.git] / src / panels / information / informationpanelcontent.cpp

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 1161ea6941707af71be27bb4951e9e56400b4f9d..d632cfcd1c956c8b84a707a2199a1d4fea8d8070 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -1,21 +1,8 @@
-/***************************************************************************
- *   Copyright (C) 2009 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: 2009 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "informationpanelcontent.h"
 
@@ -78,7 +65,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     // delay. This prevents flickering if the new preview can be generated
     // within a very small timeframe.
     m_outdatedPreviewTimer = new QTimer(this);
-    m_outdatedPreviewTimer->setInterval(300);
+    m_outdatedPreviewTimer->setInterval(100);
     m_outdatedPreviewTimer->setSingleShot(true);
     connect(m_outdatedPreviewTimer, &QTimer::timeout,
             this, &InformationPanelContent::markOutdatedPreview);
@@ -189,12 +176,8 @@ void InformationPanelContent::refreshPixmapView()
 
     // Mark the currently shown preview as outdated. This is done
     // with a small delay to prevent a flickering when the next preview
-    // can be shown within a short timeframe. This timer is not started
-    // for directories, as directory previews might fail and return the
-    // same icon.
-    if (!m_item.isDir()) {
-        m_outdatedPreviewTimer->start();
-    }
+    // can be shown within a short timeframe.
+    m_outdatedPreviewTimer->start();
 
     QStringList plugins = KIO::PreviewJob::availablePlugins();
     m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
@@ -240,7 +223,7 @@ void InformationPanelContent::refreshPreview()
             refreshPixmapView();
 
             const QString mimeType = m_item.mimetype();
-            const bool isAnimatedImage = m_preview->isAnimatedImage(itemUrl.toLocalFile());
+            const bool isAnimatedImage = m_preview->isAnimatedMimeType(mimeType);
             m_isVideo = !isAnimatedImage && mimeType.startsWith(QLatin1String("video/"));
             bool usePhonon = m_isVideo || mimeType.startsWith(QLatin1String("audio/"));
 
@@ -411,11 +394,18 @@ void InformationPanelContent::showPreview(const KFileItem& item,
 
 void InformationPanelContent::markOutdatedPreview()
 {
-    KIconEffect *iconEffect = KIconLoader::global()->iconEffect();
-    QPixmap disabledPixmap = iconEffect->apply(m_preview->pixmap(),
-                                               KIconLoader::Desktop,
-                                               KIconLoader::DisabledState);
-    m_preview->setPixmap(disabledPixmap);
+    if (m_item.isDir()) {
+        // directory preview can be long
+        // but since we always have icons to display
+        // use it until the preview is done
+        showIcon(m_item);
+    } else {
+        KIconEffect *iconEffect = KIconLoader::global()->iconEffect();
+        QPixmap disabledPixmap = iconEffect->apply(m_preview->pixmap(),
+                                                   KIconLoader::Desktop,
+                                                   KIconLoader::DisabledState);
+        m_preview->setPixmap(disabledPixmap);
+    }
 }
 
 KFileItemList InformationPanelContent::items()