Skip to content

[stable-3.12] nmc/2003-FolderWizard_Settings_Dialog #152

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

Closed
wants to merge 11 commits into from
Closed
Changes from all commits
Commits
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
Binary file added nmctheme_v1.rcc
Binary file not shown.
6 changes: 3 additions & 3 deletions src/gui/accountsettings.cpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
#include "theme.h"
#include "foldercreationdialog.h"
#include "folderman.h"
#include "folderwizard.h"
#include "nmcgui/nmcfolderwizard.h"
#include "folderstatusmodel.h"
#include "folderstatusdelegate.h"
#include "common/utility.h"
@@ -743,7 +743,7 @@ void AccountSettings::slotAddFolder()
const auto folderMan = FolderMan::instance();
folderMan->setSyncEnabled(false); // do not start more syncs.

const auto folderWizard = new FolderWizard(_accountState->account(), this);
const auto folderWizard = new NMCFolderWizard(_accountState->account(), this);
folderWizard->setAttribute(Qt::WA_DeleteOnClose);

connect(folderWizard, &QDialog::accepted, this, &AccountSettings::slotFolderWizardAccepted);
@@ -754,7 +754,7 @@ void AccountSettings::slotAddFolder()

void AccountSettings::slotFolderWizardAccepted()
{
const auto folderWizard = qobject_cast<FolderWizard *>(sender());
const auto folderWizard = qobject_cast<NMCFolderWizard *>(sender());
const auto folderMan = FolderMan::instance();

qCInfo(lcAccountSettings) << "Folder wizard completed";
14 changes: 10 additions & 4 deletions src/gui/folderwizard.cpp
Original file line number Diff line number Diff line change
@@ -506,9 +506,11 @@ bool FolderWizardRemotePath::isComplete() const
if (QDir::cleanPath(dir) == QDir::cleanPath(curDir)) {
warnStrings.append(tr("This folder is already being synced."));
} else if (dir.startsWith(curDir)) {
warnStrings.append(tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir)));
//warnStrings.append(tr("You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir)));
} else if (curDir.startsWith(dir)) {
warnStrings.append(tr("You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir)));
//NMC customization
warnStrings.append(QCoreApplication::translate("", "FOLDER_WIZARD_FOLDER_WARNING"));
//warnStrings.append(tr("You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.").arg(Utility::escape(curDir), Utility::escape(dir)));
}
}

@@ -565,7 +567,7 @@ void FolderWizardRemotePath::changeStyle()
FolderWizardSelectiveSync::FolderWizardSelectiveSync(const AccountPtr &account)
{
auto *layout = new QVBoxLayout(this);
_selectiveSync = new SelectiveSyncWidget(account, this);
_selectiveSync = new NMCSelectiveSyncWidget(account, this);
layout->addWidget(_selectiveSync);

if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() != Vfs::Off) {
@@ -679,7 +681,11 @@ FolderWizard::FolderWizard(AccountPtr account, QWidget *parent)
setPage(Page_Target, _folderWizardTargetPage);
_folderWizardTargetPage->installEventFilter(this);
}
setPage(Page_SelectiveSync, _folderWizardSelectiveSyncPage);

if(Utility::isMac())
{
setPage(Page_SelectiveSync, _folderWizardSelectiveSyncPage);
}

setWindowTitle(tr("Add Folder Sync Connection"));
setOptions(QWizard::CancelButtonOnLeft);
24 changes: 17 additions & 7 deletions src/gui/folderwizard.h
Original file line number Diff line number Diff line change
@@ -22,14 +22,15 @@
#include "folder.h"
#include "accountfwd.h"

#include "ui_folderwizardsourcepage.h"
#include "ui_folderwizardtargetpage.h"
#include "nmcgui/nmcfolderwizardsourcepage.h"
#include "nmcgui/nmcfolderwizardtargetpage.h"
#include "nmcgui/nmcselectivesyncdialog.h"

class QCheckBox;

namespace OCC {

class SelectiveSyncWidget;
class NMCSelectiveSyncWidget;

class ownCloudInfo;

@@ -61,6 +62,11 @@ class FolderWizardLocalPath : public FormatWarningsWizardPage

void setFolderMap(const Folder::Map &fm) { _folderMap = fm; }

NMCFolderWizardSourcePage getUi()
{
return _ui;
}

protected:
void changeEvent(QEvent *) override;

@@ -70,7 +76,7 @@ protected slots:
private:
void changeStyle();

Ui_FolderWizardSourcePage _ui{};
NMCFolderWizardSourcePage _ui{};
Folder::Map _folderMap;
AccountPtr _account;
};
@@ -93,6 +99,10 @@ class FolderWizardRemotePath : public FormatWarningsWizardPage
void initializePage() override;
void cleanupPage() override;

NMCFolderWizardTargetPage getUi(){
return _ui;
};

protected slots:
void showWarn(const QString & = QString()) const;
void slotAddRemoteFolder();
@@ -119,7 +129,7 @@ private slots:
LsColJob *runLsColJob(const QString &path);
void recursiveInsert(QTreeWidgetItem *parent, QStringList pathTrail, QString path);
bool selectByPath(QString path);
Ui_FolderWizardTargetPage _ui{};
NMCFolderWizardTargetPage _ui{};
bool _warnWasVisible = false;
AccountPtr _account;
QTimer _lscolTimer;
@@ -146,7 +156,7 @@ private slots:
void virtualFilesCheckboxClicked();

private:
SelectiveSyncWidget *_selectiveSync;
NMCSelectiveSyncWidget *_selectiveSync;
QCheckBox *_virtualFilesCheckBox = nullptr;
};

