Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

option to force end users to actively select a suitable local directory #7497

Draft
wants to merge 246 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
246 commits
Select commit Hold shift + click to select a range
f3b6258
do not provide a default local directory
rwalke Nov 13, 2024
7192ba8
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 14, 2024
82d068e
Add section on Apple ATS to docs troubleshooting section
claucambra Nov 12, 2024
7b465ac
Add option to create developer builds of client via mac crafter
claucambra Nov 8, 2024
eee66b9
Emit a signal on wizard close
claucambra Nov 11, 2024
60fc262
Also emit close signal on window hide (i.e. user close) on macOS
claucambra Nov 11, 2024
1487a93
Clear wizard static pointer on wizardClosed
claucambra Nov 11, 2024
6293040
Update nextcloudcmd.rst
Rello Nov 8, 2024
e380edf
Update doc/nextcloudcmd.rst
Rello Nov 14, 2024
7f1c5ad
Add null check for resultDacl after calling GetSecurityDescriptorDacl
Kaskadee Nov 10, 2024
609c65f
Add step to remove Desktop.ini to removeFolder function.
camilasan Nov 6, 2024
9a3c62d
f => folderToRemove.
camilasan Nov 6, 2024
d14fa2c
Modernize NavigationPaneHelper class.
camilasan Nov 5, 2024
5a0af61
Add documentation about Utility::setupFavLink and Utility::removeFavL…
camilasan Nov 6, 2024
ef3618f
Modernize Utility::removeFavLink and Utility::setupFavLink.
camilasan Nov 6, 2024
3021e1c
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 16, 2024
357cbba
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 17, 2024
aa53da0
Add starter documentation page on macOS VFS
claucambra Nov 13, 2024
5d9f612
Add introduction section to macosvfs docs
claucambra Nov 13, 2024
12fdeb5
Add install/initial setup section to macosvfs docs
claucambra Nov 13, 2024
764aef1
Add section on finder integration to macosvfs docs
claucambra Nov 13, 2024
f24382e
Add note on notify_push to macosvfs doc
claucambra Nov 13, 2024
6ca82b2
Add section on configuration for macosvfs docs
claucambra Nov 13, 2024
3ace9a6
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 18, 2024
0171983
remove assert that is being hit always when running debug builds
mgallien Nov 18, 2024
78cdc62
Remove background from textfields to fix errors
claucambra Oct 21, 2024
968bd10
Add small top margin to shareview
claucambra Oct 21, 2024
a56b789
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 19, 2024
19f1966
Fix encoding used for override server url
claucambra Oct 24, 2024
6a68d89
If fileProviderExtRecheable is false, try to reconfigure client commu…
claucambra Nov 5, 2024
e4d59fa
Update url to dowload linuxdeploy-plugin-qt tool latest version.
camilasan Nov 18, 2024
aa1741b
Rewrite setResult:forPath: method signature for SyncClient and Finder…
claucambra Oct 29, 2024
bcbaf5f
Do not set badge identifier for a given path URL if the URL is nil
claucambra Oct 29, 2024
a715267
Revert "remove broken system paellete detection within our custom style"
claucambra Nov 5, 2024
8a03918
Add convenience method to check Windows 11 availability
claucambra Nov 5, 2024
05c485f
Use old palette change detection method on Windows 10 and under
claucambra Nov 5, 2024
52a6dc7
If <= Windows 10, use the reserve dark palette for dark mode
claucambra Nov 5, 2024
8411607
Use registry-based dark mode detection on <= Windows 10
claucambra Nov 5, 2024
57007f5
Use QOperatingSystemVersion in Windows 11 check
claucambra Nov 10, 2024
246742f
use QWidget Fusion style on Windows 10: enable dark mode
mgallien Nov 12, 2024
9492913
create a log category for OCC::Theme class
mgallien Nov 12, 2024
c28fa78
implement a drak mode palette and use it when needed
mgallien Nov 12, 2024
1cfc2e2
on Windows 10 follow color scheme changes and apply them
mgallien Nov 12, 2024
e24802e
some improvements for account network settings
mgallien Nov 12, 2024
7daf9fa
Build(deps): Bump platisd/clang-tidy-pr-comments from 1.5.1 to 1.6.1
dependabot[bot] Nov 18, 2024
ce4af95
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 20, 2024
b4633cf
Ensure paths are passed properly escaped into codesign command in mac…
claucambra Nov 20, 2024
b329839
Add missing brace in FileProviderXPC's fileProviderExtReachable
claucambra Nov 20, 2024
0fca9ee
Also escape codesign call with saving entitlements
claucambra Nov 20, 2024
a685669
Also add options to recursive codesign function
claucambra Nov 20, 2024
94243de
Use recursive codesign instead of broken wildcard path for sparkle Au…
claucambra Nov 20, 2024
6a1eda0
Fix codesign path for app bundle main binaries
claucambra Nov 20, 2024
b8b49ed
Escape code sign entitlement paths in mac crafter
claucambra Nov 20, 2024
ad08ab1
Add live photo properties to syncfileitem
claucambra Oct 29, 2024
06efda7
Add live photo properties to remoteinfo struct
claucambra Oct 29, 2024
d60802c
Add live photo properties to sync journal file record
claucambra Oct 29, 2024
9e040b7
Handle live photo in syncjournaldb queries and inserts
claucambra Oct 29, 2024
54c3bf8
Fetch and record live photo properties during remote discovery single…
claucambra Oct 29, 2024
2f78245
Apply live photo server entry properties to syncfileitem
claucambra Oct 29, 2024
e89d7be
Set live photo properties on syncfileitem when creating one based on …
claucambra Oct 29, 2024
7ad089b
If the user tries to delete the movie component of a live photo, redo…
claucambra Oct 30, 2024
4e8ec77
Add isLivePhoto property to FileInfo in syncenginetestutils
claucambra Oct 30, 2024
32bb59b
Add setIsLivePhoto method to FileInfo
claucambra Oct 30, 2024
b7a0234
Add test for correct handling of live photo mov deletion
claucambra Oct 30, 2024
a24768e
Check for live photo against db entry instead of server entry
claucambra Oct 30, 2024
ffda689
Handle NeedToSignTermsOfService account state in file provider compon…
claucambra Nov 20, 2024
e4faa39
Handle redirect detected for account state in domain manager
claucambra Nov 20, 2024
3b14d1e
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 21, 2024
826953f
Do not do deep codesign as default
claucambra Nov 21, 2024
ea5017c
Also sign executables during recursive codesign
claucambra Nov 21, 2024
22a5af5
Do a codesign of the app bundle itself as final step
claucambra Nov 21, 2024
9941f73
Bring back coloured header
claucambra Nov 14, 2024
c26b051
Fix background colour for tray window (should be base as we only show…
claucambra Nov 14, 2024
1e380f4
Use palette base colour for windows (we always display item views)
claucambra Nov 14, 2024
fef76e9
Remove custom background from menus and menu buttons
claucambra Nov 14, 2024
b010874
Remove internal list view and scrollview from apps menu
claucambra Nov 14, 2024
3c6bbdd
Remove commented-out hover effect component
claucambra Nov 14, 2024
e985b31
Wrap the instantiated userLine components in a menu item
claucambra Nov 14, 2024
12ace50
Use standard icon for addAccountButton, fixing sizing
claucambra Nov 14, 2024
a2b1202
Use standard icon property to set icon for userline
claucambra Nov 14, 2024
d657b28
Improve spacings of userline
claucambra Nov 14, 2024
67183ae
Make sizing of addacount button more reasonable
claucambra Nov 14, 2024
00b2eaa
Fix some more colours
claucambra Nov 14, 2024
410a149
Fix colours for some more components
claucambra Nov 14, 2024
abda873
Fix components for share details page footer
claucambra Nov 14, 2024
2f112cd
Fix sync status separator
claucambra Nov 14, 2024
3c0f87d
Fix borders for share details page footer
claucambra Nov 14, 2024
eb1a50c
Fix icons in share delegate buttons being uncentered
claucambra Nov 14, 2024
9aebc92
Fix spacing of activity item buttons
claucambra Nov 14, 2024
81da1f5
Respect showDismissButton
claucambra Nov 14, 2024
fff2cb1
Simplify layout and fix alignments, sizings, and layouts of items wit…
claucambra Nov 24, 2022
c73bc26
Fix placeholderTextColor in user status selector text field
claucambra Nov 15, 2024
847cc64
Decouple emoji field button from UserStatusSelectorButton
claucambra Nov 25, 2022
b6d25db
Replace use of CustomButton with standard Button
claucambra Nov 25, 2022
86f77e2
Remove custom button QML items
claucambra Nov 15, 2024
dfc3871
Fix sizing of share details page buttons
claucambra Nov 15, 2024
4e17bfe
Fix label alignments on share view checkboxes
claucambra Nov 15, 2024
7c3c256
Fix displaying of busy indicator on share view
claucambra Nov 15, 2024
f2237ea
Do not use magic numnbers for spacing of sync status icon
claucambra Nov 15, 2024
1efaf37
Fix search bar separator in tray window
claucambra Nov 19, 2024
8eef0a0
Remove menuBorder Style variable, just use palette (as we have alread…
claucambra Nov 19, 2024
3b9bce0
Remove now unused hover colors
claucambra Nov 19, 2024
4abc226
Remove background color from Style, use palette base in its place
claucambra Nov 19, 2024
131c3b4
Use standard text colour in ncinputtextedit
claucambra Nov 19, 2024
c301de1
Move remaining uses of secondary text color to use palette midlight, …
claucambra Nov 19, 2024
8cf42bb
Remove unused colours from style
claucambra Nov 19, 2024
22883f5
Use accentColor rather than header colour where appropriate
claucambra Nov 19, 2024
8888899
Give sync progress bar expected fill colour
claucambra Nov 19, 2024
69b1aff
Use constexpr for accentcolor adjustment value
claucambra Nov 19, 2024
779361a
Remove unused style measurements
claucambra Nov 19, 2024
51f0394
Fix colour of indicator outlines in tray header elements
claucambra Nov 19, 2024
6a118d4
Reduce size of tray window header
claucambra Nov 19, 2024
1053c2d
Remove rectangle aboce folder state indicator background in tray fold…
claucambra Nov 21, 2024
cd6877b
Remove unused properties from UserLine
claucambra Nov 21, 2024
6f26e90
Do not load caret on current user button if the button had a non-null…
claucambra Nov 21, 2024
0b321cb
Move current account header button definition into own file
claucambra Nov 21, 2024
b631f22
Move tray window header component into separate file
claucambra Nov 21, 2024
3c83b98
Do not treat bundles as executables in codesign check
claucambra Nov 21, 2024
ea0831e
Mark non-const getters in Folder definition as const
claucambra Oct 21, 2024
badb41d
Store fetched folder as private member in filedetails
claucambra Oct 21, 2024
069107c
Simply pass AccountPtr to updateFileTagModel
claucambra Oct 21, 2024
3fe4728
Ensure we are checking for tags in correct server path regardless of …
claucambra Oct 21, 2024
c572cbf
Move setup of server relative path used in FileTagModel into FileDetails
claucambra Oct 23, 2024
4ae577f
Add missing nodiscards in folder methods
claucambra Nov 21, 2024
e3d82e7
Remove unused includes in filetagmodel
claucambra Nov 21, 2024
bc704ff
Make the unified search input being focused a valid active reason
claucambra Nov 19, 2024
3866d40
Add a mouse area to allow de-focusing the unified search text field o…
claucambra Nov 19, 2024
c35f364
Fix keyboard tab behaviour when focus reaches unified search bar
claucambra Nov 19, 2024
fd236fc
On escape pressed of unified search placeholder view, diable activeSe…
claucambra Nov 19, 2024
3c677e0
Add a UnifiedSearchPlaceholderView
claucambra Nov 19, 2024
9916e5d
Place unified search placeholder view in main tray window view when i…
claucambra Nov 19, 2024
18f470c
Clean up ids of internal components of placeholder views
claucambra Nov 19, 2024
1681527
Unify definition of unified seach placeholder views fonts
claucambra Nov 19, 2024
0b97442
Allow using an external task for running commands in mac-crafter run …
claucambra Nov 21, 2024
29007fc
Do not rely on FileManager's isExecutableFile, check manually for Mac…
claucambra Nov 21, 2024
fde6578
Do not do final bundle codesign
claucambra Nov 21, 2024
36088fb
improve files explorer context menu by removing obsolete commands
mgallien Nov 19, 2024
1fdf200
flush logs every 5 lines written
mgallien Nov 13, 2024
a1ae1c9
ensure folder permissions are read-only when needed
mgallien Nov 20, 2024
4e0be55
ensure no any user writable permissions in Nextcloud sync folder
mgallien Nov 20, 2024
49d5cf0
better logs and factor common code in folder permissions handling
mgallien Nov 21, 2024
c227dc2
Add checkbox to disable general talk notifications in general settings
claucambra Feb 13, 2023
6487c82
Add setting for showing chat notifications to configfile
claucambra Feb 13, 2023
4655df2
Add the chat notification toggle setting logic in generalsettings
claucambra Feb 13, 2023
258601f
Only notify talk chat notifications if this is enabled
claucambra Feb 13, 2023
d7428ca
Do not use const for POD type in setShowCallNotifications declaration
claucambra Jun 26, 2024
b0b4a98
Remove unneeded check for DnD status when showing desktop talk notifi…
claucambra Nov 18, 2024
6b0d293
remove this call that is probably useless and crashing tests
mgallien Nov 21, 2024
c30bc5c
Do not take current dir pth for filemanager for recursive codesign ex…
claucambra Nov 21, 2024
908b188
Ensure path passed to codesigning is absolute when using mac-crafter …
claucambra Nov 21, 2024
b56bb72
Only define enumeratedItemPath once
claucambra Nov 21, 2024
9a52eb1
Ensure we sign the app bundle's main executable last
claucambra Nov 21, 2024
dd35cdf
Add ability to skip certain files in recursive codesign
claucambra Nov 21, 2024
1bf7669
Skip main executable during first binary codesign round
claucambra Nov 21, 2024
3686a83
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 22, 2024
ca970b7
Fix broken general setting UI file
claucambra Nov 21, 2024
01f36c3
Rename horizontalLayout with duplicate name
claucambra Nov 21, 2024
5b134b4
Add displayFileOwner property to ShareModel
claucambra Oct 20, 2024
727368e
Add fileOwnerDisplayName property to ShareModel
claucambra Oct 20, 2024
a7e60b9
Set if the file owner should be displayed and the file owner display …
claucambra Oct 20, 2024
c70b859
Add sharedWithMe-related properties to sharemodel
claucambra Oct 20, 2024
eebec89
Also fetch shared with me share on target path
claucambra Oct 20, 2024
0baec42
When handling fetched shares, record shared-with-me related informati…
claucambra Oct 20, 2024
eaeeba1
Display file owner information (if not self) in share view
claucambra Oct 20, 2024
dea49aa
Display shared with me file's share expiry in share view if relevant
claucambra Oct 20, 2024
12e4c70
Display share owner rather than file owner (this is more relevant to …
claucambra Oct 20, 2024
8091d57
Bolden string showing who owns the share that was shared with me
claucambra Oct 20, 2024
399976c
Convert ImageProvider in an async image provider using an internal im…
claucambra Oct 20, 2024
4d6f2d5
Add ability to fetch remote server avatars in usermodel avatar ImageR…
claucambra Oct 20, 2024
bd4339d
Add shareOwnerAvatar property to ShareModel
claucambra Oct 20, 2024
7bff2ae
Build shareOwnerAvatar image provider string when handling sharedWith…
claucambra Oct 20, 2024
5ccf14a
Display image for sharedWithMe share owner in share view
claucambra Oct 20, 2024
c46c790
Ensure requestedSize for avatars is valid
claucambra Oct 21, 2024
b30b7ca
Ensure account pointer is valid when fetching avatars
claucambra Oct 21, 2024
bff3f58
Clean up whitespace in ShareModel::slotPropfindReceived
claucambra Nov 20, 2024
ec1b9bd
Match definition of shared_with_me with other properties in OcsShareJ…
claucambra Nov 20, 2024
42d4477
Ensure avatarJob is run on the respective account's QNAM thread
claucambra Nov 20, 2024
ae289fe
do not move to trash online only files/folders: going to fail
mgallien Oct 30, 2024
dee8e9d
fix computation of availability for empty folders
mgallien Oct 30, 2024
7bc53b5
use proper item type when converting existing windows shortcuts
mgallien Nov 5, 2024
8d8ddce
fix migration of existing windows shortcut files to placeholder
mgallien Nov 5, 2024
0633754
provide proper log when we block a self hydration request
mgallien Nov 5, 2024
74f639b
prevent implicit hydration when setting file permissions on shortcuts
mgallien Nov 5, 2024
8e64be9
never use QFileInfo on possibly pure virtual placeholder file
mgallien Nov 5, 2024
8fd9fff
improve logs for CfAPI handle requests in erroneous cases
mgallien Nov 5, 2024
e774d0e
remote permissions of a view-only folder: no new file or folder
mgallien Nov 7, 2024
0fbef8b
ensure lnk shortcut files are converted to virtual files
mgallien Nov 5, 2024
61811be
Directly bundle macOS vfs logs within standard debug archive
claucambra Oct 29, 2024
0efecdf
Remove create debug archive button from individual vfs account settings
claucambra Oct 29, 2024
6683bfb
Ensure we are not halting the entire application when trying to gener…
claucambra Nov 5, 2024
5a336e4
Move debug archive for vfs creation out of log entry creation
claucambra Nov 6, 2024
ee82b08
Just use davUser as account identifier for macOS log filename
claucambra Nov 6, 2024
de512cf
Move file provider header include into file provider ifdef
claucambra Nov 20, 2024
27db5fc
Use slotComputeOverallSyncStatus as a slot.
camilasan Oct 29, 2024
c648302
Fix warning "Calling C++ methods with 'this' objects different from t…
camilasan Oct 29, 2024
c318764
Modernize Account::displayName().
camilasan Oct 29, 2024
623b34d
Use slots as slots.
camilasan Oct 29, 2024
86051bb
Diferentiate between display name and dav display name.
camilasan Oct 29, 2024
f8a800b
Rename vars: _am => _networkAccessManager, a => newAccountData.
camilasan Oct 31, 2024
d42812c
Use saveAccount for adding single account.
camilasan Oct 31, 2024
cf3b133
Add {} to single line if.
camilasan Nov 4, 2024
1e4325b
acc => account.
camilasan Nov 4, 2024
798c767
wiz => owncloudSetupWizard.
camilasan Nov 4, 2024
1a8246b
Call for done() when skipping folder configuration.
camilasan Nov 4, 2024
99a6c24
Remove check before setting display name.
camilasan Nov 6, 2024
d1cd1c8
Fix tests: make sure displayName is not empty.
camilasan Nov 14, 2024
3a35889
Correct Q_PROPERTY for _davDisplayName.
camilasan Nov 14, 2024
0df4b56
Fix login regression on linux
cmuck Nov 4, 2024
5984225
Fix login regression on linux
cmuck Nov 21, 2024
f474ae4
revert changes to the stale virtual files clean up function
mgallien Oct 16, 2024
6d4b027
prevent out of bounds access in automated tests
mgallien Oct 16, 2024
9d22b08
Remove unneeded workaround for dash separated language strings
claucambra Nov 4, 2024
3fa1981
Only grab system language from QLocale::system
claucambra Nov 4, 2024
e333b46
Use first uiLanguage as lang
claucambra Nov 17, 2024
3cd16f7
add include QLocale to fix compilation issue
mgallien Nov 21, 2024
de67f8d
use CI images including Qt6.7 that is now required
mgallien Nov 22, 2024
396c1fe
we require Qt 6.7 release to build
mgallien Nov 22, 2024
34ff94e
master branch will be 3.16.0 future release
mgallien Nov 22, 2024
86dd953
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 22, 2024
7cac07e
fix spelling os UserStatus qml type when setting user status
mgallien Nov 22, 2024
f07f753
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 23, 2024
4046958
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 24, 2024
2119aa1
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 25, 2024
8e92768
Make connectToPaletteSignal const
claucambra Nov 25, 2024
f6658de
Try connectToSignal on all OSes on Theme init
claucambra Nov 25, 2024
2911877
Add connectToSignal on darkMode property fetch
claucambra Nov 25, 2024
e67aa6c
Use Style.darkMode instead of Theme.darkMode
claucambra Nov 25, 2024
494db75
no transparent background for main ApplicationWindow
mgallien Nov 25, 2024
411479c
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 26, 2024
2d34e88
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 27, 2024
659d37a
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 28, 2024
ceba650
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 29, 2024
0d8fc43
fix regressions in automated tests for bulk upload
mgallien Nov 27, 2024
61b5a57
fix local discovery test for file names with spaces on windows
mgallien Nov 28, 2024
34be93e
fix TestSyncConflictsModel by using locale aware test data
mgallien Nov 28, 2024
0ae37d9
fir regression with VFS availability test on Windows
mgallien Nov 28, 2024
f2b5faa
when updating a virtual file after lock/unlock: avoid setting modtime
mgallien Nov 26, 2024
f034a3f
Fix(l10n): Update translations from Transifex
nextcloud-bot Nov 30, 2024
ff4f04d
Fix(l10n): Update translations from Transifex
nextcloud-bot Dec 2, 2024
05dad2a
enable reversed locale layout in QML
mgallien Feb 2, 2022
ed75220
improve translations of strings with numbers inside
Valdnet Sep 14, 2021
6661bad
convert double numbers to int because we expect them to be real ints
mgallien Jun 3, 2022
1b894c3
Fix(l10n): Update translations from Transifex
nextcloud-bot Dec 4, 2024
568e782
improve proposeLocalDir feature
rwalke Dec 4, 2024
9858bd4
Merge branch 'nextcloud:master' into feature/proposeLocalDir
rwalke Dec 5, 2024
2526a95
Merge branch 'nextcloud:master' into feature/proposeLocalDir
rwalke Dec 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/gui/owncloudsetupwizard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,20 @@ void OwncloudSetupWizard::startWizard()
if (!QDir(localFolder).isAbsolute()) {
localFolder = QDir::homePath() + QLatin1Char('/') + localFolder;
}

_ocWizard->setProperty("localFolder", localFolder);

{
ConfigFile cfg;
if (!cfg.proposeLocalDir().isEmpty()) {
qCInfo(lcWizard) << "cfg.proposeLocalDir() " << cfg.proposeLocalDir();
if (cfg.proposeLocalDir() == "false") {
localFolder = "Please select folder";
}
_ocWizard->setProperty("localFolder", localFolder);
}
}

{
ConfigFile cfg;
if (!cfg.overrideLocalDir().isEmpty()) {
Expand Down
13 changes: 13 additions & 0 deletions src/libsync/configfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ static constexpr char updateSegmentC[] = "updateSegment";
static constexpr char updateChannelC[] = "updateChannel";
static constexpr char overrideServerUrlC[] = "overrideServerUrl";
static constexpr char overrideLocalDirC[] = "overrideLocalDir";
static constexpr char proposeLocalDirC[] = "proposeLocalDir";
static constexpr char isVfsEnabledC[] = "isVfsEnabled";
static constexpr char geometryC[] = "geometry";
static constexpr char timeoutC[] = "timeout";
Expand Down Expand Up @@ -779,6 +780,18 @@ void ConfigFile::setOverrideLocalDir(const QString &localDir)
settings.setValue(QLatin1String(overrideLocalDirC), localDir);
}

[[nodiscard]] QString ConfigFile::proposeLocalDir() const
{
QSettings settings(configFile(), QSettings::IniFormat);
return settings.value(QLatin1String(proposeLocalDirC), {}).toString();
}

void ConfigFile::setProposeLocalDir(const QString &localDir)
{
QSettings settings(configFile(), QSettings::IniFormat);
settings.setValue(QLatin1String(proposeLocalDirC), localDir);
}

bool ConfigFile::isVfsEnabled() const
{
QSettings settings(configFile(), QSettings::IniFormat);
Expand Down
3 changes: 3 additions & 0 deletions src/libsync/configfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
[[nodiscard]] QString overrideLocalDir() const;
void setOverrideLocalDir(const QString &localDir);

[[nodiscard]] QString proposeLocalDir() const;
void setProposeLocalDir(const QString &localDir);

[[nodiscard]] bool isVfsEnabled() const;
void setVfsEnabled(bool enabled);

Expand Down