From 2a696a57abafb25978aef1af5758fe75b706d1f0 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 16 Jan 2019 16:52:07 +0100 Subject: Rewrite lib/web to lib/webprofile - libweb was supposed to be a general QtWebEngine wrapper, but only turned out to do profiles and profile management. The new name should make this more obvious. - Renamed ProfileManager to WebProfileManager, and cut out duplicate code. - Temporary profiles: temporary profiles are not kept after closing the browser. --- src/webengine/webview.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/webengine/webview.cpp') diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp index 3861306..5e350eb 100644 --- a/src/webengine/webview.cpp +++ b/src/webengine/webview.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "profilemanager.h" +#include "webprofilemanager.h" #include "webprofile.h" #include "browser.h" #include "wallet/wallet.h" @@ -247,15 +247,12 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) createWindow(QWebEnginePage::WebBrowserTab)->load(ctxdata.linkUrl()); }); - auto *profileManager = dynamic_cast(qApp)->getProfileManager(); - QMenu *newTabMenu = profileManager->createProfileMenu([this, ctxdata](WebProfile *profile) { + auto *newTabMenu = menu->addMenu(tr("Open link in new tab with profile")); + dynamic_cast(qApp)->getProfileManager()->profileMenu(newTabMenu, [this, ctxdata](WebProfile *profile) { auto *view = this->createWindow(QWebEnginePage::WebBrowserTab); view->setProfile(profile); view->load(ctxdata.linkUrl()); - }, - this); - newTabMenu->setTitle(tr("Open link in new tab with profile")); - menu->addMenu(newTabMenu); + }); connect(menu->addAction(tr("Open link in new window")), &QAction::triggered, this, [this, ctxdata]() { createWindow(QWebEnginePage::WebBrowserWindow)->load(ctxdata.linkUrl()); -- cgit v1.2.1