@@ -170,7 +180,7 @@ class FolderWizard : public QWizard
bool eventFilter(QObject *watched, QEvent *event) override;
void resizeEvent(QResizeEvent *event) override;

private:
protected:
FolderWizardLocalPath *_folderWizardSourcePage;
FolderWizardRemotePath *_folderWizardTargetPage = nullptr;
FolderWizardSelectiveSync *_folderWizardSelectiveSyncPage;
41 changes: 41 additions & 0 deletions src/gui/nmcgui/nmcfolderwizard.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "nmcfolderwizard.h"

/**
* Folder wizard itself
*/

namespace OCC {

NMCFolderWizard::NMCFolderWizard(AccountPtr account, QWidget *parent)
:FolderWizard(account, parent)
{
setWizardStyle(QWizard::ClassicStyle);
setButtonText(QWizard::FinishButton, QCoreApplication::translate("", "ADD_SYNCHRONIZATION"));

//Source page
auto sourceUi = _folderWizardSourcePage->getUi();
sourceUi.localFolderLineEdit->clear();
sourceUi.localFolderLineEdit->setPlaceholderText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_PLACEHOLDER_TEXT"));
sourceUi.setDefaultSettings();
sourceUi.changeLayout();

//Target page
auto targetUi = _folderWizardTargetPage->getUi();
targetUi.setDefaultSettings();
targetUi.setLayout();
}

} // end namespace
50 changes: 50 additions & 0 deletions src/gui/nmcgui/nmcfolderwizard.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/

#ifndef MIRALL_NMCFolderWizard_H
#define MIRALL_NMCFolderWizard_H

#include "folderwizard.h"

/**
* @brief The NMCFolderWizard class represents a specific folder wizard for the NMC application.
* @ingroup gui
*
* The NMCFolderWizard class is derived from the FolderWizard class and provides additional functionality
* specific to the NMC (replace with the actual application name) application.
*/

namespace OCC {

class NMCFolderWizard : public FolderWizard
{
Q_OBJECT
public:
/**
* @brief Constructs an instance of NMCFolderWizard.
* @param account The account associated with the wizard.
* @param parent The parent widget (default is nullptr).
*/
explicit NMCFolderWizard(OCC::AccountPtr account, QWidget *parent = nullptr);

/**
* @brief Destroys the NMCFolderWizard instance.
*/
~NMCFolderWizard() = default;
};

} // namespace OCC

#endif

81 changes: 81 additions & 0 deletions src/gui/nmcgui/nmcfolderwizardsourcepage.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/

#include "nmcfolderwizardsourcepage.h"
#include "theme.h"

