Settings: Add search engines Bing, Brave, Coccinellidae SerenityOS Search, DuckDuckGo, FrogFind, GitHub, Google, Mojeek, Yandex

Author: Xexxa

Settings.cpp

@@ -23,4 +23,13 @@ void Settings::set_homepage(QString const& homepage)
     m_qsettings->setValue("homepage", homepage);
 }
 
+QString Settings::search_engine()
+{
+    return m_qsettings->value("search_engine", "brave").toString();
+}
+
+void Settings::set_search_engine(QString const& search_engine)
+{
+    m_qsettings->setValue("search_engine", search_engine);
+}
 }

Settings.h

@@ -20,6 +20,9 @@ class Settings {
     QString homepage();
     void set_homepage(QString const& homepage);
 
+    QString search_engine();
+    void set_search_engine(QString const& search_engine);
+
 private:
     QSettings* m_qsettings;
 };

SettingsDialog.cpp

@@ -8,6 +8,7 @@
 #include "SettingsDialog.h"
 #include <QCloseEvent>
 #include <QLabel>
+#include <QComboBox>
 
 extern Browser::Settings* s_settings;
 
@@ -16,10 +17,23 @@ SettingsDialog::SettingsDialog(QMainWindow* window)
 {
     m_layout = new QFormLayout;
     m_homepage = new QLineEdit;
+    m_search_engine = new QComboBox; // FIXME: Saved search engine should be preselected in QComboBox
     m_ok_button = new QPushButton("&Save");
 
     m_layout->addWidget(new QLabel("Homepage"));
     m_layout->addWidget(m_homepage);
+    m_layout->addWidget(new QLabel("Search engine"));
+    m_search_engine->addItem("Bing", QVariant("bing"));
+    m_search_engine->addItem("Brave (Default)", QVariant("brave"));
+    m_search_engine->addItem("Coccinellidae SerenityOS Search", QVariant("coccinellidae-serenityos-search"));
+    m_search_engine->addItem("DuckDuckGo", QVariant("duckduckgo"));
+    m_search_engine->addItem("FrogFind", QVariant("frogfind"));
+    m_search_engine->addItem("GitHub", QVariant("github"));
+    m_search_engine->addItem("Google", QVariant("google"));
+    m_search_engine->addItem("Mojeek", QVariant("mojeek"));
+    m_search_engine->addItem("Yandex", QVariant("yandex"));
+    m_layout->addWidget(m_search_engine);
+    // FIXME: Should add field for custom search engine.
     m_layout->addWidget(m_ok_button);
 
     m_homepage->setText(s_settings->homepage());
@@ -28,7 +42,7 @@ SettingsDialog::SettingsDialog(QMainWindow* window)
         close();
     });
 
-    setWindowTitle("Settings");
+    setWindowTitle("Preferences");
     setFixedWidth(300);
     setLayout(m_layout);
     show();
@@ -45,4 +59,6 @@ void SettingsDialog::save()
 {
     // FIXME: Validate data.
     s_settings->set_homepage(m_homepage->text());
+
+    s_settings->set_search_engine(m_search_engine->currentData().toString());
 }

SettingsDialog.h

@@ -9,6 +9,7 @@
 #include <QMainWindow>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QComboBox>
 
 #pragma once
 
@@ -25,5 +26,6 @@ class SettingsDialog : public QDialog {
     QFormLayout* m_layout;
     QPushButton* m_ok_button { nullptr };
     QLineEdit* m_homepage { nullptr };
+    QComboBox* m_search_engine { nullptr };
     QMainWindow* m_window { nullptr };
 };

Tab.cpp

@@ -209,19 +209,26 @@ void Tab::location_edit_return_pressed()
 void Tab::search_edit_return_pressed()
 {
     QString user_input = m_search_edit->text();
-    user_input.prepend("https://search.brave.com/search?q=");
-
-    /*
-     * Bing https://www.bing.com/search?q={}
-     * Brave https://search.brave.com/search?q={} (Default)
-     * Coccinellidae SerenityOS Search https://search.coccinellidae.serenityos.net/search?q=
-     * DuckDuckGo https://duckduckgo.com/?q={}
-     * FrogFind https://frogfind.com/?q={}
-     * GitHub https://github.com/search?q={}
-     * Google https://google.com/search?q={}
-     * Mojeek https://www.mojeek.com/search?q={}
-     * Yandex https://yandex.com/search/?text={}
-     */
+
+    if (s_settings->search_engine() == "bing") {
+        user_input.prepend("https://www.bing.com/search?q=");
+    } else if (s_settings->search_engine() == "brave") {
+        user_input.prepend("https://search.brave.com/search?q=");
+    } else if (s_settings->search_engine() == "coccinellidae-serenityos-search") {
+        user_input.prepend("https://search.coccinellidae.serenityos.net/search?q=");
+    } else if (s_settings->search_engine() == "duckduckgo") {
+        user_input.prepend("https://duckduckgo.com/?q=");
+    } else if (s_settings->search_engine() == "frogfind") {
+        user_input.prepend("https://frogfind.com/?q=");
+    } else if (s_settings->search_engine() == "github") {
+        user_input.prepend("https://github.com/search?q=");
+    } else if (s_settings->search_engine() == "google") {
+        user_input.prepend("https://google.com/search?q=");
+    } else if (s_settings->search_engine() == "mojeek") {
+        user_input.prepend("https://www.mojeek.com/search?q=");
+    } else if (s_settings->search_engine() == "yandex") {
+        user_input.prepend("https://yandex.com/search/?text=");
+    }
 
     navigate(user_input);
 }