Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 16:17:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Merge remote-tracking branch 'origin/devel' into release/trift.

Browse Source
This commit is contained in:
Romain LE JEUNE
2023-07-04 08:24:25 +02:00
parent a3b26431ce b2eb35592f
commit 62f6db35db
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/bridge-gui/bridge-gui/TrayIcon.cpp
View File

@ -381,7 +381,7 @@ void TrayIcon::refreshContextMenu() {
app().backend().showHelp("tray menu 'Help' clicked"); app().backend().showHelp("tray menu 'Help' clicked");
}); });
menu_->addAction(tr("&Settings"), onMac ? QKeySequence("Ctrl+,") : noShortcut, []() { menu_->addAction(tr("&Settings"), onMac ? QKeySequence("Ctrl+,") : noShortcut, []() {
app().backend().showHelp("tray menu 'Settings' clicked"); app().backend().showSettings("tray menu 'Settings' clicked");
}); });
menu_->addSeparator(); menu_->addSeparator();
menu_->addAction(tr("&Quit Bridge"), onMac ? QKeySequence("Ctrl+Q") : noShortcut, &app().backend(), &QMLBackend::quit); menu_->addAction(tr("&Quit Bridge"), onMac ? QKeySequence("Ctrl+Q") : noShortcut, &app().backend(), &QMLBackend::quit);