From 0683c26d417c9eaa2b22ea1fb7eaef1605697f11 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 23 May 2013 01:51:05 +0200 Subject: [PATCH] Make setting custom folders work again Also, ensure that opening the local directory from the wizard will work on Windows. --- src/mirall/owncloudsetupwizard.cpp | 40 ++++++++++---------- src/mirall/owncloudsetupwizard.h | 1 - src/mirall/owncloudwizard.cpp | 60 +++++++++++++++++------------- src/mirall/owncloudwizard.h | 12 ++++-- 4 files changed, 63 insertions(+), 50 deletions(-) diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp index 018f7de798..effa1f235c 100644 --- a/src/mirall/owncloudsetupwizard.cpp +++ b/src/mirall/owncloudsetupwizard.cpp @@ -74,13 +74,14 @@ void OwncloudSetupWizard::startWizard() _remoteFolder = Theme::instance()->defaultServerFolder(); // remoteFolder may be empty, which means / - _localFolder = Theme::instance()->defaultClientFolder(); + QString localFolder = Theme::instance()->defaultClientFolder(); // if its a relative path, prepend with users home dir, otherwise use as absolute path - if( !_localFolder.startsWith(QLatin1Char('/')) ) { - _localFolder = QDir::homePath() + QDir::separator() + Theme::instance()->defaultClientFolder(); + if( !localFolder.startsWith(QLatin1Char('/')) ) { + localFolder = QDir::homePath() + QDir::separator() + Theme::instance()->defaultClientFolder(); } - _ocWizard->setFolderNames(_localFolder, _remoteFolder); + _ocWizard->setProperty("localFolder", localFolder); + _ocWizard->setRemoteFolder(_remoteFolder); _ocWizard->setStartId(OwncloudWizard::Page_oCSetup); @@ -114,11 +115,12 @@ void OwncloudSetupWizard::slotAssistantFinished( int result ) cfg.acceptCustomConfig(); // Now write the resulting folder definition if folder names are set. - if( !( _localFolder.isEmpty() || _remoteFolder.isEmpty() ) ) { // both variables are set. + const QString localFolder = _ocWizard->property("localFolder").toString(); + if( !( localFolder.isEmpty() || _remoteFolder.isEmpty() ) ) { // both variables are set. if( _folderMan ) { _folderMan->addFolderDefinition( QLatin1String("owncloud"), Theme::instance()->appName(), - _localFolder, _remoteFolder, false ); - _ocWizard->appendToConfigurationLog(tr("Local sync folder %1 successfully created!").arg(_localFolder)); + localFolder, _remoteFolder, false ); + _ocWizard->appendToConfigurationLog(tr("Local sync folder %1 successfully created!").arg(localFolder)); } else { qDebug() << "WRN: Folderman is zero in Setup Wizzard."; } @@ -251,26 +253,27 @@ void OwncloudSetupWizard::setupLocalSyncFolder() { if( ! _folderMan ) return; - qDebug() << "Setup local sync folder for new oC connection " << _localFolder; - QDir fi( _localFolder ); + const QString localFolder = _ocWizard->property("localFolder").toString(); + qDebug() << "Setup local sync folder for new oC connection " << localFolder; + QDir fi( localFolder ); // FIXME: Show problems with local folder properly. bool localFolderOk = true; if( fi.exists() ) { // there is an existing local folder. If its non empty, it can only be synced if the // ownCloud is newly created. - _ocWizard->appendToConfigurationLog( tr("Local sync folder %1 already exists, setting it up for sync.

").arg(_localFolder)); + _ocWizard->appendToConfigurationLog( tr("Local sync folder %1 already exists, setting it up for sync.

