Ensure authentication data is cached properly

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 04e13060d23501afd2675a49a3743469256ca093..4a96bd1b6f266f3f0e4e7153f061f43aac554ffc 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
+ *   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  *
@@ -24,6 +24,7 @@
 #include <kfilemetadatawidget.h>
 #include <KFilePlacesModel>
 #include <KGlobalSettings>
+#include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KIconEffect>
 #include <KIconLoader>
@@ -50,9 +51,9 @@
 
 #include "dolphin_informationpanelsettings.h"
 #include "filemetadataconfigurationdialog.h"
-#include "settings/dolphinsettings.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
+#include "views/dolphinplacesmodel.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
@@ -63,8 +64,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_phononWidget(0),
     m_nameLabel(0),
     m_metaDataWidget(0),
-    m_metaDataArea(0),
-    m_enabledPlugins()
+    m_metaDataArea(0)
 {
     parent->installEventFilter(this);
 
@@ -103,8 +103,8 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
-    const bool showPreview = InformationPanelSettings::showPreview();
-    m_preview->setVisible(showPreview);
+    const bool previewsShown = InformationPanelSettings::previewsShown();
+    m_preview->setVisible(previewsShown);
 
     m_metaDataWidget = new KFileMetaDataWidget(parent);
     m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
@@ -174,30 +174,26 @@ void InformationPanelContent::showItem(const KFileItem& item)
                 m_outdatedPreviewTimer->start();
             }
 
-            if (m_enabledPlugins.isEmpty()) {
-                const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
-                m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                                     << "directorythumbnail"
-                                                                     << "imagethumbnail"
-                                                                     << "jpegthumbnail");
+            KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+            job->setScaleType(KIO::PreviewJob::Unscaled);
+            job->setIgnoreMaximumSize(item.isLocalFile());
+            if (job->ui()) {
+                job->ui()->setWindow(this);
             }
 
-            KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, m_preview->width(), m_preview->height(),
-                                                    0, 0, false, true, &m_enabledPlugins);
-
-            connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-                    this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
-            connect(job, SIGNAL(failed(const KFileItem&)),
-                    this, SLOT(showIcon(const KFileItem&)));
+            connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
+                    this, SLOT(showPreview(KFileItem,QPixmap)));
+            connect(job, SIGNAL(failed(KFileItem)),
+                    this, SLOT(showIcon(KFileItem)));
         }
     }
 
-    if (m_metaDataWidget != 0) {
+    if (m_metaDataWidget) {
         m_metaDataWidget->show();
         m_metaDataWidget->setItems(KFileItemList() << item);
     }
 
-    if (InformationPanelSettings::showPreview()) {
+    if (InformationPanelSettings::previewsShown()) {
         const QString mimeType = item.mimetype();
         const bool usePhonon = Phonon::BackendCapabilities::isMimeTypeAvailable(mimeType) &&
                                (mimeType != "image/png");  // TODO: workaround, as Phonon
@@ -234,7 +230,7 @@ void InformationPanelContent::showItems(const KFileItemList& items)
     m_preview->setPixmap(icon);
     setNameLabelText(i18ncp("@info", "%1 item selected", "%1 items selected", items.count()));
 
-    if (m_metaDataWidget != 0) {
+    if (m_metaDataWidget) {
         m_metaDataWidget->setItems(items);
     }
 
@@ -276,7 +272,7 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
     previewAction->setIcon(KIcon("view-preview"));
     previewAction->setCheckable(true);
-    previewAction->setChecked(InformationPanelSettings::showPreview());
+    previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
     configureAction->setIcon(KIcon("configure"));
@@ -289,14 +285,14 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
     // Open the popup and adjust the settings for the
     // selected action.
     QAction* action = popup.exec(QCursor::pos());
-    if (action == 0) {
+    if (!action) {
         return;
     }
 
     const bool isChecked = action->isChecked();
     if (action == previewAction) {
         m_preview->setVisible(isChecked);
-        InformationPanelSettings::setShowPreview(isChecked);
+        InformationPanelSettings::setPreviewsShown(isChecked);
     } else if (action == configureAction) {
         FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
         dialog->setDescription(i18nc("@label::textbox",
@@ -315,7 +311,8 @@ void InformationPanelContent::showIcon(const KFileItem& item)
     m_outdatedPreviewTimer->stop();
     m_pendingPreview = false;
     if (!applyPlace(item.targetUrl())) {
-        m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous));
+        KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
+        m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));
     }
 }
 
@@ -323,10 +320,11 @@ void InformationPanelContent::showPreview(const KFileItem& item,
                                           const QPixmap& pixmap)
 {
     m_outdatedPreviewTimer->stop();
-
     Q_UNUSED(item);
     if (m_pendingPreview) {
-        m_preview->setPixmap(pixmap);
+        QPixmap p = pixmap;
+        KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
+        m_preview->setPixmap(p);
         m_pendingPreview = false;
     }
 }
@@ -359,8 +357,8 @@ void InformationPanelContent::refreshMetaData()
 
 bool InformationPanelContent::applyPlace(const KUrl& url)
 {
-    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    int count = placesModel->rowCount();
+    KFilePlacesModel* placesModel = DolphinPlacesModel::instance();
+    const int count = placesModel->rowCount();
 
     for (int i = 0; i < count; ++i) {
         QModelIndex index = placesModel->index(i, 0);
@@ -418,7 +416,7 @@ void InformationPanelContent::adjustWidgetSizes(int width)
 
     // The metadata widget also contains a text widget which may return
     // a large preferred width.
-    if (m_metaDataWidget != 0) {
+    if (m_metaDataWidget) {
         m_metaDataWidget->setMaximumWidth(maxWidth);
     }