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

HistoryMenu: Load icons asynchronously

Browse Source 
See #1679
This commit is contained in:
David Rosca 2016-12-11 09:43:58 +01:00
parent d6ff977282
commit a4c4aabfe5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/history/historymenu.cpp
View File

@ -97,12 +97,16 @@ void HistoryMenu::aboutToShow()
const QUrl url = query.value(1).toUrl(); const QUrl url = query.value(1).toUrl();
const QString title = QzTools::truncatedText(query.value(0).toString(), 40); const QString title = QzTools::truncatedText(query.value(0).toString(), 40);
Action* act = new Action(IconProvider::iconForUrl(url), title); Action* act = new Action(title);
act->setData(url); act->setData(url);
connect(act, SIGNAL(triggered()), this, SLOT(historyEntryActivated())); connect(act, SIGNAL(triggered()), this, SLOT(historyEntryActivated()));
connect(act, SIGNAL(ctrlTriggered()), this, SLOT(historyEntryCtrlActivated())); connect(act, SIGNAL(ctrlTriggered()), this, SLOT(historyEntryCtrlActivated()));
connect(act, SIGNAL(shiftTriggered()), this, SLOT(historyEntryShiftActivated())); connect(act, SIGNAL(shiftTriggered()), this, SLOT(historyEntryShiftActivated()));
addAction(act); addAction(act);
IconProvider::imageForUrlAsync(url, act, [=](const QImage &img) {
act->setIcon(QIcon(QPixmap::fromImage(img)));
});
} }
} }
@ -120,12 +124,16 @@ void HistoryMenu::aboutToShowMostVisited()
const QVector<HistoryEntry> mostVisited = mApp->history()->mostVisited(10); const QVector<HistoryEntry> mostVisited = mApp->history()->mostVisited(10);
foreach (const HistoryEntry &entry, mostVisited) { foreach (const HistoryEntry &entry, mostVisited) {
Action* act = new Action(IconProvider::iconForUrl(entry.url), QzTools::truncatedText(entry.title, 40)); Action* act = new Action(QzTools::truncatedText(entry.title, 40));
act->setData(entry.url); act->setData(entry.url);
connect(act, SIGNAL(triggered()), this, SLOT(historyEntryActivated())); connect(act, SIGNAL(triggered()), this, SLOT(historyEntryActivated()));
connect(act, SIGNAL(ctrlTriggered()), this, SLOT(historyEntryCtrlActivated())); connect(act, SIGNAL(ctrlTriggered()), this, SLOT(historyEntryCtrlActivated()));
connect(act, SIGNAL(shiftTriggered()), this, SLOT(historyEntryShiftActivated())); connect(act, SIGNAL(shiftTriggered()), this, SLOT(historyEntryShiftActivated()));
m_menuMostVisited->addAction(act); m_menuMostVisited->addAction(act);
IconProvider::imageForUrlAsync(entry.url, act, [=](const QImage &img) {
act->setIcon(QIcon(QPixmap::fromImage(img)));
});
} }
if (m_menuMostVisited->isEmpty()) { if (m_menuMostVisited->isEmpty()) {