[Pkg-owncloud-commits] [owncloud-client] 295/498: Wizard: remove the check for mutliple folders

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit e5568b5d1359ce1bb2dca0e9d31f9d2e527b9d6d
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jul 13 14:52:24 2015 +0200

    Wizard: remove the check for mutliple folders
    
    It does not make sens now that we have multi account
---
 src/gui/owncloudsetupwizard.cpp              | 12 ------------
 src/gui/wizard/owncloudadvancedsetuppage.cpp | 13 -------------
 src/gui/wizard/owncloudadvancedsetuppage.h   |  1 -
 src/gui/wizard/owncloudwizard.cpp            |  5 -----
 src/gui/wizard/owncloudwizard.h              |  1 -
 5 files changed, 32 deletions(-)

diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index ca1019d..606d62e 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -79,7 +79,6 @@ void OwncloudSetupWizard::runWizard(QObject* obj, const char* amember, QWidget *
 void OwncloudSetupWizard::startWizard()
 {
     FolderMan *folderMan = FolderMan::instance();
-    bool multiFolderSetup = folderMan->map().count() > 1;
     // ###
     AccountPtr account = Account::create();
     _ocWizard->setConfigExists(false);
@@ -98,14 +97,6 @@ void OwncloudSetupWizard::startWizard()
         localFolder = QDir::homePath() + QDir::separator() + localFolder;
     }
 
-    if (!multiFolderSetup) {
-        QList<Folder*> folders = folderMan->map().values();
-        if (!folders.isEmpty()) {
-            Folder* folder = folders.first();
-            localFolder = QDir(folder->path()).absolutePath();
-        }
-    }
-
     _ocWizard->setProperty("oldLocalFolder", localFolder);
     _ocWizard->setProperty("localFolder", localFolder);
 
@@ -123,9 +114,6 @@ void OwncloudSetupWizard::startWizard()
 
     _ocWizard->restart();
 
-    // settings re-initialized in initPage must be set here after restart
-    _ocWizard->setMultipleFoldersExist( multiFolderSetup );
-
     _ocWizard->open();
     _ocWizard->raise();
 }
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index 82dd46a..08f75c4 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -39,7 +39,6 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage()
     _checking(false),
     _created(false),
     _configExists(false),
-    _multipleFoldersExist(false),
     _progressIndi(new QProgressIndicator (this)),
     _oldLocalFolder(),
     _remoteFolder()
@@ -96,7 +95,6 @@ void OwncloudAdvancedSetupPage::initializePage()
     WizardCommon::initErrorLabel(_ui.errorLabel);
 
     _checking  = false;
-    _multipleFoldersExist = false;
     _oldLocalFolder = wizard()->property("oldLocalFolder").toString();
     _ui.lSelectiveSyncSizeLabel->setText(QString());
     _ui.lSyncEverythingSizeLabel->setText(QString());
@@ -140,12 +138,6 @@ void OwncloudAdvancedSetupPage::updateStatus()
               _ui.rSyncEverything->setText(tr("Sync the directory '%1'").arg(_remoteFolder));
         }
 
-        if ( _multipleFoldersExist ) {
-            t += tr("<p><small><strong>Warning:</strong> You currently have multiple folders "
-                    "configured. If you continue with the current settings, the folder configurations "
-                    "will be discarded and a single root folder sync will be created!</small></p>");
-        }
-
         const bool dirNotEmpty(QDir(locFolder).entryList(QDir::AllEntries | QDir::NoDotAndDotDot).count() > 0);
         if(dirNotEmpty) {
             t += tr("<p><small><strong>Warning:</strong> The local directory is not empty. "
@@ -243,11 +235,6 @@ void OwncloudAdvancedSetupPage::setRemoteFolder( const QString& remoteFolder )
     }
 }
 
-void OwncloudAdvancedSetupPage::setMultipleFoldersExist(bool exist)
-{
-    _multipleFoldersExist = exist;
-}
-
 void OwncloudAdvancedSetupPage::slotSelectFolder()
 {
     QString dir = QFileDialog::getExistingDirectory(0, tr("Local Sync Folder"), QDir::homePath());
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.h b/src/gui/wizard/owncloudadvancedsetuppage.h
index 0eabc90..03feec9 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.h
+++ b/src/gui/wizard/owncloudadvancedsetuppage.h
@@ -69,7 +69,6 @@ private:
   bool _checking;
   bool _created;
   bool _configExists;
-  bool _multipleFoldersExist;
   QProgressIndicator* _progressIndi;
   QString _oldLocalFolder;
   QString _remoteFolder;
diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index 1964000..4080118 100644
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -94,11 +94,6 @@ AccountPtr OwncloudWizard::account() const
     return _account;
 }
 
-void OwncloudWizard::setMultipleFoldersExist(bool exist)
-{
-    _advancedSetupPage->setMultipleFoldersExist(exist);
-}
-
 QString OwncloudWizard::localFolder() const
 {
     return(_advancedSetupPage->localFolder());
diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
index a46e284..6cafe01 100644
--- a/src/gui/wizard/owncloudwizard.h
+++ b/src/gui/wizard/owncloudwizard.h
@@ -59,7 +59,6 @@ public:
     void enableFinishOnResultWidget(bool enable);
 
     void displayError( const QString&, bool retryHTTPonly);
-    void setMultipleFoldersExist( bool );
     void setConfigExists( bool );
     bool configExists();
     AbstractCredentials* getCredentials() const;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git