improve proposeLocalDir feature

nextcloud · Dec 4, 2024 · 6b24b06 · 6b24b06
1 parent faab1c6
commit 6b24b06
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
@@ -120,9 +120,20 @@ void OwncloudSetupWizard::startWizard()
     if (!QDir(localFolder).isAbsolute()) {
         localFolder = QDir::homePath() + QLatin1Char('/') + localFolder;
     }
-
-    localFolder = "Please select folder";
+
     _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()) {

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
@@ -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";
@@ -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);

diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
@@ -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);