mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +00:00
Rename FileMetaDataToolTip to DolphinFileMetaDataWidget
Since commit 230fe13d1f
this class is not a "tooltip" anymore, but just a
simple widget. Rename it to avoid future confusion.
Reviewers: emmanuelp
Differential Revision: https://phabricator.kde.org/D4451
This commit is contained in:
parent
333e2ae031
commit
d75b1de7bf
|
@ -102,7 +102,7 @@ set(dolphinprivate_LIB_SRCS
|
||||||
views/dolphinviewactionhandler.cpp
|
views/dolphinviewactionhandler.cpp
|
||||||
views/draganddrophelper.cpp
|
views/draganddrophelper.cpp
|
||||||
views/renamedialog.cpp
|
views/renamedialog.cpp
|
||||||
views/tooltips/filemetadatatooltip.cpp
|
views/tooltips/dolphinfilemetadatawidget.cpp
|
||||||
views/tooltips/tooltipmanager.cpp
|
views/tooltips/tooltipmanager.cpp
|
||||||
views/versioncontrol/updateitemstatesthread.cpp
|
views/versioncontrol/updateitemstatesthread.cpp
|
||||||
views/versioncontrol/versioncontrolobserver.cpp
|
views/versioncontrol/versioncontrolobserver.cpp
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
#include "filemetadatatooltip.h"
|
#include "dolphinfilemetadatawidget.h"
|
||||||
|
|
||||||
#include <KColorScheme>
|
#include <KColorScheme>
|
||||||
#include <KSeparator>
|
#include <KSeparator>
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
#include <Baloo/FileMetaDataWidget>
|
#include <Baloo/FileMetaDataWidget>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
|
DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
m_preview(0),
|
m_preview(0),
|
||||||
m_name(0),
|
m_name(0),
|
||||||
|
@ -66,11 +66,11 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
|
||||||
#ifndef HAVE_BALOO
|
#ifndef HAVE_BALOO
|
||||||
m_fileMetaDataWidget = new KFileMetaDataWidget(this);
|
m_fileMetaDataWidget = new KFileMetaDataWidget(this);
|
||||||
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &FileMetaDataToolTip::metaDataRequestFinished);
|
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
||||||
#else
|
#else
|
||||||
m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
|
m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
|
||||||
connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &FileMetaDataToolTip::metaDataRequestFinished);
|
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
||||||
#endif
|
#endif
|
||||||
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
|
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
|
||||||
m_fileMetaDataWidget->setReadOnly(true);
|
m_fileMetaDataWidget->setReadOnly(true);
|
||||||
|
@ -87,22 +87,22 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
|
||||||
// (see bug #241608)
|
// (see bug #241608)
|
||||||
textLayout->addStretch();
|
textLayout->addStretch();
|
||||||
|
|
||||||
QHBoxLayout* tipLayout = new QHBoxLayout(this);
|
QHBoxLayout* layout = new QHBoxLayout(this);
|
||||||
tipLayout->addWidget(m_preview);
|
layout->addWidget(m_preview);
|
||||||
tipLayout->addSpacing(tipLayout->margin());
|
layout->addSpacing(layout->margin());
|
||||||
tipLayout->addLayout(textLayout);
|
layout->addLayout(textLayout);
|
||||||
}
|
}
|
||||||
|
|
||||||
FileMetaDataToolTip::~FileMetaDataToolTip()
|
DolphinFileMetaDataWidget::~DolphinFileMetaDataWidget()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileMetaDataToolTip::setPreview(const QPixmap& pixmap)
|
void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap)
|
||||||
{
|
{
|
||||||
m_preview->setPixmap(pixmap);
|
m_preview->setPixmap(pixmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
QPixmap FileMetaDataToolTip::preview() const
|
QPixmap DolphinFileMetaDataWidget::preview() const
|
||||||
{
|
{
|
||||||
if (m_preview->pixmap()) {
|
if (m_preview->pixmap()) {
|
||||||
return *m_preview->pixmap();
|
return *m_preview->pixmap();
|
||||||
|
@ -110,7 +110,7 @@ QPixmap FileMetaDataToolTip::preview() const
|
||||||
return QPixmap();
|
return QPixmap();
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileMetaDataToolTip::setName(const QString& name)
|
void DolphinFileMetaDataWidget::setName(const QString& name)
|
||||||
{
|
{
|
||||||
QTextOption textOption;
|
QTextOption textOption;
|
||||||
textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
|
textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
|
||||||
|
@ -141,17 +141,17 @@ void FileMetaDataToolTip::setName(const QString& name)
|
||||||
m_name->setText(wrappedText);
|
m_name->setText(wrappedText);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString FileMetaDataToolTip::name() const
|
QString DolphinFileMetaDataWidget::name() const
|
||||||
{
|
{
|
||||||
return m_name->text();
|
return m_name->text();
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileMetaDataToolTip::setItems(const KFileItemList& items)
|
void DolphinFileMetaDataWidget::setItems(const KFileItemList& items)
|
||||||
{
|
{
|
||||||
m_fileMetaDataWidget->setItems(items);
|
m_fileMetaDataWidget->setItems(items);
|
||||||
}
|
}
|
||||||
|
|
||||||
KFileItemList FileMetaDataToolTip::items() const
|
KFileItemList DolphinFileMetaDataWidget::items() const
|
||||||
{
|
{
|
||||||
return m_fileMetaDataWidget->items();
|
return m_fileMetaDataWidget->items();
|
||||||
}
|
}
|
|
@ -19,8 +19,8 @@
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
#ifndef FILEMETADATATOOLTIP_H
|
#ifndef DOLPHINFILEMETADATAWIDGET_H
|
||||||
#define FILEMETADATATOOLTIP_H
|
#define DOLPHINFILEMETADATAWIDGET_H
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include "config-baloo.h"
|
#include "config-baloo.h"
|
||||||
|
@ -40,13 +40,13 @@ namespace Baloo {
|
||||||
* @brief Widget that shows the meta information and a preview of one
|
* @brief Widget that shows the meta information and a preview of one
|
||||||
* or more files inside a KToolTipWidget.
|
* or more files inside a KToolTipWidget.
|
||||||
*/
|
*/
|
||||||
class FileMetaDataToolTip : public QWidget
|
class DolphinFileMetaDataWidget : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FileMetaDataToolTip(QWidget* parent = 0);
|
DolphinFileMetaDataWidget(QWidget* parent = 0);
|
||||||
virtual ~FileMetaDataToolTip();
|
virtual ~DolphinFileMetaDataWidget();
|
||||||
|
|
||||||
void setPreview(const QPixmap& pixmap);
|
void setPreview(const QPixmap& pixmap);
|
||||||
QPixmap preview() const;
|
QPixmap preview() const;
|
||||||
|
@ -65,7 +65,7 @@ public:
|
||||||
signals:
|
signals:
|
||||||
/**
|
/**
|
||||||
* Is emitted after the meta data has been received for the items
|
* Is emitted after the meta data has been received for the items
|
||||||
* set by FileMetaDataToolTip::setItems().
|
* set by DolphinFileMetaDataWidget::setItems().
|
||||||
*/
|
*/
|
||||||
void metaDataRequestFinished(const KFileItemList& items);
|
void metaDataRequestFinished(const KFileItemList& items);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "tooltipmanager.h"
|
#include "tooltipmanager.h"
|
||||||
|
|
||||||
#include "filemetadatatooltip.h"
|
#include "dolphinfilemetadatawidget.h"
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include <KIO/JobUiDelegate>
|
#include <KIO/JobUiDelegate>
|
||||||
#include <KIO/PreviewJob>
|
#include <KIO/PreviewJob>
|
||||||
|
@ -38,7 +38,7 @@ ToolTipManager::ToolTipManager(QWidget* parent) :
|
||||||
m_showToolTipTimer(0),
|
m_showToolTipTimer(0),
|
||||||
m_contentRetrievalTimer(0),
|
m_contentRetrievalTimer(0),
|
||||||
m_transientParent(0),
|
m_transientParent(0),
|
||||||
m_fileMetaDataToolTip(0),
|
m_fileMetaDataWidget(0),
|
||||||
m_tooltipWidget(new KToolTipWidget()),
|
m_tooltipWidget(new KToolTipWidget()),
|
||||||
m_toolTipRequested(false),
|
m_toolTipRequested(false),
|
||||||
m_metaDataRequested(false),
|
m_metaDataRequested(false),
|
||||||
|
@ -82,9 +82,9 @@ void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect,
|
||||||
// Only start the retrieving of the content, when the mouse has been over this
|
// Only start the retrieving of the content, when the mouse has been over this
|
||||||
// item for 200 milliseconds. This prevents a lot of useless preview jobs and
|
// item for 200 milliseconds. This prevents a lot of useless preview jobs and
|
||||||
// meta data retrieval, when passing rapidly over a lot of items.
|
// meta data retrieval, when passing rapidly over a lot of items.
|
||||||
delete m_fileMetaDataToolTip;
|
delete m_fileMetaDataWidget;
|
||||||
m_fileMetaDataToolTip = new FileMetaDataToolTip();
|
m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
|
||||||
connect(m_fileMetaDataToolTip, &FileMetaDataToolTip::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &ToolTipManager::slotMetaDataRequestFinished);
|
this, &ToolTipManager::slotMetaDataRequestFinished);
|
||||||
|
|
||||||
m_contentRetrievalTimer->start();
|
m_contentRetrievalTimer->start();
|
||||||
|
@ -113,17 +113,17 @@ void ToolTipManager::startContentRetrieval()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_fileMetaDataToolTip->setName(m_item.text());
|
m_fileMetaDataWidget->setName(m_item.text());
|
||||||
|
|
||||||
// Request the retrieval of meta-data. The slot
|
// Request the retrieval of meta-data. The slot
|
||||||
// slotMetaDataRequestFinished() is invoked after the
|
// slotMetaDataRequestFinished() is invoked after the
|
||||||
// meta-data have been received.
|
// meta-data have been received.
|
||||||
m_metaDataRequested = true;
|
m_metaDataRequested = true;
|
||||||
m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
|
m_fileMetaDataWidget->setItems(KFileItemList() << m_item);
|
||||||
m_fileMetaDataToolTip->adjustSize();
|
m_fileMetaDataWidget->adjustSize();
|
||||||
|
|
||||||
// Request a preview of the item
|
// Request a preview of the item
|
||||||
m_fileMetaDataToolTip->setPreview(QPixmap());
|
m_fileMetaDataWidget->setPreview(QPixmap());
|
||||||
|
|
||||||
KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
|
KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
|
||||||
job->setIgnoreMaximumSize(m_item.isLocalFile());
|
job->setIgnoreMaximumSize(m_item.isLocalFile());
|
||||||
|
@ -149,7 +149,7 @@ void ToolTipManager::setPreviewPix(const KFileItem& item,
|
||||||
if (pixmap.isNull()) {
|
if (pixmap.isNull()) {
|
||||||
previewFailed();
|
previewFailed();
|
||||||
} else {
|
} else {
|
||||||
m_fileMetaDataToolTip->setPreview(pixmap);
|
m_fileMetaDataWidget->setPreview(pixmap);
|
||||||
if (!m_showToolTipTimer->isActive()) {
|
if (!m_showToolTipTimer->isActive()) {
|
||||||
showToolTip();
|
showToolTip();
|
||||||
}
|
}
|
||||||
|
@ -163,7 +163,7 @@ void ToolTipManager::previewFailed()
|
||||||
}
|
}
|
||||||
|
|
||||||
const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128);
|
const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128);
|
||||||
m_fileMetaDataToolTip->setPreview(pixmap);
|
m_fileMetaDataWidget->setPreview(pixmap);
|
||||||
if (!m_showToolTipTimer->isActive()) {
|
if (!m_showToolTipTimer->isActive()) {
|
||||||
showToolTip();
|
showToolTip();
|
||||||
}
|
}
|
||||||
|
@ -190,7 +190,7 @@ void ToolTipManager::showToolTip()
|
||||||
m_appliedWaitCursor = false;
|
m_appliedWaitCursor = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
|
if (m_fileMetaDataWidget->preview().isNull() || m_metaDataRequested) {
|
||||||
Q_ASSERT(!m_appliedWaitCursor);
|
Q_ASSERT(!m_appliedWaitCursor);
|
||||||
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
|
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
|
||||||
m_appliedWaitCursor = true;
|
m_appliedWaitCursor = true;
|
||||||
|
@ -198,8 +198,8 @@ void ToolTipManager::showToolTip()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjust the size to get a proper sizeHint()
|
// Adjust the size to get a proper sizeHint()
|
||||||
m_fileMetaDataToolTip->adjustSize();
|
m_fileMetaDataWidget->adjustSize();
|
||||||
m_tooltipWidget->showBelow(m_itemRect, m_fileMetaDataToolTip, m_transientParent);
|
m_tooltipWidget->showBelow(m_itemRect, m_fileMetaDataWidget, m_transientParent);
|
||||||
m_toolTipRequested = false;
|
m_toolTipRequested = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include <KFileItem>
|
#include <KFileItem>
|
||||||
|
|
||||||
class FileMetaDataToolTip;
|
class DolphinFileMetaDataWidget;
|
||||||
class KToolTipWidget;
|
class KToolTipWidget;
|
||||||
class QTimer;
|
class QTimer;
|
||||||
class QWindow;
|
class QWindow;
|
||||||
|
@ -77,7 +77,7 @@ private:
|
||||||
/// Transient parent of the tooltip, mandatory on Wayland.
|
/// Transient parent of the tooltip, mandatory on Wayland.
|
||||||
QWindow* m_transientParent;
|
QWindow* m_transientParent;
|
||||||
|
|
||||||
FileMetaDataToolTip* m_fileMetaDataToolTip;
|
DolphinFileMetaDataWidget* m_fileMetaDataWidget;
|
||||||
QScopedPointer<KToolTipWidget> m_tooltipWidget;
|
QScopedPointer<KToolTipWidget> m_tooltipWidget;
|
||||||
|
|
||||||
bool m_toolTipRequested;
|
bool m_toolTipRequested;
|
||||||
|
|
Loading…
Reference in a new issue