Merge branch '1.7'

Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folderman.cpp
	src/gui/wizard/owncloudadvancedsetuppage.cpp
	src/libsync/account.cpp

1 files changed, 13 insertions, 2 deletions

diff --git a/src/gui/selectivesyncdialog.h b/src/gui/selectivesyncdialog.h
index 0506c18f2..3a618e793 100644
--- a/src/gui/selectivesyncdialog.h
+++ b/src/gui/selectivesyncdialog.h
@@ -20,12 +20,14 @@ class QTreeWidgetItem;
 class QTreeWidget;
 namespace Mirall {
 
+class Account;
+
 class Folder;
 
 class SelectiveSyncTreeView : public QTreeWidget {
     Q_OBJECT
 public:
-    explicit SelectiveSyncTreeView(QWidget* parent = 0);
+    explicit SelectiveSyncTreeView(Account *account, QWidget* parent = 0);
     QStringList createBlackList(QTreeWidgetItem* root = 0) const;
     void refreshFolders();
     void setFolderInfo(const QString &folderPath, const QString &rootName,
@@ -45,17 +47,26 @@ private:
     QString _rootName;
     QStringList _oldBlackList;
     bool _inserting = false; // set to true when we are inserting new items on the list
+    Account *_account;
 };
 
 class SelectiveSyncDialog : public QDialog {
     Q_OBJECT
 public:
-    explicit SelectiveSyncDialog(Folder *folder, QWidget* parent = 0, Qt::WindowFlags f = 0);
+    // Dialog for a specific folder (used from the account settings button)
+    explicit SelectiveSyncDialog(Account *account, Folder *folder, QWidget* parent = 0, Qt::WindowFlags f = 0);
+
+    // Dialog for the whole account (Used from the wizard)
+    explicit SelectiveSyncDialog(Account *account, const QStringList &blacklist, QWidget* parent = 0, Qt::WindowFlags f = 0);
 
     virtual void accept() Q_DECL_OVERRIDE;
 
+    QStringList createBlackList() const;
+
 private:
 
+    void init(Account *account);
+
     SelectiveSyncTreeView *_treeView;
 
     Folder *_folder;