Show GUI lock icon after system tray icon is initialized

This commit is contained in:
Chocobo1 2021-12-14 14:38:31 +08:00
parent 85777ea491
commit cca93c2be2
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 10 additions and 3 deletions

View File

@ -177,6 +177,10 @@ MainWindow::MainWindow(QWidget *parent)
lockMenu->addAction(tr("&Set Password"), this, &MainWindow::defineUILockPassword);
lockMenu->addAction(tr("&Clear Password"), this, &MainWindow::clearUILockPassword);
m_ui->actionLock->setMenu(lockMenu);
connect(this, &MainWindow::systemTrayIconCreated, this, [this]()
{
m_ui->actionLock->setVisible(true);
});
// Creating Bittorrent session
updateAltSpeedsBtn(BitTorrent::Session::instance()->isAltGlobalSpeedLimitEnabled());
@ -1484,9 +1488,7 @@ void MainWindow::loadPreferences()
#ifndef Q_OS_MACOS
// system tray icon
const bool useSystray = pref->systemTrayEnabled();
m_ui->actionLock->setVisible(useSystray);
if (useSystray)
if (pref->systemTrayEnabled())
{
if (m_systrayIcon)
{
@ -1502,6 +1504,7 @@ void MainWindow::loadPreferences()
{
delete m_systrayIcon;
delete m_trayIconMenu;
m_ui->actionLock->setVisible(false);
}
#endif
@ -1713,6 +1716,7 @@ void MainWindow::createTrayIcon(const int retries)
connect(m_systrayIcon, &QSystemTrayIcon::messageClicked, this, &MainWindow::balloonClicked);
m_systrayIcon->show();
emit systemTrayIconCreated();
}
else
{

View File

@ -108,6 +108,9 @@ public:
void showNotificationBalloon(const QString &title, const QString &msg) const;
signals:
void systemTrayIconCreated();
private slots:
void showFilterContextMenu(const QPoint &);
void balloonClicked();