mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 08:21:22 +00:00
Don't ignore tag clicks in the tooltips
Summary: Now that we can use the metadata widgets in the tooltips, we can also open the tags:// url if the user clicks some tag in a tooltip. The behavior is now consistent with the metadata widget in the information panel. Test Plan: Click a tag when the metadata tooltip shows up. Reviewers: emmanuelp Subscribers: #konqueror, #dolphin Differential Revision: https://phabricator.kde.org/D5658
This commit is contained in:
parent
e74910cfdf
commit
73f885f9d3
|
@ -1453,6 +1453,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
|
||||||
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
|
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
|
||||||
connect(view, &DolphinView::goForwardRequested,
|
connect(view, &DolphinView::goForwardRequested,
|
||||||
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goForward));
|
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goForward));
|
||||||
|
connect(view, &DolphinView::urlActivated,
|
||||||
|
this, &DolphinMainWindow::handleUrl);
|
||||||
|
|
||||||
const KUrlNavigator* navigator = container->urlNavigator();
|
const KUrlNavigator* navigator = container->urlNavigator();
|
||||||
connect(navigator, &KUrlNavigator::urlChanged,
|
connect(navigator, &KUrlNavigator::urlChanged,
|
||||||
|
|
|
@ -182,6 +182,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
|
||||||
this, &DolphinView::slotSelectionChanged);
|
this, &DolphinView::slotSelectionChanged);
|
||||||
|
|
||||||
m_toolTipManager = new ToolTipManager(this);
|
m_toolTipManager = new ToolTipManager(this);
|
||||||
|
connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated);
|
||||||
|
|
||||||
m_versionControlObserver = new VersionControlObserver(this);
|
m_versionControlObserver = new VersionControlObserver(this);
|
||||||
m_versionControlObserver->setModel(m_model);
|
m_versionControlObserver->setModel(m_model);
|
||||||
|
|
|
@ -544,6 +544,12 @@ signals:
|
||||||
*/
|
*/
|
||||||
void toggleActiveViewRequested();
|
void toggleActiveViewRequested();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is emitted when the user clicks a tag or a link
|
||||||
|
* in the metadata widget of a tooltip.
|
||||||
|
*/
|
||||||
|
void urlActivated(const QUrl& url);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/** Changes the zoom level if Control is pressed during a wheel event. */
|
/** Changes the zoom level if Control is pressed during a wheel event. */
|
||||||
virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
|
virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
|
||||||
|
|
|
@ -67,10 +67,14 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
|
||||||
m_fileMetaDataWidget = new KFileMetaDataWidget(this);
|
m_fileMetaDataWidget = new KFileMetaDataWidget(this);
|
||||||
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
||||||
|
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::urlActivated,
|
||||||
|
this, &DolphinFileMetaDataWidget::urlActivated);
|
||||||
#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, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
||||||
|
connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
|
||||||
|
this, &DolphinFileMetaDataWidget::urlActivated);
|
||||||
#endif
|
#endif
|
||||||
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
|
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
|
||||||
m_fileMetaDataWidget->setReadOnly(true);
|
m_fileMetaDataWidget->setReadOnly(true);
|
||||||
|
|
|
@ -69,6 +69,12 @@ signals:
|
||||||
*/
|
*/
|
||||||
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);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QLabel* m_preview;
|
QLabel* m_preview;
|
||||||
QLabel* m_name;
|
QLabel* m_name;
|
||||||
|
|
|
@ -86,6 +86,8 @@ void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect,
|
||||||
m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
|
m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
|
||||||
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &ToolTipManager::slotMetaDataRequestFinished);
|
this, &ToolTipManager::slotMetaDataRequestFinished);
|
||||||
|
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::urlActivated,
|
||||||
|
this, &ToolTipManager::urlActivated);
|
||||||
|
|
||||||
m_contentRetrievalTimer->start();
|
m_contentRetrievalTimer->start();
|
||||||
m_showToolTipTimer->start();
|
m_showToolTipTimer->start();
|
||||||
|
|
|
@ -58,6 +58,13 @@ public:
|
||||||
*/
|
*/
|
||||||
void hideToolTip();
|
void hideToolTip();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
/**
|
||||||
|
* Is emitted when the user clicks a tag or a link
|
||||||
|
* in the metadata widget.
|
||||||
|
*/
|
||||||
|
void urlActivated(const QUrl& url);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void startContentRetrieval();
|
void startContentRetrieval();
|
||||||
void setPreviewPix(const KFileItem& item, const QPixmap& pix);
|
void setPreviewPix(const KFileItem& item, const QPixmap& pix);
|
||||||
|
|
Loading…
Reference in a new issue