").arg(localFolder)); } else { - QString res = tr("Creating local sync folder %1... ").arg(_localFolder); - if( fi.mkpath( _localFolder ) ) { - Utility::setupFavLink( _localFolder ); + QString res = tr("Creating local sync folder %1... ").arg(localFolder); + if( fi.mkpath( localFolder ) ) { + Utility::setupFavLink( localFolder ); // FIXME: Create a local sync folder. res += tr("ok"); } else { res += tr("failed."); qDebug() << "Failed to create " << fi.path(); localFolderOk = false; - _ocWizard->displayError(tr("Could not create local folder %1").arg(_localFolder)); + _ocWizard->displayError(tr("Could not create local folder %1").arg(localFolder)); } _ocWizard->appendToConfigurationLog( res ); } @@ -328,7 +331,7 @@ void OwncloudSetupWizard::slotAuthCheckReply( const QString&, QNetworkReply *rep if( !ok ) { _ocWizard->displayError(error); } else { - _ocWizard->setFolderNames( _localFolder, _remoteFolder ); + _ocWizard->setRemoteFolder( _remoteFolder ); } finalizeSetup( ok ); @@ -369,13 +372,11 @@ void OwncloudSetupWizard::slotCreateRemoteFolderFinished( QNetworkReply::Network "
Please go back and check your credentials.

")); _ocWizard->appendToConfigurationLog( tr("

Remote folder creation failed probably because the provided credentials are wrong." "
Please go back and check your credentials.

")); - _localFolder.clear(); _remoteFolder.clear(); success = false; } else { _ocWizard->appendToConfigurationLog( tr("Remote folder %1 creation failed with error %2.").arg(_remoteFolder).arg(error)); _ocWizard->displayError( tr("Remote folder %1 creation failed with error %2.").arg(_remoteFolder).arg(error) ); - _localFolder.clear(); _remoteFolder.clear(); success = false; } @@ -388,10 +389,11 @@ void OwncloudSetupWizard::finalizeSetup( bool success ) // enable/disable the finish button. _ocWizard->enableFinishOnResultWidget(success); + const QString localFolder = _ocWizard->property("localFolder").toString(); if( success ) { - if( !(_localFolder.isEmpty() || _remoteFolder.isEmpty() )) { + if( !(localFolder.isEmpty() || _remoteFolder.isEmpty() )) { _ocWizard->appendToConfigurationLog( tr("A sync connection from %1 to remote directory %2 was set up.") - .arg(_localFolder).arg(_remoteFolder)); + .arg(localFolder).arg(_remoteFolder)); } _ocWizard->appendToConfigurationLog( QLatin1String(" ")); _ocWizard->appendToConfigurationLog( QLatin1String("

