aboutsummaryrefslogtreecommitdiff
path: root/src/addressbar
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-01-26 00:41:09 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-01-26 00:41:09 +0100
commit1bc3c311551d53759ffdfb11904c45f1cc2f91ce (patch)
treeca22cf2d17611dfe3aa0cfbf3ac825ecb014b9f4 /src/addressbar
parentConfiguration class rework (diff)
downloadsmolbote-1bc3c311551d53759ffdfb11904c45f1cc2f91ce.tar.xz
UrlLineEdit rework
- moved UrlLineEdit to src/addressbar - added UrlLineEdit::connectWebView - removed UrlLineEdit::pageAction - UrlLineEdit restores the text format when losing focus - Split off completer code into Completer class - WebPage now displays a warning message box instead on certificate errors
Diffstat (limited to 'src/addressbar')
-rw-r--r--src/addressbar/completer.cpp74
-rw-r--r--src/addressbar/completer.h33
-rw-r--r--src/addressbar/urllineedit.cpp168
-rw-r--r--src/addressbar/urllineedit.h65
4 files changed, 340 insertions, 0 deletions
diff --git a/src/addressbar/completer.cpp b/src/addressbar/completer.cpp
new file mode 100644
index 0000000..4c95bce
--- /dev/null
+++ b/src/addressbar/completer.cpp
@@ -0,0 +1,74 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://neueland.iserlohn-fortress.net/smolbote.hg
+ *
+ * SPDX-License-Identifier: GPL-3.0
+ */
+
+#include "completer.h"
+#include <QKeyEvent>
+
+Completer::Completer(QWidget *parent)
+ : QListView(parent)
+{
+ setWindowFlags(Qt::ToolTip);
+}
+
+bool Completer::updateItems(const QModelIndexList &list)
+{
+ if(list.isEmpty())
+ return false;
+
+ // list is not empty
+ QStringList l;
+ for(const QModelIndex &idx : list) {
+ l.append(idx.data(Qt::EditRole).toString());
+ }
+
+ auto *model = new QStringListModel(l, this);
+ setModel(model);
+
+ delete completionModel;
+ completionModel = model;
+
+ return true;
+}
+
+bool Completer::keyPressed(QKeyEvent *event)
+{
+ if(isHidden())
+ return false;
+
+ Q_CHECK_PTR(completionModel);
+
+ int count = completionModel->rowCount();
+ const QModelIndex currentIndex = this->currentIndex();
+
+ switch(event->key()) {
+ case Qt::Key_Down:
+ if(currentIndex.row() + 1 >= count) {
+ setCurrentIndex(completionModel->index(0, 0));
+ } else {
+ setCurrentIndex(completionModel->index(currentIndex.row() + 1, 0));
+ }
+ break;
+
+ case Qt::Key_Up:
+ if(currentIndex.row() == 0) {
+ setCurrentIndex(completionModel->index(count - 1, 0));
+ } else {
+ setCurrentIndex(completionModel->index(currentIndex.row() - 1, 0));
+ }
+ break;
+
+ case Qt::Key_Escape:
+ hide();
+ break;
+
+ default:
+ break;
+ }
+
+ return true;
+}
diff --git a/src/addressbar/completer.h b/src/addressbar/completer.h
new file mode 100644
index 0000000..adf5d8e
--- /dev/null
+++ b/src/addressbar/completer.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://neueland.iserlohn-fortress.net/smolbote.hg
+ *
+ * SPDX-License-Identifier: GPL-3.0
+ */
+
+#ifndef SMOLBOTE_COMPLETER_H
+#define SMOLBOTE_COMPLETER_H
+
+#include <QListView>
+#include <QStringListModel>
+
+class Completer : public QListView
+{
+
+ Q_OBJECT
+
+public:
+ explicit Completer(QWidget *parent = nullptr);
+
+ bool updateItems(const QModelIndexList &list);
+
+ bool keyPressed(QKeyEvent *event);
+
+private:
+ QStringListModel *completionModel;
+
+};
+
+
+#endif //SMOLBOTE_COMPLETER_H
diff --git a/src/addressbar/urllineedit.cpp b/src/addressbar/urllineedit.cpp
new file mode 100644
index 0000000..d34fdcb
--- /dev/null
+++ b/src/addressbar/urllineedit.cpp
@@ -0,0 +1,168 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://neueland.iserlohn-fortress.net/smolbote.hg
+ *
+ * SPDX-License-Identifier: GPL-3.0
+ */
+
+#include "urllineedit.h"
+#include <QLabel>
+#include <QTimer>
+#include <QWidgetAction>
+
+UrlLineEdit::UrlLineEdit(QWidget *parent)
+ : QLineEdit(parent)
+ , m_listView(new Completer(this))
+{
+ setPlaceholderText(tr("Enter address"));
+
+ m_listView->setVisible(false);
+ connect(this, &UrlLineEdit::textEdited, this, &UrlLineEdit::updateCompleter);
+
+ // ssl menu
+ m_sslMenu = new QMenu(this);
+ m_sslLabel = new QLabel(m_sslMenu);
+ QWidgetAction *sslErrorAction = new QWidgetAction(m_sslMenu);
+ sslErrorAction->setDefaultWidget(m_sslLabel);
+ m_sslMenu->addAction(sslErrorAction);
+
+ m_sslAction = addAction(style()->standardIcon(QStyle::SP_DriveNetIcon), QLineEdit::LeadingPosition);
+ m_sslAction->setToolTip(tr("TODO: Display SSL Status popup here"));
+ m_sslAction->setMenu(m_sslMenu);
+
+ connect(m_sslAction, &QAction::triggered, this, [this]() {
+ m_sslMenu->exec(this->mapToGlobal(QPoint(0, height())));
+ });
+
+ m_pageAction = addAction(style()->standardIcon(QStyle::SP_FileIcon), QLineEdit::TrailingPosition);
+ m_pageAction->setShortcut(QKeySequence("F10"));
+ m_pageAction->setToolTip(tr("Page Actions"));
+ connect(m_pageAction, &QAction::triggered, m_pageAction, [&]() {
+ //this->deselect();
+ if(m_pageAction->menu() != nullptr) {
+ m_pageAction->menu()->exec(this->mapToGlobal(QPoint(width(), height())));
+ }
+ });
+
+ QTextCharFormat hostnameFormat;
+ hostnameFormat.setFontWeight(QFont::Bold);
+ m_hostFormat.format = hostnameFormat;
+
+ // connect signals
+ connect(this, &QLineEdit::returnPressed, [this]() {
+ if(this->text().startsWith('#')) {
+ emit searchTermEntered(this->text().mid(1));
+ } else {
+ emit addressEntered(QUrl::fromUserInput(this->text()));
+ }
+ this->clearFocus();
+ });
+}
+
+void UrlLineEdit::setCompleterModel(QAbstractItemModel *model)
+{
+ Q_CHECK_PTR(model);
+ m_bookmarksModel = model;
+}
+
+void UrlLineEdit::connectWebView(WebView *view)
+{
+ Q_CHECK_PTR(view);
+
+ disconnect(urlChangedConnection);
+
+ setUrl(view->url());
+ m_pageAction->setMenu(view->pageMenu());
+
+ urlChangedConnection = connect(view, &WebView::urlChanged, this, &UrlLineEdit::setUrl);
+}
+
+void UrlLineEdit::setUrl(const QUrl &url)
+{
+ QString urlText = url.toString();
+ QString domain = url.host();
+
+ m_hostFormat.start = urlText.indexOf(domain);
+ m_hostFormat.length = domain.length();
+
+ clear();
+ clearTextFormat();
+ setTextFormat(m_hostFormat);
+ setText(urlText);
+}
+
+void UrlLineEdit::showSslError(const QString &message)
+{
+ m_sslLabel->setText(message);
+ m_sslAction->trigger();
+}
+
+void UrlLineEdit::updateCompleter(const QString &text)
+{
+ if(m_bookmarksModel == nullptr) {
+ return;
+ }
+
+ const QModelIndexList res = m_bookmarksModel->match(QModelIndex(), Qt::EditRole, text, 7);
+
+ if(!m_listView->updateItems(res)) {
+ m_listView->hide();
+ return;
+ }
+
+ // positioning
+ m_listView->setFixedWidth(width());
+ m_listView->move(mapToGlobal(QPoint(0, height())));
+ m_listView->show();
+}
+
+void UrlLineEdit::focusInEvent(QFocusEvent *event)
+{
+ clearTextFormat();
+
+ QLineEdit::focusInEvent(event);
+
+ // select the contents when receiving focus
+ // http://stackoverflow.com/a/35725950/1054406
+ // mousePressEvent triggers right after focusInEvent so text selected in focusInEvent unselects by mousePressEvent
+ //QTimer::singleShot(0, this, SLOT(selectAll()));
+}
+
+void UrlLineEdit::focusOutEvent(QFocusEvent *event)
+{
+ setUrl(QUrl::fromUserInput(text()));
+ QLineEdit::focusOutEvent(event);
+}
+
+void UrlLineEdit::keyPressEvent(QKeyEvent *event)
+{
+ if(m_listView->keyPressed(event)) {
+ int key = event->key();
+ QModelIndex currentIndex = m_listView->currentIndex();
+
+ if(key == Qt::Key::Key_Enter || key == Qt::Key_Return) {
+
+ if(currentIndex.isValid()) {
+ setText(currentIndex.data().toString());
+ }
+ m_listView->hide();
+ return;
+ }
+ }
+ QLineEdit::keyPressEvent(event);
+}
+
+// formatting taken from: https://forum.qt.io/topic/60962/setting-qlineedit-text-bold
+void UrlLineEdit::setTextFormat(const QTextLayout::FormatRange &format)
+{
+ QList<QInputMethodEvent::Attribute> attributes;
+ attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, format.start, format.length, format.format));
+ QInputMethodEvent ev(QString(), attributes);
+ event(&ev);
+}
+
+void UrlLineEdit::clearTextFormat()
+{
+ setTextFormat(QTextLayout::FormatRange());
+}
diff --git a/src/addressbar/urllineedit.h b/src/addressbar/urllineedit.h
new file mode 100644
index 0000000..4e62128
--- /dev/null
+++ b/src/addressbar/urllineedit.h
@@ -0,0 +1,65 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://neueland.iserlohn-fortress.net/smolbote.hg
+ *
+ * SPDX-License-Identifier: GPL-3.0
+ */
+
+#ifndef URLLINEEDIT_H
+#define URLLINEEDIT_H
+
+#include <QAction>
+#include <QLineEdit>
+#include <QTextLayout>
+#include <src/webengine/webview.h>
+#include "completer.h"
+
+class QAbstractItemModel;
+class QMenu;
+class QLabel;
+class UrlLineEdit : public QLineEdit
+{
+ Q_OBJECT
+public:
+ explicit UrlLineEdit(QWidget *parent = nullptr);
+
+ void setCompleterModel(QAbstractItemModel *model);
+
+signals:
+ void addressEntered(const QUrl &url);
+ void searchTermEntered(const QString &term);
+
+public slots:
+ void connectWebView(WebView *view);
+ void setUrl(const QUrl &url);
+ void showSslError(const QString &message);
+
+ void updateCompleter(const QString &text);
+
+protected:
+ void focusInEvent(QFocusEvent *event) override;
+ void focusOutEvent(QFocusEvent *event) override;
+ void keyPressEvent(QKeyEvent *event) override;
+
+private:
+ void setTextFormat(const QTextLayout::FormatRange &format);
+ void clearTextFormat();
+
+ QTextLayout::FormatRange m_hostFormat;
+
+ QAction *m_sslAction = nullptr;
+ QAction *m_pageAction = nullptr;
+
+ // ssl menu
+ QMenu *m_sslMenu;
+ QLabel *m_sslLabel;
+
+ // completer
+ QAbstractItemModel *m_bookmarksModel = nullptr;
+ Completer *m_listView;
+
+ QMetaObject::Connection urlChangedConnection;
+};
+
+#endif // URLLINEEDIT_H