diff options
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8413b18..0369d17 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -36,10 +36,10 @@ MainWindow::MainWindow(Browser *instance, QUrl defaultUrl, QWidget *parent) : downloadManager(new DownloadDialog(this)), blocklistManager(new BlockerDialog(this)), ui(new Ui::MainWindow), - navigationToolBar(new QToolBar(this)), - tabToolBar(new QToolBar(this)), + navigationToolBar(new QToolBar(tr("Navigation"), this)), + tabToolBar(new QToolBar(tr("Tab bar"), this)), tabBar(new WebViewTabBar(this)), - urlLineEdit(new QLineEdit(navigationToolBar)) + urlLineEdit(new UrlLineEdit(navigationToolBar)) { browserInstance = instance; Settings settings; @@ -164,10 +164,12 @@ void MainWindow::handleTabChanged(QWebEngineView *view) centralWidget()->setParent(0); disconnect(centralWidget()); setCentralWidget(view); - connect(view, SIGNAL(urlChanged(QUrl)), this, SLOT(handleUrlUpdated(QUrl))); + connect(view, SIGNAL(urlChanged(QUrl)), urlLineEdit, SLOT(setUrl(QUrl))); connect(view, SIGNAL(titleChanged(QString)), this, SLOT(handleTitleUpdated(QString))); - this->handleUrlUpdated(view->url()); + urlLineEdit->setUrl(view->url()); this->handleTitleUpdated(view->title()); + + centralWidget()->setFocus(); } void MainWindow::handleUrlChanged() @@ -175,11 +177,6 @@ void MainWindow::handleUrlChanged() tabBar->currentView()->load(QUrl::fromUserInput(urlLineEdit->text())); } -void MainWindow::handleUrlUpdated(const QUrl &url) -{ - urlLineEdit->setText(url.toString()); -} - void MainWindow::handleTitleUpdated(const QString &title) { // For some reason, the long dash gets garbled if read from the settings |