From 8aa707cfe56604f95c6d5c75e146b70a5272cc5d Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 11 Jul 2018 14:39:08 +0200 Subject: Remove PageToolsMenu --- src/webengine/webview.cpp | 4 +-- src/webengine/webview.h | 9 ----- src/webengine/widgets/pagetoolsmenu.cpp | 62 --------------------------------- src/webengine/widgets/pagetoolsmenu.h | 32 ----------------- 4 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 src/webengine/widgets/pagetoolsmenu.cpp delete mode 100644 src/webengine/widgets/pagetoolsmenu.h (limited to 'src/webengine') diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp index a234f3a..8ae7eeb 100644 --- a/src/webengine/webview.cpp +++ b/src/webengine/webview.cpp @@ -10,7 +10,6 @@ #include "mainwindow/subwindow.h" #include "webpage.h" #include "webprofile.h" -#include "widgets/pagetoolsmenu.h" #include #include #include @@ -21,6 +20,7 @@ #include #include #include "profilemanager.h" +#include inline QAction *historyAction(QWebEngineView *view, const QWebEngineHistoryItem &item) { @@ -60,8 +60,6 @@ WebView::WebView(WebProfile *profile, QWidget *parent) } }); #endif - - m_toolsMenu = new PageToolsMenu(this); } void WebView::setProfile(WebProfile *profile) diff --git a/src/webengine/webview.h b/src/webengine/webview.h index 2d07244..7026610 100644 --- a/src/webengine/webview.h +++ b/src/webengine/webview.h @@ -12,7 +12,6 @@ #include "webpage.h" #include -class QMenu; class WebProfile; class SubWindow; class WebView : public QWebEngineView @@ -27,12 +26,6 @@ public: explicit WebView(WebProfile *profile = nullptr, QWidget *parent = nullptr); ~WebView() = default; - QMenu *toolsMenu() - { - Q_CHECK_PTR(m_toolsMenu); - return m_toolsMenu; - } - WebProfile *profile() { return m_profile; @@ -57,8 +50,6 @@ private: SubWindow *m_parentWindow = nullptr; WebProfile *m_profile = nullptr; - QMenu *m_toolsMenu = nullptr; - bool m_loaded; }; diff --git a/src/webengine/widgets/pagetoolsmenu.cpp b/src/webengine/widgets/pagetoolsmenu.cpp deleted file mode 100644 index 6e48798..0000000 --- a/src/webengine/widgets/pagetoolsmenu.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file is part of smolbote. It's copyrighted by the contributors recorded - * in the version control history of the file, available from its original - * location: https://neueland.iserlohn-fortress.net/smolbote.hg - * - * SPDX-License-Identifier: GPL-3.0 - */ - -#include "pagetoolsmenu.h" -#include "../webview.h" -#include -#include -#include -#include -#include -#include - -PageToolsMenu::PageToolsMenu(WebView *parent) - : QMenu(tr("Tools"), parent) -{ - Q_CHECK_PTR(parent); - parentView = parent; - - connect(this, &QMenu::aboutToShow, this, &PageToolsMenu::createEntries); -} - -void PageToolsMenu::createEntries() -{ - clear(); - - auto *scriptsMenu = new QMenu(tr("Injected Scripts"), this); - for(const auto &script : parentView->page()->scripts().toList()) { - scriptsMenu->addAction(script.name())->setEnabled(false); - } - addMenu(scriptsMenu); - - auto *devToolsAction = addAction(tr("Developer Tools")); - connect(devToolsAction, &QAction::triggered, this, [this]() { - createDevToolsDialog(parentView->page())->show(); - }); -} - -QDialog *PageToolsMenu::createDevToolsDialog(QWebEnginePage *page) -{ - Q_CHECK_PTR(page); - - auto *popup = new QDialog(nullptr); - popup->setWindowTitle(tr("Developer Tools")); - popup->setAttribute(Qt::WA_DeleteOnClose, true); - - auto *view = new QWebEngineView(popup); - auto *devPage = new QWebEnginePage(view); - - view->setPage(devPage); - // page->setDevToolsPage(devPage); - - auto *l = new QVBoxLayout(popup); - l->setContentsMargins(0, 0, 0, 0); - l->addWidget(view); - - return popup; -} diff --git a/src/webengine/widgets/pagetoolsmenu.h b/src/webengine/widgets/pagetoolsmenu.h deleted file mode 100644 index f234d0e..0000000 --- a/src/webengine/widgets/pagetoolsmenu.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of smolbote. It's copyrighted by the contributors recorded - * in the version control history of the file, available from its original - * location: https://neueland.iserlohn-fortress.net/smolbote.hg - * - * SPDX-License-Identifier: GPL-3.0 - */ - -#ifndef SMOLBOTE_PAGETOOLSMENU_H -#define SMOLBOTE_PAGETOOLSMENU_H - -#include - -class WebView; -class QDialog; -class QWebEnginePage; -class PageToolsMenu : public QMenu -{ - Q_OBJECT -public: - explicit PageToolsMenu(WebView *parent = nullptr); - -public slots: - void createEntries(); - -private: - QDialog *createDevToolsDialog(QWebEnginePage *page); - - WebView *parentView; -}; - -#endif //SMOLBOTE_PAGETOOLSMENU_H -- cgit v1.2.1