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

LocationCompleter: Sort also results from bookmarks by count

Browse Source 
- bookmarks get +10 count because bookmarks gets count only
  from location completer and bookmakrs manager/sidebar
  but history entries gets count also from navigating through
  webpages (eg. click on link, redirect, ...)
This commit is contained in:
nowrep 2012-09-02 15:36:20 +02:00
parent ec70c7d43d
commit 2c57528d29
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/navigation/completer/locationcompletermodel.cpp
View File

@ -28,6 +28,12 @@ LocationCompleterModel::LocationCompleterModel(QObject* parent)
{ {
} }
bool countBiggerThan(const QStandardItem* i1, const QStandardItem* i2)
{
return i1->data(LocationCompleterModel::CountRole).toInt() >
i2->data(LocationCompleterModel::CountRole).toInt();
}
void LocationCompleterModel::refreshCompletions(const QString &string) void LocationCompleterModel::refreshCompletions(const QString &string)
{ {
if (m_lastCompletion == string) { if (m_lastCompletion == string) {
@ -47,6 +53,7 @@ void LocationCompleterModel::refreshCompletions(const QString &string)
int limit = string.size() < 3 ? 25 : 15; int limit = string.size() < 3 ? 25 : 15;
QList<QUrl> urlList; QList<QUrl> urlList;
QList<QStandardItem*> itemList;
if (showType == HistoryAndBookmarks || showType == Bookmarks) { if (showType == HistoryAndBookmarks || showType == Bookmarks) {
QSqlQuery query = createQuery(string, "bookmarks.count DESC", urlList, limit, true); QSqlQuery query = createQuery(string, "bookmarks.count DESC", urlList, limit, true);
@ -56,14 +63,16 @@ void LocationCompleterModel::refreshCompletions(const QString &string)
QStandardItem* item = new QStandardItem(); QStandardItem* item = new QStandardItem();
const QUrl &url = query.value(1).toUrl(); const QUrl &url = query.value(1).toUrl();
item->setIcon(qIconProvider->iconFromImage(QImage::fromData(query.value(3).toByteArray()))); item->setIcon(qIconProvider->iconFromImage(QImage::fromData(query.value(4).toByteArray())));
item->setText(url.toEncoded()); item->setText(url.toEncoded());
item->setData(query.value(0), IdRole); item->setData(query.value(0), IdRole);
item->setData(query.value(2), TitleRole); item->setData(query.value(2), TitleRole);
item->setData(query.value(3).toInt() + 10, CountRole); // Give +10 count bonus to bookmarks
item->setData(QVariant(true), BookmarkRole); item->setData(QVariant(true), BookmarkRole);
item->setData(string, SearchStringRole); item->setData(string, SearchStringRole);
appendRow(item);
urlList.append(url); urlList.append(url);
itemList.append(item);
} }
limit -= query.size(); limit -= query.size();
@ -81,12 +90,18 @@ void LocationCompleterModel::refreshCompletions(const QString &string)
item->setText(url.toEncoded()); item->setText(url.toEncoded());
item->setData(query.value(0), IdRole); item->setData(query.value(0), IdRole);
item->setData(query.value(2), TitleRole); item->setData(query.value(2), TitleRole);
item->setData(query.value(3), CountRole);
item->setData(QVariant(false), BookmarkRole); item->setData(QVariant(false), BookmarkRole);
item->setData(string, SearchStringRole); item->setData(string, SearchStringRole);
appendRow(item); itemList.append(item);
} }
} }
// Sort by count
qSort(itemList.begin(), itemList.end(), countBiggerThan);
appendColumn(itemList);
} }
void LocationCompleterModel::showMostVisited() void LocationCompleterModel::showMostVisited()
@ -114,7 +129,7 @@ QSqlQuery LocationCompleterModel::createQuery(const QString &searchString, const
const QList<QUrl> &alreadyFound, int limit, bool bookmarks, bool exactMatch) const QList<QUrl> &alreadyFound, int limit, bool bookmarks, bool exactMatch)
{ {
QString table = bookmarks ? "bookmarks" : "history"; QString table = bookmarks ? "bookmarks" : "history";
QString query = QString("SELECT %1.id, %1.url, %1.title").arg(table); QString query = QString("SELECT %1.id, %1.url, %1.title, %1.count").arg(table);
QStringList searchList; QStringList searchList;
if (bookmarks) { if (bookmarks) {

3
src/lib/navigation/completer/locationcompletermodel.h
View File

@ -30,7 +30,8 @@ public:
TitleRole = Qt::UserRole + 1, TitleRole = Qt::UserRole + 1,
BookmarkRole = Qt::UserRole + 2, BookmarkRole = Qt::UserRole + 2,
IdRole = Qt::UserRole + 3, IdRole = Qt::UserRole + 3,
SearchStringRole = Qt::UserRole + 4 SearchStringRole = Qt::UserRole + 4,
CountRole = Qt::UserRole + 5
}; };
explicit LocationCompleterModel(QObject* parent = 0); explicit LocationCompleterModel(QObject* parent = 0);