1 files changed, 7 insertions, 20 deletions
diff --git a/src/rekonqwindow_class.cpp b/src/rekonqwindow_class.cpp
index cf721448..996e1b6f 100644
--- a/src/rekonqwindow_class.cpp
+++ b/src/rekonqwindow_class.cpp
@@ -34,6 +34,8 @@ RekonqWindow::RekonqWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::Re
   ui->bookmarksToolBar->setModel(Application::instance()->bookmarks());
   ui->menuBookmarks->setModel(Application::instance()->bookmarks());
 #endif
+  connect(ui->navigationToolBar, &NavigationToolBar::loadUrl, this,
+          qOverload<rekonq::DefaultUrl, rekonq::OpenType>(&RekonqWindow::loadUrl));
   connect(ui->bookmarksPanel, &BookmarksPanel::loadUrl, this,
           qOverload<const QUrl &, rekonq::OpenType>(&RekonqWindow::loadUrl));
   connect(ui->bookmarksToolBar, &BookmarkToolBar::loadUrl, this,
@@ -41,29 +43,17 @@ RekonqWindow::RekonqWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::Re
   connect(ui->menuBookmarks, &BookmarksMenu::loadUrl, this,
           qOverload<const QUrl &, rekonq::OpenType>(&RekonqWindow::loadUrl));
 
-  connect(ui->tabs, &TabBar::currentChanged, this, [this](RekonqView *view) {
+  // ::setCurrentView
+  connect(ui->tabToolBar, &TabToolBar::currentViewChanged, this, [this](RekonqView *view) {
     if (view == nullptr) { // last tab has been closed
       close();
       return;
     }
 
     ui->views->setCurrentWidget(view);
-    ui->urlBar->setCurrentView(view);
+    ui->navigationToolBar->setCurrentView(view);
   });
-  connect(ui->tabs, &TabBar::removeView, this, [this](RekonqView *view) { ui->views->removeWidget(view); });
-
-  connect(ui->back, &QToolButton::clicked, this, [this]() { currentView()->back(); });
-  connect(ui->forward, &QToolButton::clicked, this, [this]() { currentView()->forward(); });
-  connect(ui->refresh, &QToolButton::clicked, this, [this]() { currentView()->refresh(); });
-  connect(ui->home, &QToolButton::clicked, this, [this]() { loadUrl(rekonq::HomePage, rekonq::CurrentTab); });
-
-  auto *actionFocusUrlBar = new QAction(this);
-  actionFocusUrlBar->setShortcut({"F6"});
-  connect(actionFocusUrlBar, &QAction::triggered, this, [this]() {
-    ui->urlBar->setFocus();
-    ui->urlBar->selectAll();
-  });
-  addAction(actionFocusUrlBar);
+  connect(ui->tabToolBar, &TabToolBar::tabClosed, this, [this](RekonqView *view) { ui->views->removeWidget(view); });
 
   // connect menu actions
   // file menu
@@ -76,8 +66,7 @@ RekonqWindow::RekonqWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::Re
 #endif
   connect(ui->actionNewTab, &QAction::triggered, this,
           [this]() { loadUrl(rekonq::NewTabPage, rekonq::NewFocusedTab); });
-  connect(ui->actionCloseTab, &QAction::triggered, this,
-          [this]() { emit ui->tabs->tabCloseRequested(ui->tabs->currentIndex()); });
+  connect(ui->actionCloseTab, &QAction::triggered, ui->tabToolBar, &TabToolBar::closeCurrentTab);
   connect(ui->actionQuit, &QAction::triggered, qApp, &QApplication::quit);
   // edit menu
   // view menu
@@ -92,8 +81,6 @@ RekonqWindow::RekonqWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::Re
 #endif
   // help menu
   connect(ui->actionAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
-
-  connect(ui->newTab, &QToolButton::clicked, ui->actionNewTab, &QAction::trigger);
 }
 
 RekonqWindow::~RekonqWindow() { delete ui; }