mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-03 12:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge 088a09fe78 into af2479da8d

Browse source
This commit is contained in:
outfoxxed 2025-03-30 23:52:53 +02:00 • committed by GitHub
commit b06e5f2112
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/gui/MainWindow.cpp
View file

@ -1539,29 +1539,57 @@ void MainWindow::updateTrayIcon()
if (config()->get(Config::GUI_ShowTrayIcon).toBool()) {
if (!m_trayIcon) {
m_trayIcon = new QSystemTrayIcon(this);
auto* menu = new QMenu(this);
auto* actionToggle = new QAction(tr("Toggle window"), menu);
menu->addAction(actionToggle);
actionToggle->setIcon(icons()->icon("keepassxc-monochrome-dark"));
menu->addAction(m_ui->actionLockAllDatabases);
#ifdef Q_OS_MACOS
auto actionQuit = new QAction(tr("Quit KeePassXC"), menu);
connect(actionQuit, SIGNAL(triggered()), SLOT(appExit()));
menu->addAction(actionQuit);
#else
menu->addAction(m_ui->actionQuit);
#endif
m_trayIcon->setContextMenu(menu);
connect(m_trayIcon,
SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
SLOT(trayIconTriggered(QSystemTrayIcon::ActivationReason)));
connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow()));
}
auto* menu = new QMenu(this);
auto* actionToggle = new QAction(tr("Toggle window"), menu);
menu->addAction(actionToggle);
actionToggle->setIcon(icons()->icon("keepassxc-monochrome-dark"));
connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow()));
if (m_ui->tabWidget->count() > 1) {
menu->addSeparator();
auto* databaseGroup = new QActionGroup(menu);
for (auto i = 0; i != m_ui->tabWidget->count(); ++i) {
const auto& tabName = m_ui->tabWidget->tabName(i);
auto* action = new QAction(tabName, menu);
action->setCheckable(true);
action->setChecked(i == m_ui->tabWidget->currentIndex());
action->setActionGroup(databaseGroup);
menu->addAction(action);
connect(action, &QAction::triggered, this, [this, i]() {
// This has to be checked as this connection will exist until
// the next updateTrayIcon regardless of the tab count.
if (i > m_ui->tabWidget->count())
return;
m_ui->tabWidget->setCurrentIndex(i);
});
}
menu->addSeparator();
}
menu->addAction(m_ui->actionLockAllDatabases);
#ifdef Q_OS_MACOS
auto actionQuit = new QAction(tr("Quit KeePassXC"), menu);
connect(actionQuit, SIGNAL(triggered()), SLOT(appExit()));
menu->addAction(actionQuit);
#else
menu->addAction(m_ui->actionQuit);
#endif
auto* oldContextMenu = m_trayIcon->contextMenu();
m_trayIcon->setContextMenu(menu);
delete oldContextMenu;
bool showUnlocked = m_ui->tabWidget->hasLockableDatabases();
m_trayIcon->setIcon(icons()->trayIcon(showUnlocked));
m_trayIcon->setToolTip(windowTitle().replace("[*]", isWindowModified() ? "*" : ""));
@ -1579,6 +1607,7 @@ void MainWindow::updateTrayIcon()
} else {
if (m_trayIcon) {
m_trayIcon->hide();
delete m_trayIcon->contextMenu();
delete m_trayIcon;
}
}