Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Finally fixed site icon for qupzilla: scheme pages

Browse Source 
- for some reason, Qt 4.8 does not load site icon
  from qrc: scheme (and also data: scheme) correctly
This commit is contained in:
nowrep 2011-12-07 21:32:47 +01:00
parent c296dfd965
commit a7736d4130
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/webview/tabwidget.cpp
View File

@ -206,7 +206,7 @@ void TabWidget::aboutToShowTabsMenu()
action->setIcon(QIcon(":/icons/menu/dot.png"));
}
else {
action->setIcon(_iconForUrl(view->url()));
action->setIcon(view->siteIcon());
}
if (view->title().isEmpty()) {
if (view->isLoading()) {

7
src/webview/webview.cpp
View File

@ -267,7 +267,7 @@ QLabel* WebView::animationLoading(int index, bool addMovie)
QLabel* loadingAnimation = qobject_cast<QLabel*>(tabWidget()->getTabBar()->tabButton(index, QTabBar::LeftSide));
if (!loadingAnimation) {
loadingAnimation = new QLabel();
loadingAnimation->setStyleSheet("margin: 0px; padding: 0px; width: 16px; height: 16px;");
// loadingAnimation->setStyleSheet("margin: 0px; padding: 0px; width: 16px; height: 16px;");
}
if (addMovie && !loadingAnimation->movie()) {
QMovie* movie = new QMovie(":icons/other/progress.gif", QByteArray(), loadingAnimation);
@ -344,12 +344,17 @@ void WebView::iconChanged()
QIcon WebView::siteIcon()
{
if (url().scheme() == "qupzilla") {
return QIcon(":icons/qupzilla.png");
}
if (!icon().isNull()) {
return icon();
}
if (!m_siteIcon.isNull()) {
return m_siteIcon;
}
return _iconForUrl(url());
}