Move "Show in Groups" toggle action into Sort menu

[dolphin.git] / src / views / tooltips / dolphinfilemetadatawidget.cpp

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index e914593fb5f9898e1096403c6b20bcd49a275a36..ba068d3f48782315d26917ac91d79f05c7497727 100644 (file)
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -8,10 +8,10 @@
 
 #include "dolphinfilemetadatawidget.h"
 
 
 #include "dolphinfilemetadatawidget.h"
 

+#include <Baloo/FileMetaDataWidget>

 #include <KColorScheme>
 #include <KSeparator>
 #include <KStringHandler>
 #include <KColorScheme>
 #include <KSeparator>
 #include <KStringHandler>

-#include <Baloo/FileMetaDataWidget>

 
 #include <QLabel>
 #include <QStyleOptionFrame>
 
 #include <QLabel>
 #include <QStyleOptionFrame>


@@ -20,11 +20,11 @@
 #include <QTextLayout>
 #include <QVBoxLayout>
 
 #include <QTextLayout>
 #include <QVBoxLayout>
 

-DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
-    QWidget(parent),
-    m_preview(nullptr),
-    m_name(nullptr),
-    m_fileMetaDataWidget(nullptr)
+DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget *parent)
+    : QWidget(parent)
+    , m_preview(nullptr)
+    , m_name(nullptr)
+    , m_fileMetaDataWidget(nullptr)

 {
     // Create widget for file preview
     m_preview = new QLabel(this);
 {
     // Create widget for file preview
     m_preview = new QLabel(this);


@@ -45,14 +45,12 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
 
     // Create widget for the meta data
     m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
 
     // Create widget for the meta data
     m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);

-    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
-            this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
-    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
-            this, &DolphinFileMetaDataWidget::urlActivated);
+    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished, this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
+    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated, this, &DolphinFileMetaDataWidget::urlActivated);

     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
 
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
 

-    QVBoxLayout* textLayout = new QVBoxLayout();
+    QVBoxLayout *textLayout = new QVBoxLayout();

     textLayout->addWidget(m_name);
     textLayout->addWidget(new KSeparator());
     textLayout->addWidget(m_fileMetaDataWidget);
     textLayout->addWidget(m_name);
     textLayout->addWidget(new KSeparator());
     textLayout->addWidget(m_fileMetaDataWidget);


@@ -64,7 +62,7 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     // (see bug #241608)
     textLayout->addStretch();
 
     // (see bug #241608)
     textLayout->addStretch();
 

-    QHBoxLayout* layout = new QHBoxLayout(this);
+    QHBoxLayout *layout = new QHBoxLayout(this);

     layout->addWidget(m_preview);
     layout->addSpacing(layout->contentsMargins().left());
     layout->addLayout(textLayout);
     layout->addWidget(m_preview);
     layout->addSpacing(layout->contentsMargins().left());
     layout->addLayout(textLayout);


@@ -74,27 +72,21 @@ DolphinFileMetaDataWidget::~DolphinFileMetaDataWidget()
 {
 }
 
 {
 }
 

-void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap)
+void DolphinFileMetaDataWidget::setPreview(const QPixmap &pixmap)

 {
     m_preview->setPixmap(pixmap);
 }
 
 QPixmap DolphinFileMetaDataWidget::preview() const
 {
 {
     m_preview->setPixmap(pixmap);
 }
 
 QPixmap DolphinFileMetaDataWidget::preview() const
 {

-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-    if (m_preview->pixmap()) {
-        return *m_preview->pixmap();
-    }
-#else

     if (!m_preview->pixmap(Qt::ReturnByValue).isNull()) {
         return m_preview->pixmap(Qt::ReturnByValue);
     }
     if (!m_preview->pixmap(Qt::ReturnByValue).isNull()) {
         return m_preview->pixmap(Qt::ReturnByValue);
     }

-#endif

 
     return QPixmap();
 }
 
 
     return QPixmap();
 }
 

-void DolphinFileMetaDataWidget::setName(const QString& name)
+void DolphinFileMetaDataWidget::setName(const QString &name)

 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);


@@ -113,7 +105,7 @@ void DolphinFileMetaDataWidget::setName(const QString& name)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_name->maximumWidth());
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_name->maximumWidth());

-        wrappedText += processedName.midRef(line.textStart(), line.textLength());
+        wrappedText += QStringView(processedName).mid(line.textStart(), line.textLength());

 
         line = textLayout.createLine();
         if (line.isValid()) {
 
         line = textLayout.createLine();
         if (line.isValid()) {


@@ -130,7 +122,7 @@ QString DolphinFileMetaDataWidget::name() const
     return m_name->text();
 }
 
     return m_name->text();
 }
 

-void DolphinFileMetaDataWidget::setItems(const KFileItemList& items)
+void DolphinFileMetaDataWidget::setItems(const KFileItemList &items)

 {
     m_fileMetaDataWidget->setItems(items);
 }
 {
     m_fileMetaDataWidget->setItems(items);
 }


@@ -140,3 +132,4 @@ KFileItemList DolphinFileMetaDataWidget::items() const
     return m_fileMetaDataWidget->items();
 }
 
     return m_fileMetaDataWidget->items();
 }
 

+#include "moc_dolphinfilemetadatawidget.cpp"