From c114e8df178f19064c0b90ae162f062b25668fff Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 10 Sep 2017 22:59:47 +0200 Subject: Back/Forward NavigationButton class --- src/lib/navigation/navigation.qbs | 2 + src/lib/navigation/navigationbutton.cpp | 110 ++++++++++++++++++++++++++++++++ src/lib/navigation/navigationbutton.h | 58 +++++++++++++++++ src/mainwindow.cpp | 39 ++--------- src/mainwindow.h | 5 ++ 5 files changed, 180 insertions(+), 34 deletions(-) create mode 100644 src/lib/navigation/navigationbutton.cpp create mode 100644 src/lib/navigation/navigationbutton.h (limited to 'src') diff --git a/src/lib/navigation/navigation.qbs b/src/lib/navigation/navigation.qbs index 7ffb3ee..ebe2713 100644 --- a/src/lib/navigation/navigation.qbs +++ b/src/lib/navigation/navigation.qbs @@ -18,6 +18,8 @@ Project { files: [ "addressbar.cpp", "addressbar.h", + "navigationbutton.cpp", + "navigationbutton.h", "urllineedit.cpp", "urllineedit.h", ] diff --git a/src/lib/navigation/navigationbutton.cpp b/src/lib/navigation/navigationbutton.cpp new file mode 100644 index 0000000..7065535 --- /dev/null +++ b/src/lib/navigation/navigationbutton.cpp @@ -0,0 +1,110 @@ +/******************************************************************************* + ** + ** smolbote: yet another qute browser + ** Copyright (C) 2017 Xian Nox + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** This program is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ** + ******************************************************************************/ + +#include "navigationbutton.h" + +#include +#include +#include + +NavigationButton::NavigationButton(Type type, QWidget *parent) : + QToolButton(parent) +{ + m_type = type; + menu = new QMenu(this); + + switch (type) { + case BackButton: + setIcon(style()->standardIcon(QStyle::SP_ArrowBack)); + setMenu(menu); + break; + case ForwardButton: + setIcon(style()->standardIcon(QStyle::SP_ArrowForward)); + setMenu(menu); + break; + } + + connect(this, &NavigationButton::clicked, this, &NavigationButton::doAction); + connect(menu, &QMenu::aboutToShow, this, &NavigationButton::prepareMenu); +} + + +void NavigationButton::setView(const WebView *view) +{ + disconnect(loadFinishedConnection); + + m_view = view; + updateEnableState(); + loadFinishedConnection = connect(view, &WebView::loadFinished, this, &NavigationButton::updateEnableState); +} + +void NavigationButton::updateEnableState() +{ + switch (m_type) { + case BackButton: + if(m_view->history()->canGoBack()) { + setEnabled(true); + } else { + setEnabled(false); + } + break; + case ForwardButton: + if(m_view->history()->canGoForward()) { + setEnabled(true); + } else { + setEnabled(false); + } + break; + } +} + +void NavigationButton::doAction() +{ + switch (m_type) { + case BackButton: + m_view->history()->back(); + break; + case ForwardButton: + m_view->history()->forward(); + break; + } +} + +void NavigationButton::prepareMenu() +{ + menu->clear(); + + QList items; + switch (m_type) { + case BackButton: + items = m_view->history()->backItems(10); + break; + case ForwardButton: + items = m_view->history()->forwardItems(10); + break; + } + + for(QWebEngineHistoryItem i : items) { + QAction *a = menu->addAction(i.title()); + connect(a, &QAction::triggered, [i, this]() { + m_view->history()->goToItem(i); + }); + } +} diff --git a/src/lib/navigation/navigationbutton.h b/src/lib/navigation/navigationbutton.h new file mode 100644 index 0000000..44e3ceb --- /dev/null +++ b/src/lib/navigation/navigationbutton.h @@ -0,0 +1,58 @@ +/******************************************************************************* + ** + ** smolbote: yet another qute browser + ** Copyright (C) 2017 Xian Nox + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** This program is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ** + ******************************************************************************/ + +#ifndef NAVIGATIONBUTTON_H +#define NAVIGATIONBUTTON_H + +#include +#include + +class QMenu; + +class NavigationButton : public QToolButton +{ + Q_OBJECT +public: + + enum Type { + BackButton, + ForwardButton + }; + + explicit NavigationButton(Type type, QWidget *parent = nullptr); + + void setView(const WebView *view); + +signals: + +private slots: + void updateEnableState(); + void doAction(); + void prepareMenu(); + +private: + Type m_type; + QMenu *menu; + const WebView *m_view; + + QMetaObject::Connection loadFinishedConnection; +}; + +#endif // NAVIGATIONBUTTON_H diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index cb29e64..68afa40 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -76,40 +76,9 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) : navigationToolBar->setMovable(sSettings->value("window.ui.navtoolbarMovable").toBool()); // page actions - QToolButton *backButton = new QToolButton(this); - backButton->setIcon(style()->standardIcon(QStyle::SP_ArrowBack)); - connect(backButton, SIGNAL(clicked()), tabBar->signalMapper(), SLOT(map())); - tabBar->signalMapper()->setMapping(backButton, WebViewTabBar::Back); - - QMenu *backMenu = new QMenu(this); - connect(backMenu, &QMenu::aboutToShow, [backMenu, this]() { - backMenu->clear(); - for(QWebEngineHistoryItem i : m_currentView->history()->backItems(10)) { - QAction *a = backMenu->addAction(i.title()); - connect(a, &QAction::triggered, [i, this]() { - m_currentView->history()->goToItem(i); - }); - } - }); - backButton->setMenu(backMenu); - - QToolButton *forwardButton = new QToolButton(this); - forwardButton->setIcon(style()->standardIcon(QStyle::SP_ArrowForward)); - connect(forwardButton, SIGNAL(clicked()), tabBar->signalMapper(), SLOT(map())); - tabBar->signalMapper()->setMapping(forwardButton, WebViewTabBar::Forward); - - - QMenu *forwardMenu = new QMenu(this); - connect(forwardMenu, &QMenu::aboutToShow, [forwardMenu, this]() { - forwardMenu->clear(); - for(QWebEngineHistoryItem i : m_currentView->history()->forwardItems(10)) { - QAction *a = forwardMenu->addAction(i.title()); - connect(a, &QAction::triggered, [i, this]() { - m_currentView->history()->goToItem(i); - }); - } - }); - forwardButton->setMenu(forwardMenu); + backButton = new NavigationButton(NavigationButton::BackButton, this); + + forwardButton = new NavigationButton(NavigationButton::ForwardButton, this); QToolButton *reloadButton = new QToolButton(this); reloadButton->setIcon(style()->standardIcon(QStyle::SP_BrowserReload)); @@ -270,6 +239,8 @@ void MainWindow::handleTabChanged(WebView *view) setCentralWidget(view); // connect signals + backButton->setView(view); + forwardButton->setView(view); m_addressBar->setWebView(view); connect(view, SIGNAL(titleChanged(QString)), this, SLOT(handleTitleUpdated(QString))); connect(view, SIGNAL(linkHovered(QString)), ui->statusBar, SLOT(showMessage(QString))); diff --git a/src/mainwindow.h b/src/mainwindow.h index cf0bac5..50483d2 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -32,6 +32,8 @@ #include "filter/blockermanager.h" #include "widgets/loadingbar.h" +#include "navigation/navigationbutton.h" + namespace Ui { class MainWindow; } @@ -70,6 +72,9 @@ private: QToolBar *navigationToolBar, *tabToolBar; WebViewTabBar *tabBar; WebView *m_currentView; + + // navigation + NavigationButton *backButton, *forwardButton; AddressBar *m_addressBar; LoadingBar *m_progressBar; }; -- cgit v1.2.1