Skip to content

Commit

Permalink
Remove the theming option wizardSelectiveSyncDefaultNothing
Browse files Browse the repository at this point in the history
We recommend `newBigFolderSizeLimit` together with `wizardHideFolderSizeLimitCheckbox`
as an alternative

Fixes: #8061
  • Loading branch information
TheOneRing committed Sep 9, 2020
1 parent 737a3e9 commit 862314a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/8064
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Change: Remove the branding option `wizardSelectiveSyncDefaultNothing`

The branding option was removed as believe that it did not provide a good user experience.
We recommend `newBigFolderSizeLimit` together with `wizardHideFolderSizeLimitCheckbox` as a replacement.

https://github.com/owncloud/client/pull/8064
6 changes: 1 addition & 5 deletions src/gui/folderwizard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,11 +508,7 @@ void FolderWizardSelectiveSync::initializePage()
QString alias = QFileInfo(targetPath).fileName();
if (alias.isEmpty())
alias = Theme::instance()->appName();
QStringList initialBlacklist;
if (Theme::instance()->wizardSelectiveSyncDefaultNothing()) {
initialBlacklist = QStringList("/");
}
_selectiveSync->setFolderInfo(targetPath, alias, initialBlacklist);
_selectiveSync->setFolderInfo(targetPath, alias);
QWizardPage::initializePage();
}

Expand Down
9 changes: 1 addition & 8 deletions src/gui/wizard/owncloudadvancedsetuppage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@ void OwncloudAdvancedSetupPage::initializePage()
connect(quotaJob, &PropfindJob::result, this, &OwncloudAdvancedSetupPage::slotQuotaRetrieved);
quotaJob->start();


if (Theme::instance()->wizardSelectiveSyncDefaultNothing()) {
_selectiveSyncBlacklist = QStringList("/");
QTimer::singleShot(0, this, &OwncloudAdvancedSetupPage::slotSelectiveSyncClicked);
}

ConfigFile cfgFile;
auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
_ui.confCheckBoxSize->setChecked(newFolderLimit.first);
Expand Down Expand Up @@ -339,8 +333,7 @@ void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
bool updateBlacklist = false;

// We need to update the selective sync blacklist either when the dialog
// was accepted, or when it was used in conjunction with the
// wizardSelectiveSyncDefaultNothing feature and was cancelled - in that
// was accepted in that
// case the stub blacklist of / was expanded to the actual list of top
// level folders by the selective sync dialog.
if (result == QDialog::Accepted) {
Expand Down
5 changes: 0 additions & 5 deletions src/libsync/theme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,6 @@ QPixmap Theme::wizardHeaderBanner(const QSize &size) const
}
#endif

bool Theme::wizardSelectiveSyncDefaultNothing() const
{
return false;
}

QString Theme::webDavPath() const
{
return QLatin1String("remote.php/webdav/");
Expand Down
6 changes: 0 additions & 6 deletions src/libsync/theme.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,6 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject
*/
virtual QString updateCheckUrl() const;

/**
* When true, the setup wizard will show the selective sync dialog by default and default
* to nothing selected
*/
virtual bool wizardSelectiveSyncDefaultNothing() const;

/**
* Default option for the newBigFolderSizeLimit.
* Size in MB of the maximum size of folder before we ask the confirmation.
Expand Down

0 comments on commit 862314a

Please sign in to comment.