Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2020-12-01 20:42:42 +0300
committerHannah von Reth <hannah.vonreth@owncloud.com>2020-12-01 20:54:26 +0300
commitef28b7fe76d291df77bbbaf9aaf284c3384c176c (patch)
treedb1a8b6829c7054aafffbf95df4f684e09267b21
parent140dee45903c54f37818635358d6bf19da0de021 (diff)
Bugfix: Update "Sync hidden files" button
Fixes: #8258 (cherry picked from commit 56cddbdae9e98a9457a63203f433ed82ca570828)
-rw-r--r--changelog/unreleased/82586
-rw-r--r--src/gui/generalsettings.cpp9
-rw-r--r--src/gui/generalsettings.h2
3 files changed, 11 insertions, 6 deletions
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<IgnoreListEditor> _ignoreEditor;