namespace OCC {

NMCFolderWizardSourcePage::NMCFolderWizardSourcePage()
:FolderWizardSourcePage()
{

}

void NMCFolderWizardSourcePage::setDefaultSettings()
{
groupBox->setVisible(false);
}

void NMCFolderWizardSourcePage::changeLayout()
{
gridLayout_2->setMargin(0);

QLabel *stepLabel = new QLabel();
stepLabel->setText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_HEADLINE"));
stepLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
stepLabel->setStyleSheet("QLabel{color: black; font-size: 13px; font-weight: bold;}");

gridLayout_2->addWidget(stepLabel, 0, 0, Qt::AlignTop | Qt::AlignLeft);

QWidget *mainLayoutWidget = new QWidget();
mainLayoutWidget->setStyleSheet("");

auto *whiteLayout = new QGridLayout;
mainLayoutWidget->setObjectName("mainLayoutWidget");
mainLayoutWidget->setStyleSheet("QWidget#mainLayoutWidget { background-color: white; border-radius: 4px;}");
mainLayoutWidget->setLayout(whiteLayout);

QLabel *textLabel = new QLabel();
textLabel->setText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_PAGE1_DESCRIPTION"));
textLabel->setWordWrap(true);
textLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);

whiteLayout->addWidget(textLabel, 0, 0);

gridLayout_2->removeWidget(localFolderLineEdit);
localFolderLineEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
whiteLayout->addWidget(localFolderLineEdit, 1, 0);

localFolderChooseBtn->setAutoDefault(true);
localFolderChooseBtn->setDefault(true);
localFolderChooseBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
//localFolderChooseBtn->setFixedHeight(10);
whiteLayout->addWidget(localFolderChooseBtn, 1, 1);

gridLayout_2->addWidget(mainLayoutWidget, 1, 0, 1, 3);

gridLayout_2->removeWidget(warnLabel);
gridLayout_2->addWidget(warnLabel, 2, 0, 1, 3);

warnLabel->setStyleSheet("border: 0px; border-radius: 4px; background-color: #fee2d0");

gridLayout_2->removeItem(verticalSpacer);
gridLayout_2->addItem(verticalSpacer, 3, 0, 1, 3);
}

} // end namespace



57 changes: 57 additions & 0 deletions src/gui/nmcgui/nmcfolderwizardsourcepage.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/

#ifndef MIRALL_NMCFolderWizardSourcePage_H
#define MIRALL_NMCFolderWizardSourcePage_H

#include "ui_folderwizardsourcepage.h"

/**
* @brief The NMCFolderWizardSourcePage class represents a source page for the NMCFolderWizard.
* @ingroup gui
*
* The NMCFolderWizardSourcePage class is derived from the Ui::FolderWizardSourcePage class and provides
* additional functionality specific to the NMCFolderWizard in the NMC application (replace with the actual application name).
*/

namespace OCC {

class NMCFolderWizardSourcePage : public ::Ui::FolderWizardSourcePage
{

public:
/**
* @brief Constructs an instance of NMCFolderWizardSourcePage.
*/
explicit NMCFolderWizardSourcePage();

/**
* @brief Destroys the NMCFolderWizardSourcePage instance.
*/
~NMCFolderWizardSourcePage() = default;

/**
* @brief Sets default settings for the NMCFolderWizardSourcePage.
*/
void setDefaultSettings();

/**
* @brief Changes the layout of the NMCFolderWizardSourcePage.
*/
void changeLayout();
};

} // namespace OCC

#endif
76 changes: 76 additions & 0 deletions src/gui/nmcgui/nmcfolderwizardtargetpage.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "nmcfolderwizardtargetpage.h"
#include "theme.h"


