From e95965843d1d1ecc72dfc22c59d47bf5caa11756 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Thu, 21 Dec 2017 12:13:04 +0100 Subject: Added Search Box --- src/forms/searchform.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ src/forms/searchform.h | 34 +++++++++++++++++++++++++++++ src/forms/searchform.ui | 44 +++++++++++++++++++++++++++++++++++++ src/mainwindow.cpp | 7 ++++++ src/mainwindow.h | 5 +++++ 5 files changed, 146 insertions(+) create mode 100644 src/forms/searchform.cpp create mode 100644 src/forms/searchform.h create mode 100644 src/forms/searchform.ui (limited to 'src') diff --git a/src/forms/searchform.cpp b/src/forms/searchform.cpp new file mode 100644 index 0000000..0e5161f --- /dev/null +++ b/src/forms/searchform.cpp @@ -0,0 +1,56 @@ +/* + * 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: git://neueland.iserlohn-fortress.net/smolbote.git + * + * SPDX-License-Identifier: GPL-3.0 + */ + +#include "searchform.h" +#include "ui_searchform.h" +#include "../mainwindow.h" + +#include +#include + +SearchForm::SearchForm(MainWindow *parentWindow, QWidget *parent) : + QWidget(parent), + ui(new Ui::SearchForm) +{ + Q_CHECK_PTR(parentWindow); + + ui->setupUi(this); + ui->lineEdit->setPlaceholderText(tr("Search")); + ui->lineEdit->setClearButtonEnabled(true); + + // show/hide action + QAction *toggleSearchBox = new QAction(this); + toggleSearchBox->setShortcut(QKeySequence(QString::fromStdString(parentWindow->m_config->value("browser.shortcuts.toggleSearchBox").value()))); + connect(toggleSearchBox, &QAction::triggered, this, [this]() { + if(isVisible()) { + setVisible(false); + } else { + setVisible(true); + setFocus(); + } + }); + parentWindow->addAction(toggleSearchBox); + + connect(ui->lineEdit, &QLineEdit::returnPressed, this, [this, parentWindow]() { + QWebEnginePage::FindFlags searchFlags; + searchFlags.setFlag(QWebEnginePage::FindCaseSensitively, ui->caseSensitivity_checkBox->isChecked()); + searchFlags.setFlag(QWebEnginePage::FindBackward, ui->reverseSearch_checkBox->isChecked()); + parentWindow->m_currentView->findText(ui->lineEdit->text(), searchFlags); + }); +} + +SearchForm::~SearchForm() +{ + delete ui; +} + +void SearchForm::focusInEvent(QFocusEvent *e) +{ + ui->lineEdit->setFocus(); + QWidget::focusInEvent(e); +} diff --git a/src/forms/searchform.h b/src/forms/searchform.h new file mode 100644 index 0000000..646d4d4 --- /dev/null +++ b/src/forms/searchform.h @@ -0,0 +1,34 @@ +/* + * 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: git://neueland.iserlohn-fortress.net/smolbote.git + * + * SPDX-License-Identifier: GPL-3.0 + */ + +#ifndef SEARCHFORM_H +#define SEARCHFORM_H + +#include + +namespace Ui { +class SearchForm; +} + +class MainWindow; +class SearchForm : public QWidget +{ + Q_OBJECT + +public: + explicit SearchForm(MainWindow *parentWindow, QWidget *parent = nullptr); + ~SearchForm(); + +protected: + void focusInEvent(QFocusEvent *e); + +private: + Ui::SearchForm *ui; +}; + +#endif // SEARCHFORM_H diff --git a/src/forms/searchform.ui b/src/forms/searchform.ui new file mode 100644 index 0000000..2b0c551 --- /dev/null +++ b/src/forms/searchform.ui @@ -0,0 +1,44 @@ + + + SearchForm + + + + 0 + 0 + 550 + 26 + + + + Form + + + + 0 + + + 0 + + + + + + + + Case Sensitive + + + + + + + Search Backwards + + + + + + + + diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3546f83..5c3048c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -29,6 +29,8 @@ #include +#include "forms/searchform.h" + MainWindow::MainWindow(std::shared_ptr config, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), @@ -101,6 +103,11 @@ MainWindow::MainWindow(std::shared_ptr config, QWidget *parent) : // loading bar ui->statusBar->addPermanentWidget(m_progressBar); + // search box + m_searchBox = new SearchForm(this); + ui->statusBar->addWidget(m_searchBox); + m_searchBox->setVisible(false); + // shortcuts QAction *focusAddressAction = new QAction(this); focusAddressAction->setShortcut(QKeySequence(QString::fromStdString(m_config->value("browser.shortcuts.focusAddress").value()))); diff --git a/src/mainwindow.h b/src/mainwindow.h index 31a3d2f..7f5686f 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -23,6 +23,8 @@ namespace Ui { class MainWindow; } +class SearchForm; + class Configuration; class BookmarksWidget; class DownloadsWidget; @@ -35,6 +37,7 @@ class MainWindow : public QMainWindow Q_OBJECT friend class WebView; + friend class SearchForm; public: MainWindow(std::shared_ptr config, QWidget *parent = nullptr); @@ -69,6 +72,8 @@ private: Q_DISABLE_COPY(MainWindow) Ui::MainWindow *ui; + SearchForm *m_searchBox; + MainWindowTabBar *tabBar; WebView *m_currentView; -- cgit v1.2.1