github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-10 15:32:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify tray icon related code

Browse source
This commit is contained in:
Chocobo1 2021-12-13 15:56:20 +08:00
parent b8a84dbd83
commit 85777ea491
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
8 changed files with 125 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gui/optionsdialog.cpp
View file

@ -677,7 +677,7 @@ void OptionsDialog::saveOptions()
pref->setHideZeroValues(m_ui->checkHideZero->isChecked());
pref->setHideZeroComboValues(m_ui->comboHideZero->currentIndex());
#ifndef Q_OS_MACOS
pref->setSystrayIntegration(systrayIntegration());
pref->setSystemTrayEnabled(systemTrayEnabled());
pref->setTrayIconStyle(TrayIcon::Style(m_ui->comboTrayIcon->currentIndex()));
pref->setCloseToTray(closeToTray());
pref->setMinimizeToTray(minimizeToTray());
@ -936,7 +936,7 @@ void OptionsDialog::loadOptions()
m_ui->checkProgramAutoExitConfirm->setChecked(!pref->dontConfirmAutoExit());
#ifndef Q_OS_MACOS
m_ui->checkShowSystray->setChecked(pref->systrayIntegration());
m_ui->checkShowSystray->setChecked(pref->systemTrayEnabled());
if (m_ui->checkShowSystray->isChecked())
{
m_ui->checkMinimizeToSysTray->setChecked(pref->minimizeToTray());
@ -1346,10 +1346,11 @@ bool OptionsDialog::startMinimized() const
}
#ifndef Q_OS_MACOS
bool OptionsDialog::systrayIntegration() const
bool OptionsDialog::systemTrayEnabled() const
{
if (!QSystemTrayIcon::isSystemTrayAvailable()) return false;
return m_ui->checkShowSystray->isChecked();
return QSystemTrayIcon::isSystemTrayAvailable()
? m_ui->checkShowSystray->isChecked()
: false;
}
bool OptionsDialog::minimizeToTray() const