From 1e99b19616f102b57f52dfc01ea3ccdb6a24a607 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 17 Apr 2018 13:36:08 +0200 Subject: Add loading progess bar to the address bar --- src/addressbar/urllineedit.cpp | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'src/addressbar/urllineedit.cpp') diff --git a/src/addressbar/urllineedit.cpp b/src/addressbar/urllineedit.cpp index e2cb7a5..4e8d930 100644 --- a/src/addressbar/urllineedit.cpp +++ b/src/addressbar/urllineedit.cpp @@ -15,21 +15,13 @@ #include #include -UrlLineEdit::UrlLineEdit(const QHash &config, QWidget *parent) +UrlLineEdit::UrlLineEdit(QWidget *parent) : QLineEdit(parent) - , suggestionTimer(new QTimer(this)) , m_listView(new Completer(this)) { setPlaceholderText(tr("Enter address")); - suggestionTimer->setSingleShot(true); - connect(suggestionTimer, &QTimer::timeout, this, &UrlLineEdit::search); m_listView->setVisible(false); - connect(this, &QLineEdit::textEdited, this, [this]() { - if(suggestionTimer->isActive()) - suggestionTimer->stop(); - suggestionTimer->start(100); - }); m_pageMenuAction = addAction(style()->standardIcon(QStyle::SP_DriveNetIcon), QLineEdit::LeadingPosition); m_pageMenuAction->setShortcut(QKeySequence("F2")); @@ -70,10 +62,8 @@ UrlLineEdit::UrlLineEdit(const QHash &config, QWidget *parent) UrlLineEdit::~UrlLineEdit() { - suggestionTimer->stop(); } - void UrlLineEdit::connectWebView(WebView *view) { disconnect(urlChangedConnection); @@ -108,14 +98,7 @@ void UrlLineEdit::setUrl(const QUrl &url) setText(urlText); } -void UrlLineEdit::search() -{ - Q_ASSERT_X(bookmarks != nullptr, "UrlLineEdit::search", "bookmarks is nullptr"); - updateCompleter(bookmarks->search(text())); -} - - -void UrlLineEdit::updateCompleter(QStringList l) +void UrlLineEdit::updateCompleter(const QStringList &l) { if(!m_listView->updateItems(l)) { m_listView->hide(); -- cgit v1.2.1