From ef28b7fe76d291df77bbbaf9aaf284c3384c176c Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 1 Dec 2020 18:42:42 +0100 Subject: Bugfix: Update "Sync hidden files" button Fixes: #8258 (cherry picked from commit 56cddbdae9e98a9457a63203f433ed82ca570828) --- changelog/unreleased/8258 | 6 ++++++ src/gui/generalsettings.cpp | 9 ++++----- src/gui/generalsettings.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 changelog/unreleased/8258 diff --git a/changelog/unreleased/8258 b/changelog/unreleased/8258 new file mode 100644 index 000000000..fc938eb30 --- /dev/null +++ b/changelog/unreleased/8258 @@ -0,0 +1,6 @@ +Bugfix: Update "Sync hidden files" button + +We fixed a bug that prevented the "Sync hidden files" from +displaying the correct value. + +https://github.com/owncloud/client/issues/8258 diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 96f683d42..a8ad4c5c6 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -52,12 +52,10 @@ GeneralSettings::GeneralSettings(QWidget *parent) this, &GeneralSettings::slotToggleOptionalDesktopNotifications); connect(_ui->showInExplorerNavigationPaneCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotShowInExplorerNavigationPane); - updateAutoStartInfo(); + reloadConfig(); loadMiscSettings(); slotUpdateInfo(); - _ui->syncHiddenFilesCheckBox->setChecked(!FolderMan::instance()->ignoreHiddenFiles()); - // misc connect(_ui->monoIconsCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); connect(_ui->crashreporterCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); @@ -144,7 +142,7 @@ void GeneralSettings::loadMiscSettings() void GeneralSettings::showEvent(QShowEvent *) { - updateAutoStartInfo(); + reloadConfig(); } void GeneralSettings::slotUpdateInfo() @@ -272,8 +270,9 @@ void GeneralSettings::slotIgnoreFilesEditor() } } -void GeneralSettings::updateAutoStartInfo() +void GeneralSettings::reloadConfig() { + _ui->syncHiddenFilesCheckBox->setChecked(!FolderMan::instance()->ignoreHiddenFiles()); if (Utility::hasSystemLaunchOnStartup(Theme::instance()->appName())) { _ui->autostartCheckBox->setChecked(true); _ui->autostartCheckBox->setDisabled(true); diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h index a3fbff2ed..974248319 100644 --- a/src/gui/generalsettings.h +++ b/src/gui/generalsettings.h @@ -55,7 +55,7 @@ protected: void showEvent(QShowEvent *event) override; private: - void updateAutoStartInfo(); + void reloadConfig(); Ui::GeneralSettings *_ui; QPointer _ignoreEditor; -- cgit v1.2.3