") diff --git a/src/mirall/owncloudsetupwizard.h b/src/mirall/owncloudsetupwizard.h index 8f822ecc1b..dd062d4944 100644 --- a/src/mirall/owncloudsetupwizard.h +++ b/src/mirall/owncloudsetupwizard.h @@ -95,7 +95,6 @@ private: FolderMan *_folderMan; QString _configHandle; - QString _localFolder; QString _remoteFolder; }; diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index dffd2756cb..369dba8d9c 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -196,6 +196,21 @@ void OwncloudSetupPage::initializePage() { _connected = false; _checking = false; + updateFoldersInfo(); +} + +void OwncloudSetupPage::updateFoldersInfo() +{ + const QString localFolder = wizard()->property("localFolder").toString(); + _ui.pbSelectLocalFolder->setText(localFolder); + QString t; + if( _remoteFolder.isEmpty() || _remoteFolder == QLatin1String("/") ) { + t = tr("Your entire account will be synced to the local folder '%1'").arg(localFolder); + } else { + t = tr("ownCloud folder '%1' is synced to local folder '%2'").arg(_remoteFolder).arg(localFolder); + } + + _ui.syncModeLabel->setText(t); } int OwncloudSetupPage::nextId() const @@ -268,25 +283,12 @@ OwncloudSetupPage::SyncMode OwncloudSetupPage::syncMode() return BoxMode; } -void OwncloudSetupPage::setFolderNames( const QString& localFolder, const QString& remoteFolder ) +void OwncloudSetupPage::setRemoteFolder( const QString& remoteFolder ) { - _ui.pbSelectLocalFolder->setText(localFolder); - if( !remoteFolder.isEmpty() ) + if( !remoteFolder.isEmpty() ) { _remoteFolder = remoteFolder; - - QString t; - if( _remoteFolder.isEmpty() || _remoteFolder == QLatin1String("/") ) { - t = tr("Your entire account will be synced to the local folder '%1'").arg(localFolder); - } else { - t = tr("ownCloud folder '%1' is synced to local folder '%2'").arg(_remoteFolder).arg(localFolder); + updateFoldersInfo(); } - - _ui.syncModeLabel->setText(t); -} - -QString OwncloudSetupPage::selectedLocalFolder() const -{ - return _ui.pbSelectLocalFolder->text(); } void OwncloudSetupPage::slotSelectFolder() @@ -294,7 +296,8 @@ void OwncloudSetupPage::slotSelectFolder() QString dir = QFileDialog::getExistingDirectory(0, tr("Local Sync Folder"), QDir::homePath()); if( !dir.isEmpty() ) { - setFolderNames(dir); + wizard()->setProperty("localFolder", dir); + updateFoldersInfo(); } } @@ -351,19 +354,23 @@ bool OwncloudWizardResultPage::isComplete() const return _complete; } -void OwncloudWizardResultPage::setFolderNames( const QString& localFolder, const QString& remoteFolder ) +void OwncloudWizardResultPage::initializePage() { - _localFolder = localFolder; + const QString localFolder = wizard()->property("localFolder").toString(); QString text; - if( remoteFolder == QLatin1String("/") || - remoteFolder.isEmpty() ) { + if( _remoteFolder == QLatin1String("/") || _remoteFolder.isEmpty() ) { text = tr("Your entire account is synced to the local folder %1").arg(localFolder); } else { - text = tr("ownCloud folder %1 is synced to local folder %2").arg(remoteFolder).arg(localFolder); + text = tr("ownCloud folder %1 is synced to local folder %2").arg(_remoteFolder).arg(localFolder); } _ui.localFolderLabel->setText( text ); + } +void OwncloudWizardResultPage::setRemoteFolder(const QString &remoteFolder) +{ + _remoteFolder = remoteFolder; +} void OwncloudWizardResultPage::setupCustomization() { @@ -420,10 +427,10 @@ void OwncloudWizard::enableFinishOnResultWidget(bool enable) _resultPage->setComplete(enable); } -void OwncloudWizard::setFolderNames( const QString& localFolder, const QString& remoteFolder ) +void OwncloudWizard::setRemoteFolder( const QString& remoteFolder ) { - _setupPage->setFolderNames( localFolder, remoteFolder ); - _resultPage->setFolderNames( localFolder, remoteFolder ); + _setupPage->setRemoteFolder( remoteFolder ); + _resultPage->setRemoteFolder( remoteFolder ); } void OwncloudWizard::showConnectInfo( const QString& msg ) @@ -483,7 +490,8 @@ void OwncloudWizard::setOCUser( const QString& user ) void OwncloudWizardResultPage::slotOpenLocal() { - QDesktopServices::openUrl(QUrl(_localFolder)); + const QString localFolder = wizard()->property("localFolder").toString(); + QDesktopServices::openUrl(QUrl::fromLocalFile(localFolder)); } void OwncloudWizardResultPage::slotOpenServer() diff --git a/src/mirall/owncloudwizard.h b/src/mirall/owncloudwizard.h index be2d3b1c7d..2270e06dd9 100644 --- a/src/mirall/owncloudwizard.h +++ b/src/mirall/owncloudwizard.h @@ -51,8 +51,7 @@ public: bool validatePage(); QString url() const; void setConnected(bool complete); - QString selectedLocalFolder() const; - void setFolderNames( const QString&, const QString& remoteFolder = QString::null); + void setRemoteFolder( const QString& remoteFolder); SyncMode syncMode(); @@ -70,6 +69,9 @@ protected slots: signals: void connectToOCUrl( const QString& ); +protected: + void updateFoldersInfo(); + private: Ui_OwncloudSetupPage _ui; QString _oCUrl; @@ -109,7 +111,7 @@ public: OwncloudSetupPage::SyncMode syncMode(); public slots: - void setFolderNames( const QString&, const QString& ); + void setRemoteFolder( const QString& ); void appendToConfigurationLog( const QString& msg, LogType type = LogParagraph ); void slotCurrentPageChanged( int ); @@ -146,10 +148,11 @@ public: ~OwncloudWizardResultPage(); bool isComplete() const; + void initializePage(); + void setRemoteFolder( const QString& remoteFolder); public slots: void setComplete(bool complete); - void setFolderNames( const QString&, const QString& ); protected slots: void slotOpenLocal(); @@ -160,6 +163,7 @@ protected: private: QString _localFolder; + QString _remoteFolder; bool _complete; Ui_OwncloudWizardResultPage _ui;