From 783621c89c6c4c9aeae1bcf907c4395b96c5babd Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Thu, 14 Dec 2017 11:51:51 +0100
Subject: Cleaned up UrlLineEdit

---
 src/mainwindow.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f48de70..4d3870c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -41,13 +41,15 @@
 #include "browser.h"
 #include <settings/settingsdialog.h>
 
+#include <navigation/urllineedit.h>
+
 MainWindow::MainWindow(std::shared_ptr<Configuration> config, QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     navigationToolBar(new QToolBar(tr("Navigation"), this)),
     tabToolBar(new QToolBar(tr("Tab bar"), this)),
     tabBar(new WebViewTabBar(nullptr, this)),
-    m_addressBar(new AddressBar(navigationToolBar)),
+    m_addressBar(new UrlLineEdit(navigationToolBar)),
     m_progressBar(new LoadingBar(this))
 {
     Q_ASSERT(config);
@@ -109,14 +111,14 @@ MainWindow::MainWindow(std::shared_ptr<Configuration> config, QWidget *parent) :
     this->addToolBar(Qt::TopToolBarArea, navigationToolBar);
 
     // connect signals
-    connect(m_addressBar, &AddressBar::addressEntered, this, [&](const QUrl &url) {
+    connect(m_addressBar, &UrlLineEdit::addressEntered, this, [&](const QUrl &url) {
         tabBar->currentView()->load(url);
     });
-    connect(m_addressBar, &AddressBar::searchTermEntered, this, [&](const QString &string) {
-        QString term = string.mid(1);
-        term.replace(' ', '+');
-        //tabBar->currentView()->load(QUrl::fromUserInput(browser->settings()->value("general.search").toString().replace("$term", term)));
-    });
+//    connect(m_addressBar, &AddressBar::searchTermEntered, this, [&](const QString &string) {
+//        QString term = string.mid(1);
+//        term.replace(' ', '+');
+//        //tabBar->currentView()->load(QUrl::fromUserInput(browser->settings()->value("general.search").toString().replace("$term", term)));
+//    });
     connect(tabBar, SIGNAL(currentTabChanged(WebView*)), this, SLOT(handleTabChanged(WebView*)));
 
     // loading bar
@@ -285,7 +287,11 @@ void MainWindow::handleTabChanged(WebView *view)
     m_backButton->setView(view);
     m_forwardButton->setView(view);
     m_reloadButton->setView(view);
-    m_addressBar->setWebView(view);
+
+    connect(view, &WebView::urlChanged, m_addressBar, &UrlLineEdit::setUrl);
+    m_addressBar->setUrl(view->url());
+    m_addressBar->pageAction()->setMenu(view->menu());
+
     connect(view, SIGNAL(titleChanged(QString)), this, SLOT(handleTitleUpdated(QString)));
     connect(view, SIGNAL(linkHovered(QString)), ui->statusBar, SLOT(showMessage(QString)));
 
-- 
cgit v1.2.1