Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: keepassxreboot/keepassxc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 281d61c40c247101201f51239976ba93fe927ca0
Choose a base ref
..
head repository: keepassxreboot/keepassxc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ea2b0e537908ba3fbd8b8bfcfb54612488a1536
Choose a head ref
Showing with 1 addition and 5 deletions.
  1. +1 −5 src/gui/MainWindow.cpp
6 changes: 1 addition & 5 deletions src/gui/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -1041,9 +1041,6 @@ void MainWindow::updateTrayIcon()
menu->addAction(actionToggle);
actionToggle->setIcon(filePath()->icon("apps", "keepassxc"));

QAction* actionShow = new QAction(tr("Show window"), menu);
menu->addAction(actionShow);

menu->addAction(m_ui->actionLockDatabases);

#ifdef Q_OS_MACOS
@@ -1054,12 +1051,11 @@ void MainWindow::updateTrayIcon()
#else
menu->addAction(m_ui->actionQuit);

#endif
connect(m_trayIcon,
SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
SLOT(trayIconTriggered(QSystemTrayIcon::ActivationReason)));
#endif
connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow()));
connect(actionShow, SIGNAL(triggered()), SLOT(bringToFront()));

m_trayIcon->setContextMenu(menu);