Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add database selection to tray menu #11692

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+45 −16
Open

Add database selection to tray menu #11692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 45 additions & 16 deletions src/gui/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,28 +1500,56 @@ 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"));
connect(m_trayIcon,
SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
SLOT(trayIconTriggered(QSystemTrayIcon::ActivationReason)));
}

menu->addAction(m_ui->actionLockAllDatabases);
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);
auto actionQuit = new QAction(tr("Quit KeePassXC"), menu);
connect(actionQuit, SIGNAL(triggered()), SLOT(appExit()));
menu->addAction(actionQuit);
#else
menu->addAction(m_ui->actionQuit);
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* oldContextMenu = m_trayIcon->contextMenu();
m_trayIcon->setContextMenu(menu);
delete oldContextMenu;

bool showUnlocked = m_ui->tabWidget->hasLockableDatabases();
m_trayIcon->setIcon(icons()->trayIcon(showUnlocked));
Expand All @@ -1540,6 +1568,7 @@ void MainWindow::updateTrayIcon()
} else {
if (m_trayIcon) {
m_trayIcon->hide();
delete m_trayIcon->contextMenu();
delete m_trayIcon;
}
}
Expand Down