namespace OCC {

NMCFolderWizardTargetPage::NMCFolderWizardTargetPage()
:Ui::FolderWizardTargetPage()
{
}

void NMCFolderWizardTargetPage::setDefaultSettings()
{
warnFrame->setVisible(false);
groupBox->setVisible(false);
}

void NMCFolderWizardTargetPage::setLayout()
{
gridLayout_6->setMargin(0);

QLabel *stepLabel = new QLabel();
stepLabel->setText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_HEADLINE"));
stepLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
stepLabel->setStyleSheet("QLabel{color: black; font-size: 13px; font-weight: bold;}");

gridLayout_6->addWidget(stepLabel, 0, 0, Qt::AlignTop | Qt::AlignLeft);

QGridLayout *hLayout = new QGridLayout();

QWidget *hLayoutWidget = new QWidget();
hLayoutWidget->setLayout(hLayout);
hLayoutWidget->setObjectName("whiteBackgroundLayout");
hLayoutWidget->setStyleSheet("QWidget#whiteBackgroundLayout { background-color: white; border-radius: 4px;}");

gridLayout_6->removeWidget(folderTreeWidget);
gridLayout_6->removeWidget(refreshButton);
gridLayout_6->removeWidget(addFolderButton);

QLabel *textLabel2 = new QLabel();
textLabel2->setText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_PAGE2_DESCRIPTION"));
textLabel2->setWordWrap(true);
textLabel2->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
hLayout->addWidget(textLabel2, 0, 0, 1, 3);

hLayout->addWidget(folderTreeWidget, 1, 0, 3, 1);

addFolderButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
hLayout->addWidget(addFolderButton, 1, 1, 1, 1);

refreshButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
refreshButton->setFixedSize(addFolderButton->sizeHint());
hLayout->addWidget(refreshButton, 2, 1, 1, 1);

folderEntry->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
hLayout->addWidget(folderEntry, 4, 0, 1, 3);

gridLayout_6->addWidget(hLayoutWidget, 4, 0, 1, 3);
gridLayout_6->addWidget(warnFrame, 5, 0, 1, 3 );
warnFrame->setStyleSheet("border: 0px; border-radius: 4px; background-color: #fee2d0");
}

} // end namespace
57 changes: 57 additions & 0 deletions src/gui/nmcgui/nmcfolderwizardtargetpage.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/

#ifndef MIRALL_NMCFolderWizardTargetPage_H
#define MIRALL_NMCFolderWizardTargetPage_H

#include "ui_folderwizardtargetpage.h"

/**
* @brief The NMCFolderWizardTargetPage class represents a target page for the NMCFolderWizard.
* @ingroup gui
*
* The NMCFolderWizardTargetPage class is derived from the Ui::FolderWizardTargetPage class and provides
* additional functionality specific to the NMCFolderWizard in the NMC application (replace with the actual application name).
*/

namespace OCC {

class NMCFolderWizardTargetPage : public ::Ui::FolderWizardTargetPage
{

public:
/**
* @brief Constructs an instance of NMCFolderWizardTargetPage.
*/
explicit NMCFolderWizardTargetPage();

/**
* @brief Destroys the NMCFolderWizardTargetPage instance.
*/
~NMCFolderWizardTargetPage() = default;

/**
* @brief Sets default settings for the NMCFolderWizardTargetPage.
*/
void setDefaultSettings();

/**
* @brief Sets the layout for the NMCFolderWizardTargetPage.
*/
void setLayout();
};

} // namespace OCC

#endif
66 changes: 66 additions & 0 deletions src/gui/nmcgui/nmcselectivesyncdialog.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "nmcgui/nmcselectivesyncdialog.h"
#include "QtWidgets/qapplication.h"
#include "QtWidgets/qboxlayout.h"
#include "QtWidgets/qlabel.h"


namespace OCC {

NMCSelectiveSyncWidget::NMCSelectiveSyncWidget(AccountPtr account, QWidget *parent)
: SelectiveSyncWidget(account, parent)
{
_layout->removeWidget(_folderTree);
_layout->removeWidget(_header);

_header->setText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_PAGE3_DESCRIPTION"));

QHBoxLayout *hLayout = new QHBoxLayout();
hLayout->setSpacing(8);

QLabel *icon = new QLabel(this);
icon->setFixedSize(18, 18);
icon->setPixmap(QIcon(QLatin1String(":/client/theme/NMCIcons/applicationLogo.svg")).pixmap(18, 18));
hLayout->addWidget(icon);

QLabel *stepLabel = new QLabel(this);
stepLabel->setText(QCoreApplication::translate("", "ADD_LIVE_BACKUP_HEADLINE"));
stepLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
stepLabel->setStyleSheet("QLabel{color: black; font-size: 13px; font-weight: bold;}");
hLayout->addWidget(stepLabel);

hLayout->setContentsMargins(0,0,0,0);

QWidget *hContainer = new QWidget(this);
hContainer->setLayout(hLayout);

_layout->addWidget(hContainer);

QVBoxLayout *vLayout = new QVBoxLayout();
vLayout->setSpacing(8);

vLayout->addWidget(_header);
vLayout->addWidget(_folderTree);
_folderTree->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

QFrame *vContainer = new QFrame(this);
vContainer->setLayout(vLayout);
vContainer->setObjectName("whiteBackgroundLayout");
vContainer->setStyleSheet("QFrame#whiteBackgroundLayout { background-color: white; border-radius: 4px;}");

_layout->addWidget(vContainer);
}

}
41 changes: 41 additions & 0 deletions src/gui/nmcgui/nmcselectivesyncdialog.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* Copyright (C) by Eugen Fischer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/

