Merge branch 'release/20.08' into master

This commit is contained in:
Elvis Angelaccio 2020-08-26 00:49:00 +02:00
commit 6072005ddc

View file

@ -224,6 +224,7 @@ void ViewSettingsTab::loadSettings()
break; break;
case DetailsMode: case DetailsMode:
m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders()); m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());
#ifndef Q_OS_WIN
if (DetailsModeSettings::directorySizeCount()) { if (DetailsModeSettings::directorySizeCount()) {
m_numberOfItems->setChecked(true); m_numberOfItems->setChecked(true);
m_recursiveDirectorySizeLimit->setEnabled(false); m_recursiveDirectorySizeLimit->setEnabled(false);
@ -232,6 +233,7 @@ void ViewSettingsTab::loadSettings()
m_recursiveDirectorySizeLimit->setEnabled(true); m_recursiveDirectorySizeLimit->setEnabled(true);
} }
m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit()); m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit());
#endif
break; break;
default: default:
break; break;