diff options
Diffstat (limited to 'src/mainwindow/menubar.cpp')
| -rw-r--r-- | src/mainwindow/menubar.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/mainwindow/menubar.cpp b/src/mainwindow/menubar.cpp index 54ba102..76e08c6 100644 --- a/src/mainwindow/menubar.cpp +++ b/src/mainwindow/menubar.cpp @@ -12,10 +12,10 @@ #include "configuration.h" #include "downloadswidget.h" #include "mainwindow.h" -#include "webengine/webprofilemanager.h" #include "session/savesessiondialog.h" #include "session/sessiondialog.h" #include "subwindow/subwindow.h" +#include "webengine/webprofilemanager.h" #include "webengine/webview.h" #include "widgets/menusearch.h" #include <QApplication> @@ -26,11 +26,11 @@ #include <QPrintDialog> #include <QPrinter> #include <QPrinterInfo> +#include <QVBoxLayout> #include <QWidgetAction> #include <functional> -#include <QVBoxLayout> -inline void run_if(SubWindow *_subwindow, const std::function<void(SubWindow*, int)> &f) +inline void run_if(SubWindow *_subwindow, const std::function<void(SubWindow *, int)> &f) { if(_subwindow != nullptr) f(_subwindow, _subwindow->currentTabIndex()); @@ -292,7 +292,7 @@ MenuBar::MenuBar(MainWindow *parent) }); subwindow->addAction(tr("Close all other tabs"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { - for(int i = _subwindow->tabCount() -1; i >= 0; i--) { + for(int i = _subwindow->tabCount() - 1; i >= 0; i--) { if(i != currentIdx) { const auto data = _subwindow->tabData(i); if(!data.closeLocked) @@ -342,9 +342,11 @@ MenuBar::MenuBar(MainWindow *parent) auto *_subwindow = parent->currentSubWindow(); if(_subwindow != nullptr) { - browser->getProfileManager()->profileMenu(subwindowProfile, [_subwindow](WebProfile *profile) { - _subwindow->setProfile(profile); - }, _subwindow->profile(), true); + profileMenu( + subwindowProfile, [_subwindow](WebProfile *profile) { + _subwindow->setProfile(profile); + }, + _subwindow->profile(), true); } }); } @@ -389,9 +391,11 @@ MenuBar::MenuBar(MainWindow *parent) pageProfile->clear(); if(parent->currentView != nullptr) { - browser->getProfileManager()->profileMenu(pageProfile, [parent](WebProfile *profile) { - parent->currentView->setProfile(profile); - }, parent->currentView->profile(), true); + profileMenu( + pageProfile, [parent](WebProfile *profile) { + parent->currentView->setProfile(profile); + }, + parent->currentView->profile(), true); } }); |