#pragma once
#include "selectivesyncdialog.h"

namespace OCC {

/**
* @brief The NMCSelectiveSyncWidget class represents a widget containing a folder tree with labels specific to the NMC application.
* @ingroup gui
*
* The NMCSelectiveSyncWidget class is derived from the SelectiveSyncWidget class and provides additional functionality
* specific to the NMC (replace with the actual application name) application. It contains a folder tree with labels.
*/

class NMCSelectiveSyncWidget : public SelectiveSyncWidget
{
Q_OBJECT
public:
/**
* @brief Constructs an instance of NMCSelectiveSyncWidget.
* @param account The account associated with the widget.
* @param parent The parent widget (default is nullptr).
*/
explicit NMCSelectiveSyncWidget(AccountPtr account, QWidget *parent = nullptr);
};

} // namespace OCC

22 changes: 12 additions & 10 deletions src/gui/selectivesyncdialog.cpp
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "selectivesyncdialog.h"
#include "nmcgui/nmcselectivesyncdialog.h"
#include "account.h"
#include "common/utility.h"
#include "configfile.h"
@@ -66,20 +66,20 @@ class SelectiveSyncTreeViewItem : public QTreeWidgetItem

SelectiveSyncWidget::SelectiveSyncWidget(AccountPtr account, QWidget *parent)
: QWidget(parent)
, _account(account)
, _folderTree(new QTreeWidget(this))
, _account(account)
{
_loading = new QLabel(tr("Loading …"), _folderTree);

auto layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
_layout = new QVBoxLayout(this);
_layout->setContentsMargins(0, 0, 0, 0);

auto header = new QLabel(this);
header->setText(tr("Deselect remote folders you do not wish to synchronize."));
header->setWordWrap(true);
layout->addWidget(header);
_header = new QLabel(this);
_header->setText(tr("Deselect remote folders you do not wish to synchronize."));
_header->setWordWrap(true);
_layout->addWidget(_header);

layout->addWidget(_folderTree);
_layout->addWidget(_folderTree);

connect(_folderTree, &QTreeWidget::itemExpanded,
this, &SelectiveSyncWidget::slotItemExpanded);
@@ -194,6 +194,8 @@ void SelectiveSyncWidget::recursiveInsert(QTreeWidgetItem *parent, QStringList p
}
}



void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
{
auto job = qobject_cast<LsColJob *>(sender());
@@ -503,7 +505,7 @@ void SelectiveSyncDialog::init(const AccountPtr &account)
{
setWindowTitle(tr("Choose What to Sync"));
auto *layout = new QVBoxLayout(this);
_selectiveSync = new SelectiveSyncWidget(account, this);
_selectiveSync = new NMCSelectiveSyncWidget(account, this);
layout->addWidget(_selectiveSync);
auto *buttonBox = new QDialogButtonBox(Qt::Horizontal);
_okButton = buttonBox->addButton(QDialogButtonBox::Ok);
8 changes: 6 additions & 2 deletions src/gui/selectivesyncdialog.h
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
#pragma once
#include <QDialog>
#include <QTreeWidget>
#include "QtWidgets/qboxlayout.h"
#include "accountfwd.h"

#include "csync_exclude.h"
@@ -54,6 +55,11 @@ class SelectiveSyncWidget : public QWidget

[[nodiscard]] QSize sizeHint() const override;

protected:
QVBoxLayout *_layout;
QLabel *_header;
QTreeWidget *_folderTree;

private slots:
void slotUpdateDirectories(QStringList);
void slotUpdateRootFolderFilesSize(const QStringList &subfolders);
@@ -75,8 +81,6 @@ private slots:
bool _inserting = false; // set to true when we are inserting new items on the list
QLabel *_loading;

QTreeWidget *_folderTree;

// During account setup we want to filter out excluded folders from the
// view without having a Folder.SyncEngine.ExcludedFiles instance.
ExcludedFiles _excludedFiles;