Address bar popup is now navigateable

1 files changed, 8 insertions, 6 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 856298d..b42fb7e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -91,7 +91,14 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
     this->addToolBar(Qt::TopToolBarArea, navigationToolBar);
 
     // connect signals
-    connect(urlLineEdit, SIGNAL(returnPressed()), this, SLOT(handleUrlChanged()));
+    connect(urlLineEdit, &UrlLineEdit::addressEntered, [&](const QUrl &url){
+        tabBar->currentView()->load(url);
+    });
+    connect(urlLineEdit, &UrlLineEdit::searchTermEntered, [&](const QString &string){
+        QString term = string.mid(1);
+        term.replace(' ', '+');
+        tabBar->currentView()->load(QUrl::fromUserInput(qApp->settings()->value("general.search").toString().replace("$term", term)));
+    });
     connect(tabBar, SIGNAL(currentTabChanged(WebView*)), this, SLOT(handleTabChanged(WebView*)));
 
     // Load profile
@@ -232,11 +239,6 @@ void MainWindow::handleTabChanged(WebView *view)
     centralWidget()->setFocus();
 }
 
-void MainWindow::handleUrlChanged()
-{
-    tabBar->currentView()->load(urlLineEdit->url());
-}
-
 void MainWindow::handleTitleUpdated(const QString &title)
 {
     setWindowTitle(sSettings->value("window.title").toString().replace("title", title).replace("profile", tabBar->profile()->name()));