Skip to content

Sync folder setup#851

Open
sh4tteredd wants to merge 1 commit intoopencloud-eu:mainfrom
sh4tteredd:main
Open

Sync folder setup#851
sh4tteredd wants to merge 1 commit intoopencloud-eu:mainfrom
sh4tteredd:main

Conversation

@sh4tteredd
Copy link
Copy Markdown

No description provided.

@dragotin
Copy link
Copy Markdown
Member

Hey, thank you very much for your PR.

Before we can progress it, please take a moment and describe what you want to achieve with it. What is better with your PR?

Also I tried to compile it on my system, and I needed this patch to actually build it:

diff --git a/src/gui/newwizard/pages/syncfoldersetupwizardpage.cpp b/src/gui/newwizard/pages/syncfoldersetupwizardpage.cpp
index d02f28744..e34225762 100644
--- a/src/gui/newwizard/pages/syncfoldersetupwizardpage.cpp
+++ b/src/gui/newwizard/pages/syncfoldersetupwizardpage.cpp
@@ -7,9 +7,10 @@
 
 namespace OCC::Wizard {
 
-SyncFolderSetupWizardPage::SyncFolderSetupWizardPage(const QString &defaultSyncFolder, QWidget *parent)
-    : _ui(std::make_unique<Ui::SyncFolderSetupWizardPage>())
+SyncFolderSetupWizardPage::SyncFolderSetupWizardPage(const QString &defaultSyncFolder, QWidget*parent)
+    : _ui(new Ui::SyncFolderSetupWizardPage)
 {
+    Q_UNUSED(parent)
     _ui->setupUi(this);
     _ui->syncFolderLineEdit->setText(QDir::toNativeSeparators(defaultSyncFolder));
 
@@ -17,7 +18,6 @@ SyncFolderSetupWizardPage::SyncFolderSetupWizardPage(const QString &defaultSyncF
         auto dialog = new QFileDialog(this, tr("Select the sync folder location"), defaultSyncFolder);
         dialog->setFileMode(QFileDialog::Directory);
         dialog->setOption(QFileDialog::ShowDirsOnly);
-        dialog->setOption(QFileDialog::DontCreateDirectories);
 
         connect(dialog, &QFileDialog::fileSelected, this, [this](const QString &directory) {
             _ui->syncFolderLineEdit->setText(QDir::toNativeSeparators(directory));
@@ -29,7 +29,6 @@ SyncFolderSetupWizardPage::SyncFolderSetupWizardPage(const QString &defaultSyncF
 
 SyncFolderSetupWizardPage::~SyncFolderSetupWizardPage() noexcept
 {
-    delete _ui;
 }
 
 QString SyncFolderSetupWizardPage::syncFolder() const
diff --git a/src/gui/newwizard/pages/syncfoldersetupwizardpage.h b/src/gui/newwizard/pages/syncfoldersetupwizardpage.h
index fdd23fde4..2d90bf767 100644
--- a/src/gui/newwizard/pages/syncfoldersetupwizardpage.h
+++ b/src/gui/newwizard/pages/syncfoldersetupwizardpage.h
@@ -22,11 +22,8 @@ public:
     QString syncFolder() const;
     bool validateInput() const override;
 
-Q_SIGNALS:
-    void contentChanged() override;
-
 private:
-    std::unique_ptr<Ui::SyncFolderSetupWizardPage> _ui;
+    std::unique_ptr<::Ui::SyncFolderSetupWizardPage> _ui;
 };
 
 } // OCC::Wizard

Qt version 6.10.2

@sh4tteredd
Copy link
Copy Markdown
Author

I'll update the PR asap.

When installed in a new system, the app creates its sync folder in the home (/Users/user/OpenCloud on macos or /home/OpenCloud on linux) by default, I wanted the user to be able to choose where to create the Sync folder during the app setup

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants