Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Fix connecting to WebView::iconChanged

Browse Source
This commit is contained in:
David Rosca 2016-10-24 21:42:25 +02:00
parent c0907885b9
commit 9e1c6312cb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/popupwindow/popupwindow.cpp
View File

@ -103,13 +103,13 @@ PopupWindow::PopupWindow(PopupWebView* view)
m_layout->addWidget(m_statusBar);
setLayout(m_layout);
connect(m_view, SIGNAL(showNotification(QWidget*)), this, SLOT(showNotification(QWidget*)));
connect(m_view, SIGNAL(titleChanged(QString)), this, SLOT(titleChanged()));
connect(m_view, SIGNAL(urlChanged(QUrl)), m_locationBar, SLOT(showUrl(QUrl)));
connect(m_view, SIGNAL(iconChanged()), m_locationBar, SLOT(showSiteIcon()));
connect(m_view, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
connect(m_view, SIGNAL(loadProgress(int)), this, SLOT(loadProgress(int)));
connect(m_view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
connect(m_view, &WebView::showNotification, this, &PopupWindow::showNotification);
connect(m_view, &WebView::titleChanged, this, &PopupWindow::titleChanged);
connect(m_view, &WebView::urlChanged, m_locationBar, &PopupLocationBar::showUrl);
connect(m_view, &WebView::iconChanged, m_locationBar, &PopupLocationBar::showSiteIcon);
connect(m_view, &WebView::loadStarted, this, &PopupWindow::loadStarted);
connect(m_view, &WebView::loadProgress, this, &PopupWindow::loadProgress);
connect(m_view, &WebView::loadFinished, this, &PopupWindow::loadFinished);
connect(m_view->page(), &WebPage::linkHovered, this, &PopupWindow::showStatusBarMessage);
connect(m_view->page(), &WebPage::geometryChangeRequested, this, &PopupWindow::setWindowGeometry);

4
src/plugins/TabManager/tabmanagerwidget.cpp
View File

@ -705,6 +705,8 @@ void TabManagerWidget::makeWebViewConnections(WebView* view)
connect(view->page(), SIGNAL(loadFinished(bool)), this, SLOT(delayedRefreshTree()));
connect(view->page(), SIGNAL(loadStarted()), this, SLOT(delayedRefreshTree()));
connect(view, SIGNAL(titleChanged(QString)), this, SLOT(delayedRefreshTree()));
connect(view, SIGNAL(iconChanged()), this, SLOT(delayedRefreshTree()));
connect(view, &WebView::iconChanged, this, [this]() {
delayedRefreshTree();
});
}
}