X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fa0c566eda0f954dd005b72bc61befe41daf55f..5593c252e8d9638c86dcc2bb9edd394ea14f8ba1:/src/panels/information/informationpanelcontent.cpp

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 1e660d5c9..6bfc4ed01 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -19,19 +19,18 @@
 
 #include "informationpanelcontent.h"
 
-#include <KDialog>
 #include <KFileItem>
-#include <KGlobalSettings>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
 #include <KIconEffect>
 #include <KIconLoader>
-#include <KIcon>
-#include <KLocale>
-#include <KMenu>
-#include <kseparator.h>
+#include <QIcon>
+#include <KLocalizedString>
+#include <QMenu>
+#include <KSeparator>
 #include <KStringHandler>
+#include <QTextDocument>
 
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
@@ -49,14 +48,14 @@
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>
-#include <QPointer>
 #include <QResizeEvent>
 #include <QScrollArea>
-#include <QTextDocument>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>
+#include <QFontDatabase>
+#include <QStyle>
 
 #include "dolphin_informationpanelsettings.h"
 #include "filemetadataconfigurationdialog.h"
@@ -87,7 +86,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
             this, &InformationPanelContent::markOutdatedPreview);
 
     QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setSpacing(KDialog::spacingHint());
 
     // preview
     const int minPreviewWidth = KIconLoader::SizeEnormous + KIconLoader::SizeMedium;
@@ -123,7 +121,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
             this, &InformationPanelContent::urlActivated);
 #endif
-    m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
+    m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
     // Encapsulate the MetaDataWidget inside a container that has a dummy widget
@@ -159,7 +157,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
 
 InformationPanelContent::~InformationPanelContent()
 {
-    InformationPanelSettings::self()->writeConfig();
+    InformationPanelSettings::self()->save();
 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
@@ -170,15 +168,15 @@ void InformationPanelContent::showItem(const KFileItem& item)
         m_previewJob->kill();
     }
 
-    const KUrl itemUrl = item.url();
-    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.localPath().isEmpty();
+    const QUrl itemUrl = item.url();
+    const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty();
     if (!applyPlace(itemUrl)) {
         setNameLabelText(item.text());
         if (isSearchUrl) {
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
-            QPixmap icon = iconLoader.loadIcon("nepomuk",
+            QPixmap icon = iconLoader.loadIcon(QStringLiteral("nepomuk"),
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);
@@ -215,7 +213,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
 
     if (InformationPanelSettings::previewsShown()) {
         const QString mimeType = item.mimetype();
-        const bool usePhonon = mimeType.startsWith("audio/") || mimeType.startsWith("video/");
+        const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/"));
         if (usePhonon) {
             m_phononWidget->show();
             m_phononWidget->setUrl(item.targetUrl());
@@ -242,7 +240,7 @@ void InformationPanelContent::showItems(const KFileItemList& items)
     }
 
     KIconLoader iconLoader;
-    QPixmap icon = iconLoader.loadIcon("dialog-information",
+    QPixmap icon = iconLoader.loadIcon(QStringLiteral("dialog-information"),
                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);
@@ -277,7 +275,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
         break;
 
     case QEvent::FontChange:
-        m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
+        m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
         break;
 
     default:
@@ -289,15 +287,15 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
 
 void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)
 {
-    KMenu popup(this);
+    QMenu popup(this);
 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
-    previewAction->setIcon(QIcon::fromTheme("view-preview"));
+    previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
-    configureAction->setIcon(KIcon("configure"));
+    configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {
@@ -332,8 +330,10 @@ void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();
     if (!applyPlace(item.targetUrl())) {
-        KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
-        m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));
+        const QPixmap icon = KIconLoader::global()->loadIcon(item.iconName(), KIconLoader::Desktop,
+                                                             KIconLoader::SizeEnormous, KIconLoader::DefaultState,
+                                                             item.overlays());
+        m_preview->setPixmap(icon);
     }
 }
 
@@ -369,14 +369,14 @@ void InformationPanelContent::refreshMetaData()
     }
 }
 
-bool InformationPanelContent::applyPlace(const KUrl& url)
+bool InformationPanelContent::applyPlace(const QUrl& url)
 {
     const int count = m_placesItemModel->count();
     for (int i = 0; i < count; ++i) {
         const PlacesItem* item = m_placesItemModel->placesItem(i);
-        if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
+        if (item->url().matches(url, QUrl::StripTrailingSlash)) {
             setNameLabelText(item->text());
-            m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128));
+            m_preview->setPixmap(QIcon::fromTheme(item->icon()).pixmap(128, 128));
             return true;
         }
     }
@@ -403,7 +403,7 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
-        wrappedText += processedText.mid(line.textStart(), line.textLength());
+        wrappedText += processedText.midRef(line.textStart(), line.textLength());
 
         line = textLayout.createLine();
         if (line.isValid()) {
@@ -422,7 +422,7 @@ void InformationPanelContent::adjustWidgetSizes(int width)
     // so that the width of the information panel gets increased.
     // To prevent this, the maximum width is adjusted to
     // the current width of the panel.
-    const int maxWidth = width - KDialog::spacingHint() * 4;
+    const int maxWidth = width - style()->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Horizontal) * 4;
     m_nameLabel->setMaximumWidth(maxWidth);
 
     // The metadata widget also contains a text widget which may return
@@ -440,4 +440,3 @@ void InformationPanelContent::adjustWidgetSizes(int width)
     }
 }
 
-#include "informationpanelcontent.moc"