zealdocs/zeal
1
1
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2024-12-18 08:51:44 +03:00
Code Issues Projects Releases Wiki Activity

Fixes menu keyboard shortcuts (#172)

Browse Source
This commit is contained in:
Jerzy Kozera 2014-08-25 22:56:56 +02:00
parent 6f186fa7b4
commit a34a2f7d57
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zeal/mainwindow.cpp
View File

@ -133,6 +133,7 @@ MainWindow::MainWindow(QWidget *parent) :
// menu // menu
ui->action_Quit->setShortcut(QKeySequence::Quit); ui->action_Quit->setShortcut(QKeySequence::Quit);
addAction(ui->action_Quit);
connect(ui->action_Quit, &QAction::triggered, [=]() { settings.setValue("geometry", saveGeometry()); }); connect(ui->action_Quit, &QAction::triggered, [=]() { settings.setValue("geometry", saveGeometry()); });
connect(ui->action_Quit, SIGNAL(triggered()), qApp, SLOT(quit())); connect(ui->action_Quit, SIGNAL(triggered()), qApp, SLOT(quit()));
@ -161,7 +162,9 @@ MainWindow::MainWindow(QWidget *parent) :
}); });
ui->action_Back->setShortcut(QKeySequence::Back); ui->action_Back->setShortcut(QKeySequence::Back);
addAction(ui->action_Back);
ui->action_Forward->setShortcut(QKeySequence::Forward); ui->action_Forward->setShortcut(QKeySequence::Forward);
addAction(ui->action_Forward);
connect(ui->action_Back, &QAction::triggered, this, &MainWindow::back); connect(ui->action_Back, &QAction::triggered, this, &MainWindow::back);
connect(ui->action_Forward, &QAction::triggered, this, &MainWindow::forward); connect(ui->action_Forward, &QAction::triggered, this, &MainWindow::forward);
@ -250,6 +253,7 @@ MainWindow::MainWindow(QWidget *parent) :
ui->forwardButton->setMenu(&forwardMenu); ui->forwardButton->setMenu(&forwardMenu);
ui->action_NewTab->setShortcut(QKeySequence::AddTab); ui->action_NewTab->setShortcut(QKeySequence::AddTab);
addAction(ui->action_NewTab);
connect(ui->action_NewTab, &QAction::triggered, [&]() { connect(ui->action_NewTab, &QAction::triggered, [&]() {
saveTabState(); saveTabState();
createTab(); createTab();
@ -271,6 +275,7 @@ MainWindow::MainWindow(QWidget *parent) :
#else #else
ui->action_CloseTab->setShortcut(QKeySequence::Close); ui->action_CloseTab->setShortcut(QKeySequence::Close);
#endif #endif
addAction(ui->action_CloseTab);
connect(ui->action_CloseTab, &QAction::triggered, [&]() { connect(ui->action_CloseTab, &QAction::triggered, [&]() {
closeTab(-1); closeTab(-1);
}); });
@ -294,11 +299,13 @@ MainWindow::MainWindow(QWidget *parent) :
}); });
ui->action_NextTab->setShortcut(QKeySequence::NextChild); ui->action_NextTab->setShortcut(QKeySequence::NextChild);
addAction(ui->action_NextTab);
connect(ui->action_NextTab, &QAction::triggered, [&]() { connect(ui->action_NextTab, &QAction::triggered, [&]() {
tabBar.setCurrentIndex((tabBar.currentIndex() + 1) % tabBar.count()); tabBar.setCurrentIndex((tabBar.currentIndex() + 1) % tabBar.count());
}); });
ui->action_PreviousTab->setShortcut(QKeySequence::PreviousChild); ui->action_PreviousTab->setShortcut(QKeySequence::PreviousChild);
addAction(ui->action_PreviousTab);
connect(ui->action_PreviousTab, &QAction::triggered, [&]() { connect(ui->action_PreviousTab, &QAction::triggered, [&]() {
tabBar.setCurrentIndex((tabBar.currentIndex() - 1 + tabBar.count()) % tabBar.count()); tabBar.setCurrentIndex((tabBar.currentIndex() - 1 + tabBar.count()) % tabBar.count());
}); });
@ -419,6 +426,13 @@ void MainWindow::displayTabs()
action->setChecked(i == tabBar.currentIndex()); action->setChecked(i == tabBar.currentIndex());
if (i < 10) { if (i < 10) {
QString shortcut = QString("Ctrl+%1").arg(QString::number(i+1)); QString shortcut = QString("Ctrl+%1").arg(QString::number(i+1));
auto actions_ = actions();
for (int i = 0; i < actions_.length(); ++i) {
if (actions_[i]->shortcut().toString() == shortcut) {
removeAction(actions_[i]);
}
}
addAction(action);
action->setShortcut(QKeySequence(shortcut)); action->setShortcut(QKeySequence(shortcut));
} }