[Pkg-owncloud-commits] [owncloud-client] 17/115: Add a "Skip Folder Configuration" button in the wizard

[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 255330d3424f1916ad47e69b4ff9c4e3523f0c04
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Aug 12 17:33:17 2014 +0200

    Add a "Skip Folder Configuration" button in the wizard
    
    This allow to start owncloud the first time but not automatically sync
    everything, but let the user configure sub folders instead
---
 src/mirall/application.cpp         |  4 ++++
 src/mirall/owncloudsetupwizard.cpp | 11 +++++++++++
 src/mirall/owncloudsetupwizard.h   |  1 +
 src/wizard/owncloudwizard.cpp      |  6 ++++++
 src/wizard/owncloudwizard.h        |  1 +
 5 files changed, 23 insertions(+)

diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index c5acd2d..cf506f0 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -319,6 +319,10 @@ void Application::slotownCloudWizardDone( int res )
         qDebug() << "Set up " << cnt << " folders.";
         // We have some sort of configuration. Enable autostart
         Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), true);
+        if (cnt == 0) {
+            // The folder configuration was skipped
+            _gui->slotShowSettings();
+        }
     }
     folderMan->setSyncEnabled( true );
     if( res == QDialog::Accepted ) {
diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index 9102c2f..ba65f9a 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -54,6 +54,7 @@ OwncloudSetupWizard::OwncloudSetupWizard(QObject* parent) :
     connect( _ocWizard, SIGNAL(basicSetupFinished(int)),
              this, SLOT(slotAssistantFinished(int)), Qt::QueuedConnection);
     connect( _ocWizard, SIGNAL(finished(int)), SLOT(deleteLater()));
+    connect( _ocWizard, SIGNAL(skipFolderConfiguration()), SLOT(slotSkipFolderConfigruation()));
 }
 
 OwncloudSetupWizard::~OwncloudSetupWizard()
@@ -454,6 +455,16 @@ void OwncloudSetupWizard::slotAssistantFinished( int result )
     emit ownCloudWizardDone( result );
 }
 
+void OwncloudSetupWizard::slotSkipFolderConfigruation()
+{
+    replaceDefaultAccountWith(_ocWizard->account());
+    _ocWizard->blockSignals(true);
+    _ocWizard->close();
+    _ocWizard->blockSignals(false);
+    emit ownCloudWizardDone( QDialog::Accepted );
+}
+
+
 DetermineAuthTypeJob::DetermineAuthTypeJob(Account *account, QObject *parent)
     : AbstractNetworkJob(account, QString(), parent)
     , _redirects(0)
diff --git a/src/mirall/owncloudsetupwizard.h b/src/mirall/owncloudsetupwizard.h
index 4394257..7d62512 100644
--- a/src/mirall/owncloudsetupwizard.h
+++ b/src/mirall/owncloudsetupwizard.h
@@ -80,6 +80,7 @@ private slots:
     void slotAuthCheckReply(QNetworkReply*);
     void slotCreateRemoteFolderFinished(QNetworkReply::NetworkError);
     void slotAssistantFinished( int );
+    void slotSkipFolderConfigruation();
 
 private:
     explicit OwncloudSetupWizard(QObject *parent = 0 );
diff --git a/src/wizard/owncloudwizard.cpp b/src/wizard/owncloudwizard.cpp
index 94e3559..5cb6215 100644
--- a/src/wizard/owncloudwizard.cpp
+++ b/src/wizard/owncloudwizard.cpp
@@ -67,6 +67,8 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
     connect( _shibbolethCredsPage, SIGNAL(connectToOCUrl(QString)), SIGNAL(connectToOCUrl(QString)));
     connect( _advancedSetupPage, SIGNAL(createLocalAndRemoteFolders(QString, QString)),
              SIGNAL(createLocalAndRemoteFolders(QString, QString)));
+    connect(this, SIGNAL(customButtonClicked(int)), this, SIGNAL(skipFolderConfiguration()));
+
 
     Theme *theme = Theme::instance();
     setWindowTitle( tr("%1 Connection Wizard").arg(theme->appNameGUI()));
@@ -78,6 +80,8 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
     setOption( QWizard::NoCancelButton );
     setTitleFormat(Qt::RichText);
     setSubTitleFormat(Qt::RichText);
+    setButtonText(QWizard::CustomButton1, tr("Skip folders configuration"));
+
 }
 
 void OwncloudWizard::setAccount(Account *account)
@@ -169,6 +173,8 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
         emit basicSetupFinished(QDialog::Accepted);
         appendToConfigurationLog( QString::null );
     }
+
+    setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
 }
 
 void OwncloudWizard::displayError( const QString& msg )
diff --git a/src/wizard/owncloudwizard.h b/src/wizard/owncloudwizard.h
index db31544..b3c319e 100644
--- a/src/wizard/owncloudwizard.h
+++ b/src/wizard/owncloudwizard.h
@@ -73,6 +73,7 @@ signals:
     void createLocalAndRemoteFolders(const QString&, const QString&);
     // make sure to connect to this, rather than finished(int)!!
     void basicSetupFinished( int );
+    void skipFolderConfiguration();
 
 private:
     Account* _account;

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