aboutsummaryrefslogtreecommitdiff
path: root/src/mainwindow/menubar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainwindow/menubar.cpp')
-rw-r--r--src/mainwindow/menubar.cpp92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/mainwindow/menubar.cpp b/src/mainwindow/menubar.cpp
index f8979de..5fc039a 100644
--- a/src/mainwindow/menubar.cpp
+++ b/src/mainwindow/menubar.cpp
@@ -87,37 +87,37 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
conf.shortcut<QAction>(*actionDownloads, "shortcuts.window.downloads.show");
window->addSeparator();
- auto *actionNewWindow = window->addAction(tr("New Window"), browser, [browser]() {
- const Session::MainWindow window;
- browser->open({ window }, false);
- });
- conf.shortcut<QAction>(*actionNewWindow, "shortcuts.window.newwindow");
+ auto *actionNewWindow = window->addAction(tr("New Window"), browser, [browser]() {
+ const Session::MainWindow window_data;
+ browser->open({ window_data }, false);
+ });
+ conf.shortcut<QAction>(*actionNewWindow, "shortcuts.window.newwindow");
- auto *actionNewSubwindow = window->addAction(tr("New Subwindow"), parent, [parent]() {
- const Session::SubWindow session;
- parent->createSubWindow(session);
- });
- conf.shortcut<QAction>(*actionNewSubwindow, "shortcuts.window.newgroup");
+ auto *actionNewSubwindow = window->addAction(tr("New Subwindow"), parent, [parent]() {
+ const Session::SubWindow session;
+ parent->createSubWindow(session);
+ });
+ conf.shortcut<QAction>(*actionNewSubwindow, "shortcuts.window.newgroup");
- auto *actionCloseSubwindow = window->addAction(tr("Close Subwindow"), parent, [parent]() {
- parent->currentSubWindow()->close();
- });
- conf.shortcut<QAction>(*actionCloseSubwindow, "shortcuts.subwindow.close");
+ auto *actionCloseSubwindow = window->addAction(tr("Close Subwindow"), parent, [parent]() {
+ parent->currentSubWindow()->close();
+ });
+ conf.shortcut<QAction>(*actionCloseSubwindow, "shortcuts.subwindow.close");
- window->addSeparator()->setText(tr("Toolbars"));
+ window->addSeparator()->setText(tr("Toolbars"));
- bool hasMovableToolbar = false;
+ bool hasMovableToolbar = false;
- for(auto *toolbar : parent->findChildren<QToolBar *>()) {
- auto *action = window->addAction(toolbar->windowTitle());
- action->setCheckable(true);
- action->setChecked(toolbar->isVisible());
- connect(toolbar, &QToolBar::visibilityChanged, action, &QAction::setChecked);
- connect(action, &QAction::triggered, toolbar, &QToolBar::setVisible);
- conf.shortcut<QAction>(*action, qUtf8Printable(toolbar->objectName() + ".show"));
+ for(auto *toolbar : parent->findChildren<QToolBar *>()) {
+ auto *action = window->addAction(toolbar->windowTitle());
+ action->setCheckable(true);
+ action->setChecked(toolbar->isVisible());
+ connect(toolbar, &QToolBar::visibilityChanged, action, &QAction::setChecked);
+ connect(action, &QAction::triggered, toolbar, &QToolBar::setVisible);
+ conf.shortcut<QAction>(*action, qUtf8Printable(toolbar->objectName() + ".show"));
- if(toolbar->isMovable())
- hasMovableToolbar = true;
+ if(toolbar->isMovable())
+ hasMovableToolbar = true;
}
auto *lockAction = window->addAction(tr("Unlock toolbars"));
@@ -169,27 +169,27 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
auto *actionLockClose = subwindow->addAction(tr("Prevent tab from closing"), parent, [parent](bool checked) {
run_if(parent->currentSubWindow(), [checked](SubWindow *_subwindow, int currentIdx) {
- auto data = _subwindow->tabData(currentIdx);
- data.closeLocked = checked;
- _subwindow->setTabData(data, currentIdx);
+ auto tab_data = _subwindow->tabData(currentIdx);
+ tab_data.closeLocked = checked;
+ _subwindow->setTabData(tab_data, currentIdx);
});
});
actionLockClose->setCheckable(true);
auto *actionLockRefresh = subwindow->addAction(tr("Prevent tab from refreshing"), parent, [parent](bool checked) {
run_if(parent->currentSubWindow(), [checked](SubWindow *_subwindow, int currentIdx) {
- auto data = _subwindow->tabData(currentIdx);
- data.refreshLocked = checked;
- _subwindow->setTabData(data, currentIdx);
+ auto tab_data = _subwindow->tabData(currentIdx);
+ tab_data.refreshLocked = checked;
+ _subwindow->setTabData(tab_data, currentIdx);
});
});
actionLockRefresh->setCheckable(true);
connect(subwindow, &QMenu::aboutToShow, subwindow, [=]() {
run_if(parent->currentSubWindow(), [=](SubWindow *_subwindow, int currentIdx) {
- auto data = _subwindow->tabData(currentIdx);
- actionLockClose->setChecked(data.closeLocked);
- actionLockRefresh->setChecked(data.refreshLocked);
+ auto tab_data = _subwindow->tabData(currentIdx);
+ actionLockClose->setChecked(tab_data.closeLocked);
+ actionLockRefresh->setChecked(tab_data.refreshLocked);
});
});
@@ -235,8 +235,8 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
subwindow->addAction(tr("Close tabs to the left"), parent, [parent]() {
run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
for(int i = currentIdx - 1; i >= 0; i--) {
- const auto data = _subwindow->tabData(i);
- if(!data.closeLocked)
+ const auto tab_data = _subwindow->tabData(i);
+ if(!tab_data.closeLocked)
_subwindow->closeTab(i);
}
});
@@ -244,8 +244,8 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
subwindow->addAction(tr("Close tabs to the right"), parent, [parent]() {
run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
for(int i = _subwindow->tabCount() - 1; i > currentIdx; i--) {
- const auto data = _subwindow->tabData(i);
- if(!data.closeLocked)
+ const auto tab_data = _subwindow->tabData(i);
+ if(!tab_data.closeLocked)
_subwindow->closeTab(i);
}
});
@@ -254,8 +254,8 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
for(int i = _subwindow->tabCount() - 1; i >= 0; i--) {
if(i != currentIdx) {
- const auto data = _subwindow->tabData(i);
- if(!data.closeLocked)
+ const auto tab_data = _subwindow->tabData(i);
+ if(!tab_data.closeLocked)
_subwindow->closeTab(i);
}
}
@@ -267,8 +267,8 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
subwindow->addAction(tr("Refresh tabs to the left"), parent, [parent]() {
run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
for(int i = 0; i < currentIdx; i++) {
- const auto data = _subwindow->tabData(i);
- if(!data.refreshLocked)
+ const auto tab_data = _subwindow->tabData(i);
+ if(!tab_data.refreshLocked)
_subwindow->view(i)->triggerPageAction(QWebEnginePage::Reload);
}
});
@@ -276,8 +276,8 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
subwindow->addAction(tr("Refresh tabs to the right"), parent, [parent]() {
run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
for(int i = currentIdx + 1; i < _subwindow->tabCount(); i++) {
- const auto data = _subwindow->tabData(i);
- if(!data.refreshLocked)
+ const auto tab_data = _subwindow->tabData(i);
+ if(!tab_data.refreshLocked)
_subwindow->view(i)->triggerPageAction(QWebEnginePage::Reload);
}
});
@@ -286,8 +286,8 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
for(int i = 0; i < _subwindow->tabCount(); i++) {
if(i != currentIdx) {
- const auto data = _subwindow->tabData(i);
- if(!data.refreshLocked)
+ const auto tab_data = _subwindow->tabData(i);
+ if(!tab_data.refreshLocked)
_subwindow->view(i)->triggerPageAction(QWebEnginePage::Reload);
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-20 11:37:17 +0000