mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-26 19:26:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revise behavior of initializing checkboxes

Browse source 
The checkboxes initial value should not depend on parent state and
should be restored anyway.
This commit is contained in:
Chocobo1 2022-07-09 01:34:58 +08:00
parent 2ef059807a
commit e4fafb911a
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gui/optionsdialog.cpp
View file

@ -675,10 +675,10 @@ void OptionsDialog::saveOptions()
pref->setHideZeroValues(m_ui->checkHideZero->isChecked());
pref->setHideZeroComboValues(m_ui->comboHideZero->currentIndex());
#ifndef Q_OS_MACOS
pref->setSystemTrayEnabled(systemTrayEnabled());
pref->setSystemTrayEnabled(m_ui->checkShowSystray->isChecked());
pref->setTrayIconStyle(TrayIcon::Style(m_ui->comboTrayIcon->currentIndex()));
pref->setCloseToTray(closeToTray());
pref->setMinimizeToTray(minimizeToTray());
pref->setCloseToTray(m_ui->checkCloseToSystray->isChecked());
pref->setMinimizeToTray(m_ui->checkMinimizeToSysTray->isChecked());
#endif
pref->setStartMinimized(startMinimized());
pref->setSplashScreenDisabled(isSplashScreenDisabled());
@ -935,12 +935,9 @@ void OptionsDialog::loadOptions()
#ifndef Q_OS_MACOS
m_ui->checkShowSystray->setChecked(pref->systemTrayEnabled());
if (m_ui->checkShowSystray->isChecked())
{
m_ui->checkMinimizeToSysTray->setChecked(pref->minimizeToTray());
m_ui->checkCloseToSystray->setChecked(pref->closeToTray());
m_ui->comboTrayIcon->setCurrentIndex(static_cast<int>(pref->trayIconStyle()));
}
m_ui->checkMinimizeToSysTray->setChecked(pref->minimizeToTray());
m_ui->checkCloseToSystray->setChecked(pref->closeToTray());
m_ui->comboTrayIcon->setCurrentIndex(static_cast<int>(pref->trayIconStyle()));
#endif
m_ui->checkPreventFromSuspendWhenDownloading->setChecked(pref->preventFromSuspendWhenDownloading());
@ -1354,27 +1351,6 @@ bool OptionsDialog::startMinimized() const
return m_ui->checkStartMinimized->isChecked();
}
#ifndef Q_OS_MACOS
bool OptionsDialog::systemTrayEnabled() const
{
return QSystemTrayIcon::isSystemTrayAvailable()
? m_ui->checkShowSystray->isChecked()
: false;
}
bool OptionsDialog::minimizeToTray() const
{
if (!m_ui->checkShowSystray->isChecked()) return false;
return m_ui->checkMinimizeToSysTray->isChecked();
}
bool OptionsDialog::closeToTray() const
{
if (!m_ui->checkShowSystray->isChecked()) return false;
return m_ui->checkCloseToSystray->isChecked();
}
#endif // Q_OS_MACOS
// Return Share ratio
qreal OptionsDialog::getMaxRatio() const
{

5
src/gui/optionsdialog.h
View file

@ -123,11 +123,6 @@ private:
void initializeLanguageCombo();
// General options
QString getLocale() const;
#ifndef Q_OS_MACOS
bool systemTrayEnabled() const;
bool minimizeToTray() const;
bool closeToTray() const;
#endif
bool startMinimized() const;
bool isSplashScreenDisabled() const;
#ifdef Q_OS_WIN