diff options
Diffstat (limited to 'src/views/tooltips')
| -rw-r--r-- | src/views/tooltips/dolphinfilemetadatawidget.cpp | 29 | ||||
| -rw-r--r-- | src/views/tooltips/dolphinfilemetadatawidget.h | 23 | ||||
| -rw-r--r-- | src/views/tooltips/tooltipmanager.cpp | 48 | ||||
| -rw-r--r-- | src/views/tooltips/tooltipmanager.h | 19 |
4 files changed, 54 insertions, 65 deletions
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp index 80d22d837..3686b0f18 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.cpp +++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp @@ -8,10 +8,10 @@ #include "dolphinfilemetadatawidget.h" +#include <Baloo/FileMetaDataWidget> #include <KColorScheme> #include <KSeparator> #include <KStringHandler> -#include <Baloo/FileMetaDataWidget> #include <QLabel> #include <QStyleOptionFrame> @@ -20,11 +20,11 @@ #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); @@ -45,14 +45,12 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) : // 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); - QVBoxLayout* textLayout = new QVBoxLayout(); + QVBoxLayout *textLayout = new QVBoxLayout(); 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(); - QHBoxLayout* layout = new QHBoxLayout(this); + QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(m_preview); layout->addSpacing(layout->contentsMargins().left()); layout->addLayout(textLayout); @@ -74,7 +72,7 @@ DolphinFileMetaDataWidget::~DolphinFileMetaDataWidget() { } -void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap) +void DolphinFileMetaDataWidget::setPreview(const QPixmap &pixmap) { m_preview->setPixmap(pixmap); } @@ -88,7 +86,7 @@ QPixmap DolphinFileMetaDataWidget::preview() const return QPixmap(); } -void DolphinFileMetaDataWidget::setName(const QString& name) +void DolphinFileMetaDataWidget::setName(const QString &name) { QTextOption textOption; textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); @@ -124,7 +122,7 @@ QString DolphinFileMetaDataWidget::name() const return m_name->text(); } -void DolphinFileMetaDataWidget::setItems(const KFileItemList& items) +void DolphinFileMetaDataWidget::setItems(const KFileItemList &items) { m_fileMetaDataWidget->setItems(items); } @@ -133,4 +131,3 @@ KFileItemList DolphinFileMetaDataWidget::items() const { return m_fileMetaDataWidget->items(); } - diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h index 63bd8b093..89f947498 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.h +++ b/src/views/tooltips/dolphinfilemetadatawidget.h @@ -16,8 +16,9 @@ class KFileItemList; class QLabel; -namespace Baloo { - class FileMetaDataWidget; +namespace Baloo +{ +class FileMetaDataWidget; } /** @@ -29,13 +30,13 @@ class DolphinFileMetaDataWidget : public QWidget Q_OBJECT public: - explicit DolphinFileMetaDataWidget(QWidget* parent = nullptr); + explicit DolphinFileMetaDataWidget(QWidget *parent = nullptr); ~DolphinFileMetaDataWidget() override; - void setPreview(const QPixmap& pixmap); + void setPreview(const QPixmap &pixmap); QPixmap preview() const; - void setName(const QString& name); + void setName(const QString &name); QString name() const; /** @@ -43,7 +44,7 @@ public: * The signal metaDataRequestFinished() will be emitted, * as soon as the meta data for the items has been received. */ - void setItems(const KFileItemList& items); + void setItems(const KFileItemList &items); KFileItemList items() const; Q_SIGNALS: @@ -51,18 +52,18 @@ Q_SIGNALS: * Is emitted after the meta data has been received for the items * set by DolphinFileMetaDataWidget::setItems(). */ - void metaDataRequestFinished(const KFileItemList& items); + void metaDataRequestFinished(const KFileItemList &items); /** * Is emitted when the user clicks a tag or a link * in the metadata widget. */ - void urlActivated(const QUrl& url); + void urlActivated(const QUrl &url); private: - QLabel* m_preview; - QLabel* m_name; - Baloo::FileMetaDataWidget* m_fileMetaDataWidget; + QLabel *m_preview; + QLabel *m_name; + Baloo::FileMetaDataWidget *m_fileMetaDataWidget; }; #endif diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 5a40d1023..c9d22eedf 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -8,19 +8,20 @@ #include "dolphinfilemetadatawidget.h" -#include <KIO/PreviewJob> #include <KConfigGroup> +#include <KIO/PreviewJob> +#include <KIconLoader> #include <KJobWidgets> #include <KSharedConfig> #include <KToolTipWidget> -#include <KIconLoader> #include <QApplication> #include <QStyle> #include <QTimer> #include <QWindow> -class IconLoaderSingleton { +class IconLoaderSingleton +{ public: IconLoaderSingleton() = default; @@ -29,17 +30,17 @@ public: Q_GLOBAL_STATIC(IconLoaderSingleton, iconLoader) -ToolTipManager::ToolTipManager(QWidget* parent) : - QObject(parent), - m_showToolTipTimer(nullptr), - m_contentRetrievalTimer(nullptr), - m_transientParent(nullptr), - m_toolTipRequested(false), - m_metaDataRequested(false), - m_appliedWaitCursor(false), - m_margin(4), - m_item(), - m_itemRect() +ToolTipManager::ToolTipManager(QWidget *parent) + : QObject(parent) + , m_showToolTipTimer(nullptr) + , m_contentRetrievalTimer(nullptr) + , m_transientParent(nullptr) + , m_toolTipRequested(false) + , m_metaDataRequested(false) + , m_appliedWaitCursor(false) + , m_margin(4) + , m_item() + , m_itemRect() { if (parent) { m_margin = qMax(m_margin, parent->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth)); @@ -65,7 +66,7 @@ ToolTipManager::~ToolTipManager() } } -void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect, QWindow *transientParent) +void ToolTipManager::showToolTip(const KFileItem &item, const QRectF &itemRect, QWindow *transientParent) { hideToolTip(HideBehavior::Instantly); @@ -134,23 +135,17 @@ void ToolTipManager::startContentRetrieval() const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings"); const QStringList plugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()); - KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, - QSize(256, 256), - &plugins); + KIO::PreviewJob *job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256), &plugins); job->setIgnoreMaximumSize(m_item.isLocalFile() && !m_item.isSlow()); if (job->uiDelegate()) { KJobWidgets::setWindow(job, qApp->activeWindow()); } - connect(job, &KIO::PreviewJob::gotPreview, - this, &ToolTipManager::setPreviewPix); - connect(job, &KIO::PreviewJob::failed, - this, &ToolTipManager::previewFailed); + connect(job, &KIO::PreviewJob::gotPreview, this, &ToolTipManager::setPreviewPix); + connect(job, &KIO::PreviewJob::failed, this, &ToolTipManager::previewFailed); } - -void ToolTipManager::setPreviewPix(const KFileItem& item, - const QPixmap& pixmap) +void ToolTipManager::setPreviewPix(const KFileItem &item, const QPixmap &pixmap) { if (!m_toolTipRequested || (m_item.url() != item.url())) { // No tooltip is requested anymore or an old preview has been received @@ -173,7 +168,7 @@ void ToolTipManager::previewFailed() return; } QPalette pal; - for (auto state : { QPalette::Active, QPalette::Inactive, QPalette::Disabled }) { + for (auto state : {QPalette::Active, QPalette::Inactive, QPalette::Disabled}) { pal.setBrush(state, QPalette::WindowText, pal.toolTipText()); pal.setBrush(state, QPalette::Window, pal.toolTipBase()); } @@ -224,4 +219,3 @@ void ToolTipManager::showToolTip() m_toolTipRequested = false; } - diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h index c86c97f6b..9aee295ff 100644 --- a/src/views/tooltips/tooltipmanager.h +++ b/src/views/tooltips/tooltipmanager.h @@ -29,12 +29,9 @@ class ToolTipManager : public QObject Q_OBJECT public: - enum class HideBehavior { - Instantly, - Later - }; + enum class HideBehavior { Instantly, Later }; - explicit ToolTipManager(QWidget* parent); + explicit ToolTipManager(QWidget *parent); ~ToolTipManager() override; /** @@ -43,7 +40,7 @@ public: * The tooltip manager takes care that the tooltip is shown * slightly delayed and with a proper \p transientParent. */ - void showToolTip(const KFileItem& item, const QRectF& itemRect, QWindow *transientParent); + void showToolTip(const KFileItem &item, const QRectF &itemRect, QWindow *transientParent); /** * Hides the currently shown tooltip. @@ -55,11 +52,11 @@ Q_SIGNALS: * Is emitted when the user clicks a tag or a link * in the metadata widget. */ - void urlActivated(const QUrl& url); + void urlActivated(const QUrl &url); private Q_SLOTS: void startContentRetrieval(); - void setPreviewPix(const KFileItem& item, const QPixmap& pix); + void setPreviewPix(const KFileItem &item, const QPixmap &pix); void previewFailed(); void slotMetaDataRequestFinished(); void showToolTip(); @@ -67,14 +64,14 @@ private Q_SLOTS: private: /// Timeout from requesting a tooltip until the tooltip /// should be shown - QTimer* m_showToolTipTimer; + QTimer *m_showToolTipTimer; /// Timeout from requesting a tooltip until the retrieving of /// the tooltip content like preview and meta data gets started. - QTimer* m_contentRetrievalTimer; + QTimer *m_contentRetrievalTimer; /// Transient parent of the tooltip, mandatory on Wayland. - QWindow* m_transientParent; + QWindow *m_transientParent; QScopedPointer<KToolTipWidget> m_tooltipWidget; DolphinFileMetaDataWidget *m_fileMetaDataWidget = nullptr; |
